On 30/10/2018 06:48, Hervé Poussineau wrote: > Le 29/10/2018 à 14:39, Mark Cave-Ayland a écrit : >> From: Laurent Vivier <laur...@vivier.eu> >> >> Co-developed-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> >> Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> >> Signed-off-by: Laurent Vivier <laur...@vivier.eu> >> --- >> hw/block/Makefile.objs | 1 + >> hw/block/swim.c | 415 >> ++++++++++++++++++++++++++++++++++++++++++++++++ >> include/hw/block/swim.h | 76 +++++++++ >> 3 files changed, 492 insertions(+) >> create mode 100644 hw/block/swim.c >> create mode 100644 include/hw/block/swim.h > > [...] > >> diff --git a/include/hw/block/swim.h b/include/hw/block/swim.h >> new file mode 100644 >> index 0000000000..d6fbdc11ac >> --- /dev/null >> +++ b/include/hw/block/swim.h >> @@ -0,0 +1,76 @@ >> +/* >> + * QEMU Macintosh floppy disk controller emulator (SWIM) >> + * >> + * Copyright (c) 2014-2018 Laurent Vivier <laur...@vivier.eu> >> + * >> + * This work is licensed under the terms of the GNU GPL, version 2. See >> + * the COPYING file in the top-level directory. >> + * >> + */ >> + >> +#ifndef SWIM_H >> +#define SWIM_H >> + >> +#include "qemu/osdep.h" >> +#include "hw/sysbus.h" >> + >> +#define MAX_FD 2 > > Maybe rename MAX_FD to SWIM_MAX_FD, to prevent conflicts with MAX_FD in other > files? > Excepted that: > Reviewed-by: Hervé Poussineau <hpous...@reactos.org>
Yes, that's a good idea (I can see this might clash with in-built OS headers). I'll make the change and add your R-B to the next version. ATB, Mark.
