aboutsummaryrefslogtreecommitdiff
path: root/hw/pc87312.c
AgeCommit message (Collapse)AuthorFilesLines
2013-01-15pc87312: Avoid define conflict on mingw32Blue Swirl1-21/+17
Mingw32 headers define FAR, causing this warning: /src/qemu/hw/pc87312.c:38:0: warning: "FAR" redefined [enabled by default] In file included from /usr/local/lib/gcc/i686-mingw32msvc/4.7.0/../../../../i686-mingw32msvc/include/windows.h:48:0, from /src/qemu/include/sysemu/os-win32.h:29, from /src/qemu/include/qemu-common.h:46, from /src/qemu/include/exec/ioport.h:27, from /src/qemu/hw/isa.h:6, from /src/qemu/hw/pc87312.h:28, from /src/qemu/hw/pc87312.c:26: /usr/local/lib/gcc/i686-mingw32msvc/4.7.0/../../../../i686-mingw32msvc/include/windef.h:34:0: note: this is the location of the previous definition Avoid the warning by expanding the macros. Signed-off-by: Blue Swirl <blauwirbel@gmail.com> Acked-by: Hervé Poussineau <hpoussin@reactos.org> Signed-off-by: Andreas Färber <andreas.faerber@web.de>
2013-01-15pc87312: Replace register_ioport_*() with MemoryRegionAndreas Färber1-4/+22
Prepare an instance_init function for the MemoryRegion init. Signed-off-by: Andreas Färber <andreas.faerber@web.de> Tested-by: Hervé Poussineau <hpoussin@reactos.org>
2013-01-10Merge branch 'master' of git://git.qemu.org/qemu into prep-upAndreas Färber1-2/+3
Conflicts: hw/Makefile.objs hw/ppc_prep.c Signed-off-by: Andreas Färber <andreas.faerber@web.de>
2012-08-15prep: Add pc87312 Super I/O emulationHervé Poussineau1-0/+386
This provides floppy and IDE controllers as well as serial and parallel ports. However, dynamic configuration of devices is not yet supported. Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> [AF: QOM'ify, split out header, create CharDriverState if absent] Signed-off-by: Andreas Färber <andreas.faerber@web.de>