On 2018-10-18 19:28, Mark Cave-Ayland wrote: > 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> > --- [...] > diff --git a/hw/m68k/Makefile.objs b/hw/m68k/Makefile.objs > index d1f089c08a..18ebf1937a 100644 > --- a/hw/m68k/Makefile.objs > +++ b/hw/m68k/Makefile.objs > @@ -1,2 +1,4 @@ > -obj-y += an5206.o mcf5208.o > -obj-y += mcf5206.o mcf_intc.o > +obj-$(CONFIG_COLDFIRE) += an5206.o mcf5208.o > +obj-$(CONFIG_MAC) += q800.o > + > +obj-$(CONFIG_COLDFIRE) += mcf5206.o mcf_intc.o
Cosmetic nit: Keep the coldfire lines together instead of splitting them? > diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c > new file mode 100644 > index 0000000000..bbf34262f0 > --- /dev/null > +++ b/hw/m68k/q800.c > @@ -0,0 +1,367 @@ > +/* > + * QEMU Motorla 680x0 Macintosh hardware System Emulator > + * > + * Permission is hereby granted, free of charge, to any person obtaining a > copy > + * of this software and associated documentation files (the "Software"), to > deal > + * in the Software without restriction, including without limitation the > rights > + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell > + * copies of the Software, and to permit persons to whom the Software is > + * furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice shall be included in > + * all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > FROM, > + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN > + * THE SOFTWARE. > + */ > + > +#include "qemu/osdep.h" > +#include "sysemu/sysemu.h" > +#include "cpu.h" > +#include "hw/hw.h" > +#include "hw/boards.h" > +#include "elf.h" > +#include "hw/loader.h" > +#include "hw/display/framebuffer.h" > +#include "ui/console.h" > +#include "exec/address-spaces.h" > +#include "hw/char/escc.h" > +#include "hw/sysbus.h" > +#include "hw/scsi/esp.h" > +#include "bootinfo.h" > +#include "hw/misc/mac_via.h" > +#include "hw/input/adb.h" > +#include "hw/audio/asc.h" > +#include "hw/nubus/mac-nubus-bridge.h" > +#include "hw/display/macfb.h" > +#include "hw/intc/q800_irq.h" > +#include "hw/block/swim.h" > +#include "net/net.h" > +#include "qapi/error.h" > +#include "sysemu/qtest.h" > + > +#define MACROM_ADDR 0x40000000 > +#define MACROM_SIZE 0x00100000 > + > +/* > + * .ident = MAC_MODEL_Q800, > + * .name = "Quadra 800", > + * .adb_type = MAC_ADB_II, > + * .via_type = MAC_VIA_QUADRA, > + * .scsi_type = MAC_SCSI_QUADRA, > + * .scc_type = MAC_SCC_QUADRA, > + * .ether_type = MAC_ETHER_SONIC, > + * .nubus_type = MAC_NUBUS > + */ Is this comment intentional or left-over code from an older rebase? Thomas
