diff --git a/src/config.c b/src/config.c index deb76a7..08732ed 100644 --- a/src/config.c +++ b/src/config.c @@ -12,7 +12,7 @@ * it on Windows XP, and possibly also Vista. Use the * -DANSI_CFG for use on these systems. * - * Version: @(#)config.c 1.0.21 2018/04/30 + * Version: @(#)config.c 1.0.22 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -50,28 +50,28 @@ #include "emu.h" #include "config.h" #include "cpu/cpu.h" -#include "machine/machine.h" +#include "machines/machine.h" #include "nvr.h" #include "device.h" -#include "ports/game_dev.h" -#include "ports/serial.h" -#include "ports/parallel.h" -#include "ports/parallel_dev.h" -#include "input/mouse.h" -#include "input/game/joystick.h" -#include "floppy/fdd.h" -#include "floppy/fdc.h" -#include "disk/hdd.h" -#include "disk/hdc.h" -#include "disk/hdc_ide.h" -#include "disk/zip.h" -#include "cdrom/cdrom.h" -#include "scsi/scsi.h" -#include "network/network.h" -#include "sound/sound.h" -#include "sound/midi.h" -#include "sound/sound.h" -#include "video/video.h" +#include "devices/ports/game_dev.h" +#include "devices/ports/serial.h" +#include "devices/ports/parallel.h" +#include "devices/ports/parallel_dev.h" +#include "devices/input/mouse.h" +#include "devices/input/game/joystick.h" +#include "devices/floppy/fdd.h" +#include "devices/floppy/fdc.h" +#include "devices/disk/hdd.h" +#include "devices/disk/hdc.h" +#include "devices/disk/hdc_ide.h" +#include "devices/disk/zip.h" +#include "devices/cdrom/cdrom.h" +#include "devices/scsi/scsi.h" +#include "devices/network/network.h" +#include "devices/sound/sound.h" +#include "devices/sound/midi.h" +#include "devices/sound/sound.h" +#include "devices/video/video.h" #include "ui/ui.h" #include "plat.h" diff --git a/src/cpu/386.c b/src/cpu/386.c index ed20635..b2c0142 100644 --- a/src/cpu/386.c +++ b/src/cpu/386.c @@ -8,7 +8,7 @@ * * Implementation of the CPU. * - * Version: @(#)386.c 1.0.3 2018/05/02 + * Version: @(#)386.c 1.0.4 2018/05/06 * * Authors: Sarah Walker, * Miran Grca, @@ -47,13 +47,13 @@ #include "cpu.h" #include "x86.h" #include "x87.h" -#include "../nmi.h" +#include "../devices/system/nmi.h" #include "../mem.h" -#include "../pic.h" -#include "../pit.h" +#include "../devices/system/pic.h" +#include "../devices/system/pit.h" #include "../timer.h" -#include "../floppy/fdd.h" -#include "../floppy/fdc.h" +#include "../devices/floppy/fdd.h" +#include "../devices/floppy/fdc.h" #include "386_common.h" diff --git a/src/cpu/386_dynarec.c b/src/cpu/386_dynarec.c index 42b73b5..33cd629 100644 --- a/src/cpu/386_dynarec.c +++ b/src/cpu/386_dynarec.c @@ -8,7 +8,7 @@ * * Implementation of the CPU's dynamic recompiler. * - * Version: @(#)386_dynarec.c 1.0.2 2018/03/09 + * Version: @(#)386_dynarec.c 1.0.3 2018/05/06 * * Authors: Sarah Walker, * Miran Grca, @@ -50,11 +50,11 @@ #include "x87.h" #include "../io.h" #include "../mem.h" -#include "../nmi.h" -#include "../pic.h" +#include "../devices/system/nmi.h" +#include "../devices/system/pic.h" #include "../timer.h" -#include "../floppy/fdd.h" -#include "../floppy/fdc.h" +//#include "../devices/floppy/fdd.h" +//#include "../devices/floppy/fdc.h" #ifdef USE_DYNAREC #include "codegen.h" #endif diff --git a/src/cpu/386_dynarec_ops.c b/src/cpu/386_dynarec_ops.c index 332a84f..b40eddc 100644 --- a/src/cpu/386_dynarec_ops.c +++ b/src/cpu/386_dynarec_ops.c @@ -8,7 +8,7 @@ * * Dynamic Recompiler for i386 instructions. * - * Version: @(#)386_dynarec_ops.c 1.0.1 2018/02/14 + * Version: @(#)386_dynarec_ops.c 1.0.2 2018/05/06 * * Authors: Sarah Walker, * Miran Grca, @@ -43,16 +43,16 @@ # define INFINITY (__builtin_inff()) #endif #include "../emu.h" +#include "../io.h" +#include "../mem.h" +#include "../devices/system/nmi.h" +#include "../devices/system/pic.h" #include "cpu.h" #include "x86.h" #include "x86_ops.h" #include "x87.h" #include "x86_flags.h" -#include "../io.h" -#include "../mem.h" -#include "../nmi.h" #include "codegen.h" -#include "../pic.h" #define CPU_BLOCK_END() cpu_block_end = 1 diff --git a/src/cpu/808x.c b/src/cpu/808x.c index ab9c11e..9fea90d 100644 --- a/src/cpu/808x.c +++ b/src/cpu/808x.c @@ -18,7 +18,7 @@ * 2 clocks - fetch opcode 1 2 clocks - execute * 2 clocks - fetch opcode 2 etc * - * Version: @(#)808x.c 1.0.4 2018/05/02 + * Version: @(#)808x.c 1.0.5 2018/05/06 * * Authors: Sarah Walker, * Miran Grca, @@ -51,16 +51,16 @@ #include "../emu.h" #include "cpu.h" #include "x86.h" -#include "../machine/machine.h" #include "../io.h" -#include "../pic.h" -#include "../nmi.h" +#include "../machines/machine.h" +#include "../devices/system/pic.h" +#include "../devices/system/nmi.h" #include "../mem.h" #include "../rom.h" #include "../timer.h" #include "../device.h" /* for scsi.h */ -#include "../input/keyboard.h" /* its WRONG to have this in here!! --FvK */ -#include "../scsi/scsi.h" /* its WRONG to have this in here!! --FvK */ +#include "../devices/input/keyboard.h" /* its WRONG to have this in here!! --FvK */ +#include "../devices/scsi/scsi.h" /* its WRONG to have this in here!! --FvK */ #include "../plat.h" diff --git a/src/cpu/codegen.c b/src/cpu/codegen.c index f53ef02..0368bb1 100644 --- a/src/cpu/codegen.c +++ b/src/cpu/codegen.c @@ -8,7 +8,7 @@ * * Instruction parsing and generation. * - * Version: @(#)codegen.c 1.0.1 2018/02/14 + * Version: @(#)codegen.c 1.0.2 2018/05/06 * * Authors: Sarah Walker, * Miran Grca, diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index 59e9a62..1948588 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -8,7 +8,7 @@ * * CPU type handler. * - * Version: @(#)cpu.c 1.0.6 2018/05/05 + * Version: @(#)cpu.c 1.0.7 2018/05/06 * * Authors: Fred N. van Kempen, * Sarah Walker, @@ -45,11 +45,11 @@ #include "../emu.h" #include "cpu.h" #include "../device.h" -#include "../machine/machine.h" +#include "../machines/machine.h" #include "../io.h" #include "x86_ops.h" #include "../mem.h" -#include "../pci.h" +#include "../devices/system/pci.h" #ifdef USE_DYNAREC # include "codegen.h" #endif diff --git a/src/cpu/cpu_table.c b/src/cpu/cpu_table.c index 9ffe216..bf1c7a1 100644 --- a/src/cpu/cpu_table.c +++ b/src/cpu/cpu_table.c @@ -29,7 +29,7 @@ * 16 = 180 MHz * 17 = 200 MHz * - * Version: @(#)cpu_table.c 1.0.1 2018/02/14 + * Version: @(#)cpu_table.c 1.0.2 2018/05/06 * * Authors: Sarah Walker, * leilei, @@ -65,7 +65,7 @@ #include #include "../emu.h" #include "cpu.h" -#include "../machine/machine.h" +#include "../machines/machine.h" CPU cpus_8088[] = { diff --git a/src/cpu/x86seg.c b/src/cpu/x86seg.c index 09e7b53..d5737e8 100644 --- a/src/cpu/x86seg.c +++ b/src/cpu/x86seg.c @@ -8,7 +8,7 @@ * * x86 CPU segment emulation. * - * Version: @(#)x86seg.c 1.0.2 2018/03/09 + * Version: @(#)x86seg.c 1.0.3 2018/05/06 * * Authors: Sarah Walker, * Miran Grca, @@ -42,7 +42,7 @@ #include #include "../emu.h" #include "cpu.h" -#include "../machine/machine.h" +#include "../machines/machine.h" #include "../mem.h" #include "../nvr.h" #include "x86.h" diff --git a/src/cpu/x87.c b/src/cpu/x87.c index 8f7aaa5..0034d79 100644 --- a/src/cpu/x87.c +++ b/src/cpu/x87.c @@ -8,7 +8,7 @@ * * Implementation of 8087 opcodes. * - * Version: @(#)x87.c 1.0.1 2018/02/14 + * Version: @(#)x87.c 1.0.2 2018/05/06 * * Authors: Sarah Walker, * Miran Grca, @@ -43,7 +43,7 @@ #include "../emu.h" #include "cpu.h" #include "../mem.h" -#include "../pic.h" +#include "../devices/system/pic.h" #include "x86.h" #include "x86_flags.h" #include "x86_ops.h" diff --git a/src/device.c b/src/device.c index a057560..7ce6ee5 100644 --- a/src/device.c +++ b/src/device.c @@ -9,7 +9,7 @@ * Implementation of the generic device interface to handle * all devices attached to the emulator. * - * Version: @(#)device.c 1.0.8 2018/04/27 + * Version: @(#)device.c 1.0.9 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -43,11 +43,11 @@ #include #include #include "emu.h" -#include "cpu/cpu.h" #include "config.h" +#include "cpu/cpu.h" #include "device.h" -#include "machine/machine.h" -#include "sound/sound.h" +#include "machines/machine.h" +#include "devices/sound/sound.h" #include "ui/ui.h" #include "plat.h" diff --git a/src/cdrom/cdrom.c b/src/devices/cdrom/cdrom.c similarity index 99% rename from src/cdrom/cdrom.c rename to src/devices/cdrom/cdrom.c index af28417..09d3f4f 100644 --- a/src/cdrom/cdrom.c +++ b/src/devices/cdrom/cdrom.c @@ -9,7 +9,7 @@ * Implementation of the CD-ROM drive with SCSI(-like) * commands, for both ATAPI and SCSI usage. * - * Version: @(#)cdrom.c 1.0.13 2018/04/28 + * Version: @(#)cdrom.c 1.0.14 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -45,18 +45,17 @@ #include #include #define HAVE_STDARG_H -#include "../emu.h" -#include "../version.h" -#include "../config.h" -#include "../timer.h" -#include "../device.h" -#include "../nvr.h" -#include "../intel_piix.h" +#include "../../emu.h" +#include "../../version.h" +#include "../../timer.h" +#include "../../device.h" +#include "../../nvr.h" +#include "../../ui/ui.h" +#include "../../plat.h" +#include "../system/intel_piix.h" #include "../scsi/scsi.h" #include "../disk/hdc.h" #include "../disk/hdc_ide.h" -#include "../ui/ui.h" -#include "../plat.h" #include "cdrom.h" #include "cdrom_image.h" #include "cdrom_null.h" diff --git a/src/cdrom/cdrom.h b/src/devices/cdrom/cdrom.h similarity index 100% rename from src/cdrom/cdrom.h rename to src/devices/cdrom/cdrom.h diff --git a/src/cdrom/cdrom_dosbox.cpp b/src/devices/cdrom/cdrom_dosbox.cpp similarity index 99% rename from src/cdrom/cdrom_dosbox.cpp rename to src/devices/cdrom/cdrom_dosbox.cpp index 467741a..876f032 100644 --- a/src/cdrom/cdrom_dosbox.cpp +++ b/src/devices/cdrom/cdrom_dosbox.cpp @@ -8,7 +8,7 @@ * * CD-ROM image file handling module. * - * Version: @(#)cdrom_dosbox.cpp 1.0.6 2018/03/21 + * Version: @(#)cdrom_dosbox.cpp 1.0.7 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -36,9 +36,6 @@ * Boston, MA 02111-1307 * USA. */ - -/* Modified for use with PCem by bit */ - #define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE #ifdef _WIN32 @@ -47,18 +44,16 @@ #endif #include #include - +#include #include #include #include #include #include #include -#include //GCC 2.95 #include #include -#include -#include "../plat.h" +#include "../../plat.h" #include "cdrom_dosbox.h" #ifndef _WIN32 diff --git a/src/cdrom/cdrom_dosbox.h b/src/devices/cdrom/cdrom_dosbox.h similarity index 100% rename from src/cdrom/cdrom_dosbox.h rename to src/devices/cdrom/cdrom_dosbox.h diff --git a/src/cdrom/cdrom_image.cpp b/src/devices/cdrom/cdrom_image.cpp similarity index 99% rename from src/cdrom/cdrom_image.cpp rename to src/devices/cdrom/cdrom_image.cpp index 365a400..60b4cb4 100644 --- a/src/cdrom/cdrom_image.cpp +++ b/src/devices/cdrom/cdrom_image.cpp @@ -8,7 +8,7 @@ * * CD-ROM image support. * - * Version: @(#)cdrom_image.cpp 1.0.8 2018/04/27 + * Version: @(#)cdrom_image.cpp 1.0.9 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -44,8 +44,8 @@ #include #include #include -#include "../config.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../plat.h" #include "cdrom_dosbox.h" #include "cdrom.h" #include "cdrom_image.h" diff --git a/src/cdrom/cdrom_image.h b/src/devices/cdrom/cdrom_image.h similarity index 100% rename from src/cdrom/cdrom_image.h rename to src/devices/cdrom/cdrom_image.h diff --git a/src/cdrom/cdrom_null.c b/src/devices/cdrom/cdrom_null.c similarity index 98% rename from src/cdrom/cdrom_null.c rename to src/devices/cdrom/cdrom_null.c index bc2d3a7..829fbf8 100644 --- a/src/cdrom/cdrom_null.c +++ b/src/devices/cdrom/cdrom_null.c @@ -9,7 +9,7 @@ * Implementation of the CD-ROM null interface for unmounted * guest CD-ROM drives. * - * Version: @(#)cdrom_null.c 1.0.2 2018/02/21 + * Version: @(#)cdrom_null.c 1.0.3 2018/05/06 * * Author: Miran Grca, * Sarah Walker, @@ -39,7 +39,7 @@ #include #include #include -#include "../emu.h" +#include "../../emu.h" #include "cdrom.h" diff --git a/src/cdrom/cdrom_null.h b/src/devices/cdrom/cdrom_null.h similarity index 100% rename from src/cdrom/cdrom_null.h rename to src/devices/cdrom/cdrom_null.h diff --git a/src/disk/hdc.c b/src/devices/disk/hdc.c similarity index 97% rename from src/disk/hdc.c rename to src/devices/disk/hdc.c index 22eba6e..032576b 100644 --- a/src/disk/hdc.c +++ b/src/devices/disk/hdc.c @@ -8,7 +8,7 @@ * * Common code to handle all sorts of disk controllers. * - * Version: @(#)hdc.c 1.0.12 2018/04/25 + * Version: @(#)hdc.c 1.0.13 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -40,9 +40,9 @@ #include #include #define HAVE_STDARG_H -#include "../emu.h" -#include "../machine/machine.h" -#include "../device.h" +#include "../../emu.h" +#include "../../machines/machine.h" +#include "../../device.h" #include "hdc.h" #include "hdc_ide.h" diff --git a/src/disk/hdc.h b/src/devices/disk/hdc.h similarity index 100% rename from src/disk/hdc.h rename to src/devices/disk/hdc.h diff --git a/src/disk/hdc_esdi_at.c b/src/devices/disk/hdc_esdi_at.c similarity index 98% rename from src/disk/hdc_esdi_at.c rename to src/devices/disk/hdc_esdi_at.c index f7fab21..4303244 100644 --- a/src/disk/hdc_esdi_at.c +++ b/src/devices/disk/hdc_esdi_at.c @@ -8,7 +8,7 @@ * * Driver for the ESDI controller (WD1007-vse1) for PC/AT. * - * Version: @(#)hdc_esdi_at.c 1.0.9 2018/04/28 + * Version: @(#)hdc_esdi_at.c 1.0.10 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -44,17 +44,17 @@ #include #include #include -#include "../emu.h" -#include "../cpu/cpu.h" -#include "../machine/machine.h" -#include "../io.h" -#include "../pic.h" -#include "../mem.h" -#include "../rom.h" -#include "../device.h" -#include "../timer.h" -#include "../ui/ui.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../cpu/cpu.h" +#include "../../machines/machine.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../device.h" +#include "../../timer.h" +#include "../../ui/ui.h" +#include "../../plat.h" +#include "../system/pic.h" #include "hdc.h" #include "hdd.h" diff --git a/src/disk/hdc_esdi_mca.c b/src/devices/disk/hdc_esdi_mca.c similarity index 99% rename from src/disk/hdc_esdi_mca.c rename to src/devices/disk/hdc_esdi_mca.c index 5d49041..f8a7c40 100644 --- a/src/disk/hdc_esdi_mca.c +++ b/src/devices/disk/hdc_esdi_mca.c @@ -52,7 +52,7 @@ * however, are auto-configured by the system software as * shown above. * - * Version: @(#)hdc_esdi_mca.c 1.0.10 2018/04/28 + * Version: @(#)hdc_esdi_mca.c 1.0.11 2018/05/06 * * Authors: Fred N. van Kempen, * Sarah Walker, @@ -83,16 +83,16 @@ #include #include #include -#include "../emu.h" -#include "../device.h" -#include "../io.h" -#include "../dma.h" -#include "../pic.h" -#include "../mca.h" -#include "../mem.h" -#include "../rom.h" -#include "../timer.h" -#include "../ui/ui.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../timer.h" +#include "../../device.h" +#include "../../ui/ui.h" +#include "../system/dma.h" +#include "../system/pic.h" +#include "../system/mca.h" #include "hdc.h" #include "hdd.h" diff --git a/src/disk/hdc_ide.h b/src/devices/disk/hdc_ide.h similarity index 100% rename from src/disk/hdc_ide.h rename to src/devices/disk/hdc_ide.h diff --git a/src/disk/hdc_ide_ata.c b/src/devices/disk/hdc_ide_ata.c similarity index 99% rename from src/disk/hdc_ide_ata.c rename to src/devices/disk/hdc_ide_ata.c index 561d4d5..fd9b35e 100644 --- a/src/disk/hdc_ide_ata.c +++ b/src/devices/disk/hdc_ide_ata.c @@ -14,7 +14,7 @@ * Devices currently implemented are hard disk, CD-ROM and * ZIP IDE/ATAPI devices. * - * Version: @(#)hdc_ide_ata.c 1.0.21 2018/04/28 + * Version: @(#)hdc_ide_ata.c 1.0.22 2018/05/06 * * Authors: Miran Grca, * Sarah Walker, @@ -50,19 +50,19 @@ #include #include #include -#include "../emu.h" -#include "../version.h" -#include "../cpu/cpu.h" -#include "../machine/machine.h" -#include "../io.h" -#include "../pic.h" -#include "../pci.h" -#include "../timer.h" -#include "../device.h" +#include "../../emu.h" +#include "../../version.h" +#include "../../cpu/cpu.h" +#include "../../machines/machine.h" +#include "../../io.h" +#include "../../timer.h" +#include "../../device.h" +#include "../../ui/ui.h" +#include "../../plat.h" +#include "../system/pic.h" +#include "../system/pci.h" #include "../cdrom/cdrom.h" #include "../scsi/scsi.h" -#include "../ui/ui.h" -#include "../plat.h" #include "hdc.h" #include "hdc_ide.h" #include "hdd.h" diff --git a/src/disk/hdc_ide_xta.c b/src/devices/disk/hdc_ide_xta.c similarity index 99% rename from src/disk/hdc_ide_xta.c rename to src/devices/disk/hdc_ide_xta.c index e1bd8fb..fd082e5 100644 --- a/src/disk/hdc_ide_xta.c +++ b/src/devices/disk/hdc_ide_xta.c @@ -46,7 +46,7 @@ * * NOTE: The XTA interface is 0-based for sector numbers !! * - * Version: @(#)hdc_ide_xta.c 1.0.6 2018/04/28 + * Version: @(#)hdc_ide_xta.c 1.0.7 2018/05/06 * * Author: Fred N. van Kempen, * @@ -92,16 +92,16 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../dma.h" -#include "../pic.h" -#include "../mem.h" -#include "../rom.h" -#include "../device.h" -#include "../timer.h" -#include "../ui/ui.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../timer.h" +#include "../../device.h" +#include "../../ui/ui.h" +#include "../../plat.h" +#include "../system/dma.h" +#include "../system/pic.h" #include "hdc.h" #include "hdd.h" diff --git a/src/disk/hdc_st506_at.c b/src/devices/disk/hdc_st506_at.c similarity index 98% rename from src/disk/hdc_st506_at.c rename to src/devices/disk/hdc_st506_at.c index eb9a2bc..f0889c0 100644 --- a/src/disk/hdc_st506_at.c +++ b/src/devices/disk/hdc_st506_at.c @@ -12,7 +12,7 @@ * based design. Most cards were WD1003-WA2 or -WAH, where the * -WA2 cards had a floppy controller as well (to save space.) * - * Version: @(#)hdc_st506_at.c 1.0.7 2018/04/28 + * Version: @(#)hdc_st506_at.c 1.0.8 2018/05/06 * * Authors: Fred N. van Kempen, * Sarah Walker, @@ -46,15 +46,15 @@ #include #include #include -#include "../emu.h" -#include "../cpu/cpu.h" -#include "../machine/machine.h" -#include "../io.h" -#include "../pic.h" -#include "../device.h" -#include "../timer.h" -#include "../ui/ui.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../cpu/cpu.h" +#include "../../machines/machine.h" +#include "../../io.h" +#include "../../timer.h" +#include "../../device.h" +#include "../../ui/ui.h" +#include "../../plat.h" +#include "../system/pic.h" #include "hdc.h" #include "hdd.h" diff --git a/src/disk/hdc_st506_xt.c b/src/devices/disk/hdc_st506_xt.c similarity index 98% rename from src/disk/hdc_st506_xt.c rename to src/devices/disk/hdc_st506_xt.c index 4fb4ed9..8b367d8 100644 --- a/src/disk/hdc_st506_xt.c +++ b/src/devices/disk/hdc_st506_xt.c @@ -41,7 +41,7 @@ * Since all controllers (including the ones made by DTC) use * (mostly) the same API, we keep them all in this module. * - * Version: @(#)hdc_st506_xt.c 1.0.9 2018/04/28 + * Version: @(#)hdc_st506_xt.c 1.0.10 2018/05/06 * * Authors: Fred N. van Kempen, * Sarah Walker, @@ -75,16 +75,16 @@ #include #include #include -#include "../emu.h" -#include "../device.h" -#include "../dma.h" -#include "../io.h" -#include "../mem.h" -#include "../pic.h" -#include "../rom.h" -#include "../timer.h" -#include "../ui/ui.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../timer.h" +#include "../../device.h" +#include "../../ui/ui.h" +#include "../../plat.h" +#include "../system/dma.h" +#include "../system/pic.h" #include "hdc.h" #include "hdd.h" diff --git a/src/disk/hdc_xtide.c b/src/devices/disk/hdc_xtide.c similarity index 96% rename from src/disk/hdc_xtide.c rename to src/devices/disk/hdc_xtide.c index ec9a4f7..011bb23 100644 --- a/src/disk/hdc_xtide.c +++ b/src/devices/disk/hdc_xtide.c @@ -21,7 +21,7 @@ * already on their way out, the newer IDE standard based on the * PC/AT controller and 16b design became the IDE we now know. * - * Version: @(#)hdc_xtide.c 1.0.7 2018/04/23 + * Version: @(#)hdc_xtide.c 1.0.8 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -52,11 +52,11 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../mem.h" -#include "../rom.h" -#include "../device.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../device.h" #include "hdc.h" #include "hdc_ide.h" diff --git a/src/disk/hdd.c b/src/devices/disk/hdd.c similarity index 97% rename from src/disk/hdd.c rename to src/devices/disk/hdd.c index 8db3060..279a085 100644 --- a/src/disk/hdd.c +++ b/src/devices/disk/hdd.c @@ -8,7 +8,7 @@ * * Common code to handle all sorts of hard disk images. * - * Version: @(#)hdd.c 1.0.5 2018/04/28 + * Version: @(#)hdd.c 1.0.6 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -40,9 +40,9 @@ #include #include #define HAVE_STDARG_H -#include "../emu.h" -#include "../ui/ui.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../ui/ui.h" +#include "../../plat.h" #include "hdd.h" diff --git a/src/disk/hdd.h b/src/devices/disk/hdd.h similarity index 100% rename from src/disk/hdd.h rename to src/devices/disk/hdd.h diff --git a/src/disk/hdd_image.c b/src/devices/disk/hdd_image.c similarity index 99% rename from src/disk/hdd_image.c rename to src/devices/disk/hdd_image.c index 36053e5..5e43070 100644 --- a/src/disk/hdd_image.c +++ b/src/devices/disk/hdd_image.c @@ -8,7 +8,7 @@ * * Handling of hard disk image files. * - * Version: @(#)hdd_image.c 1.0.4 2018/04/02 + * Version: @(#)hdd_image.c 1.0.5 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -43,8 +43,8 @@ #include #include #include -#include "../emu.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../plat.h" #include "hdd.h" diff --git a/src/disk/hdd_table.c b/src/devices/disk/hdd_table.c similarity index 98% rename from src/disk/hdd_table.c rename to src/devices/disk/hdd_table.c index 6386144..e60fb9d 100644 --- a/src/disk/hdd_table.c +++ b/src/devices/disk/hdd_table.c @@ -8,7 +8,7 @@ * * Define the available hard disk types. * - * Version: @(#)hdd_table.c 1.0.2 2018/03/29 + * Version: @(#)hdd_table.c 1.0.3 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -39,7 +39,7 @@ #include #include #include -#include "../emu.h" +#include "../../emu.h" #include "hdd.h" diff --git a/src/disk/zip.c b/src/devices/disk/zip.c similarity index 99% rename from src/disk/zip.c rename to src/devices/disk/zip.c index dbb2f58..cd9d1e9 100644 --- a/src/disk/zip.c +++ b/src/devices/disk/zip.c @@ -9,7 +9,7 @@ * Implementation of the Iomega ZIP drive with SCSI(-like) * commands, for both ATAPI and SCSI usage. * - * Version: @(#)zip.c 1.0.13 2018/05/04 + * Version: @(#)zip.c 1.0.14 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,17 +41,17 @@ #include #include #define HAVE_STDARG_H -#include "../emu.h" -#include "../config.h" -#include "../timer.h" -#include "../device.h" -#include "../intel_piix.h" +#include "../../emu.h" +#include "../../config.h" +#include "../../timer.h" +#include "../../device.h" +#include "../../nvr.h" +#include "../../ui/ui.h" +#include "../../plat.h" +#include "../system/intel_piix.h" #include "../scsi/scsi.h" -#include "../nvr.h" #include "../disk/hdc.h" #include "../disk/hdc_ide.h" -#include "../ui/ui.h" -#include "../plat.h" #include "zip.h" diff --git a/src/disk/zip.h b/src/devices/disk/zip.h similarity index 100% rename from src/disk/zip.h rename to src/devices/disk/zip.h diff --git a/src/floppy/fdc.c b/src/devices/floppy/fdc.c similarity index 99% rename from src/floppy/fdc.c rename to src/devices/floppy/fdc.c index 073faa9..6e5a292 100644 --- a/src/floppy/fdc.c +++ b/src/devices/floppy/fdc.c @@ -9,7 +9,7 @@ * Implementation of the NEC uPD-765 and compatible floppy disk * controller. * - * Version: @(#)fdc.c 1.0.10 2018/05/04 + * Version: @(#)fdc.c 1.0.11 2018/05/06 * * Authors: Miran Grca, * Sarah Walker, @@ -42,17 +42,17 @@ #include #include #define HAVE_STDARG_H -#include "../emu.h" -#include "../device.h" -#include "../cpu/cpu.h" -#include "../machine/machine.h" -#include "../io.h" -#include "../mem.h" -#include "../rom.h" -#include "../dma.h" -#include "../pic.h" -#include "../timer.h" -#include "../ui/ui.h" +#include "../../emu.h" +#include "../../cpu/cpu.h" +#include "../../machines/machine.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../timer.h" +#include "../../device.h" +#include "../../ui/ui.h" +#include "../system/dma.h" +#include "../system/pic.h" #include "fdd.h" #include "fdc.h" diff --git a/src/floppy/fdc.h b/src/devices/floppy/fdc.h similarity index 100% rename from src/floppy/fdc.h rename to src/devices/floppy/fdc.h diff --git a/src/floppy/fdd.c b/src/devices/floppy/fdd.c similarity index 98% rename from src/floppy/fdd.c rename to src/devices/floppy/fdd.c index da8d711..60183be 100644 --- a/src/floppy/fdd.c +++ b/src/devices/floppy/fdd.c @@ -10,7 +10,7 @@ * * TODO: Implement the ENABLE_FDD_LOG stuff. * - * Version: @(#)fdd.c 1.0.11 2018/04/29 + * Version: @(#)fdd.c 1.0.12 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -42,14 +42,14 @@ #include #include #include -#include "../emu.h" -#include "../machine/machine.h" -#include "../mem.h" -#include "../rom.h" -#include "../config.h" -#include "../timer.h" -#include "../ui/ui.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../machines/machine.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../config.h" +#include "../../timer.h" +#include "../../ui/ui.h" +#include "../../plat.h" #include "fdd.h" #include "fdd_86f.h" #include "fdd_fdi.h" diff --git a/src/floppy/fdd.h b/src/devices/floppy/fdd.h similarity index 100% rename from src/floppy/fdd.h rename to src/devices/floppy/fdd.h diff --git a/src/floppy/fdd_86f.c b/src/devices/floppy/fdd_86f.c similarity index 99% rename from src/floppy/fdd_86f.c rename to src/devices/floppy/fdd_86f.c index b179784..767d8b9 100644 --- a/src/floppy/fdd_86f.c +++ b/src/devices/floppy/fdd_86f.c @@ -10,7 +10,7 @@ * data in the form of FM/MFM-encoded transitions) which also * forms the core of the emulator's floppy disk emulation. * - * Version: @(#)fdd_86f.c 1.0.9 2018/05/04 + * Version: @(#)fdd_86f.c 1.0.10 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -44,13 +44,12 @@ #include #include #define HAVE_STDARG_H -#include "../emu.h" -#include "../config.h" -#include "../dma.h" -#include "../nvr.h" -#include "../random.h" -#include "../ui/ui.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../nvr.h" +#include "../../random.h" +#include "../../ui/ui.h" +#include "../../plat.h" +#include "../system/dma.h" #include "fdd.h" #include "fdc.h" #include "fdd_86f.h" diff --git a/src/floppy/fdd_86f.h b/src/devices/floppy/fdd_86f.h similarity index 100% rename from src/floppy/fdd_86f.h rename to src/devices/floppy/fdd_86f.h diff --git a/src/floppy/fdd_common.c b/src/devices/floppy/fdd_common.c similarity index 99% rename from src/floppy/fdd_common.c rename to src/devices/floppy/fdd_common.c index b775e36..fbc9c1d 100644 --- a/src/floppy/fdd_common.c +++ b/src/devices/floppy/fdd_common.c @@ -8,7 +8,7 @@ * * Shared code for all the floppy modules. * - * Version: @(#)fdd_common.c 1.0.3 2018/03/19 + * Version: @(#)fdd_common.c 1.0.4 2018/05/06 * * Author: Fred N. van Kempen, * @@ -37,7 +37,7 @@ #include #include #include -#include "../emu.h" +#include "../../emu.h" #include "fdd.h" #include "fdd_common.h" diff --git a/src/floppy/fdd_common.h b/src/devices/floppy/fdd_common.h similarity index 100% rename from src/floppy/fdd_common.h rename to src/devices/floppy/fdd_common.h diff --git a/src/floppy/fdd_fdi.c b/src/devices/floppy/fdd_fdi.c similarity index 98% rename from src/floppy/fdd_fdi.c rename to src/devices/floppy/fdd_fdi.c index 8e3cb4b..3195c46 100644 --- a/src/floppy/fdd_fdi.c +++ b/src/devices/floppy/fdd_fdi.c @@ -9,7 +9,7 @@ * Implementation of the FDI floppy stream image format * interface to the FDI2RAW module. * - * Version: @(#)fdd_fdi.c 1.0.3 2018/04/10 + * Version: @(#)fdd_fdi.c 1.0.4 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -42,8 +42,8 @@ #include #include #include -#include "../emu.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../plat.h" #include "fdd.h" #include "fdd_86f.h" #include "fdd_img.h" diff --git a/src/floppy/fdd_fdi.h b/src/devices/floppy/fdd_fdi.h similarity index 100% rename from src/floppy/fdd_fdi.h rename to src/devices/floppy/fdd_fdi.h diff --git a/src/floppy/fdd_imd.c b/src/devices/floppy/fdd_imd.c similarity index 99% rename from src/floppy/fdd_imd.c rename to src/devices/floppy/fdd_imd.c index 0a8d7e3..fd2465c 100644 --- a/src/floppy/fdd_imd.c +++ b/src/devices/floppy/fdd_imd.c @@ -8,7 +8,7 @@ * * Implementation of the IMD floppy image format. * - * Version: @(#)fdd_imd.c 1.0.7 2018/04/10 + * Version: @(#)fdd_imd.c 1.0.8 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -39,8 +39,8 @@ #include #include #include -#include "../emu.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../plat.h" #include "fdd.h" #include "fdd_imd.h" #include "fdc.h" diff --git a/src/floppy/fdd_imd.h b/src/devices/floppy/fdd_imd.h similarity index 100% rename from src/floppy/fdd_imd.h rename to src/devices/floppy/fdd_imd.h diff --git a/src/floppy/fdd_img.c b/src/devices/floppy/fdd_img.c similarity index 99% rename from src/floppy/fdd_img.c rename to src/devices/floppy/fdd_img.c index 9d43097..7636d9a 100644 --- a/src/floppy/fdd_img.c +++ b/src/devices/floppy/fdd_img.c @@ -13,7 +13,7 @@ * re-merged with the other files. Much of it is generic to * all formats. * - * Version: @(#)fdd_img.c 1.0.7 2018/05/04 + * Version: @(#)fdd_img.c 1.0.8 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -46,9 +46,8 @@ #include #include #include -#include "../emu.h" -#include "../config.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../plat.h" #include "fdd.h" #include "fdd_img.h" #include "fdc.h" diff --git a/src/floppy/fdd_img.h b/src/devices/floppy/fdd_img.h similarity index 100% rename from src/floppy/fdd_img.h rename to src/devices/floppy/fdd_img.h diff --git a/src/floppy/fdd_json.c b/src/devices/floppy/fdd_json.c similarity index 99% rename from src/floppy/fdd_json.c rename to src/devices/floppy/fdd_json.c index a7ee3b6..215143c 100644 --- a/src/floppy/fdd_json.c +++ b/src/devices/floppy/fdd_json.c @@ -8,7 +8,7 @@ * * Implementation of the PCjs JSON floppy image format. * - * Version: @(#)fdd_json.c 1.0.5 2018/04/10 + * Version: @(#)fdd_json.c 1.0.6 2018/05/06 * * Author: Fred N. van Kempen, * @@ -49,8 +49,8 @@ #include #include #include -#include "../emu.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../plat.h" #include "fdd.h" #include "fdc.h" #include "fdd_common.h" diff --git a/src/floppy/fdd_json.h b/src/devices/floppy/fdd_json.h similarity index 100% rename from src/floppy/fdd_json.h rename to src/devices/floppy/fdd_json.h diff --git a/src/floppy/fdd_td0.c b/src/devices/floppy/fdd_td0.c similarity index 99% rename from src/floppy/fdd_td0.c rename to src/devices/floppy/fdd_td0.c index 5e2eb47..79065cb 100644 --- a/src/floppy/fdd_td0.c +++ b/src/devices/floppy/fdd_td0.c @@ -8,7 +8,7 @@ * * Implementation of the Teledisk floppy image format. * - * Version: @(#)fdd_td0.c 1.0.6 2018/04/10 + * Version: @(#)fdd_td0.c 1.0.7 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -51,8 +51,8 @@ #include #include #include -#include "../emu.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../plat.h" #include "fdd.h" #include "fdd_td0.h" #include "fdc.h" diff --git a/src/floppy/fdd_td0.h b/src/devices/floppy/fdd_td0.h similarity index 100% rename from src/floppy/fdd_td0.h rename to src/devices/floppy/fdd_td0.h diff --git a/src/floppy/fdi2raw.c b/src/devices/floppy/fdi2raw.c similarity index 99% rename from src/floppy/fdi2raw.c rename to src/devices/floppy/fdi2raw.c index bb0ad9a..9601b6b 100644 --- a/src/floppy/fdi2raw.c +++ b/src/devices/floppy/fdi2raw.c @@ -12,7 +12,7 @@ * addition of get_last_head and C++ callability by Thomas * Harte. * - * Version: @(#)fdi2raw.c 1.0.3 2018/05/04 + * Version: @(#)fdi2raw.c 1.0.4 2018/05/06 * * Authors: Toni Wilen, * and Vincent Joguin, @@ -46,23 +46,14 @@ #include #include #include - -/* IF UAE */ -/*#include "sysconfig.h" -#include "sysdeps.h" -#include "zfile.h"*/ -/* ELSE */ -#define xmalloc malloc -#include "../emu.h" +#include "../../emu.h" #include "fdi2raw.h" -#undef DEBUG -#define VERBOSE -#undef VERBOSE +#undef _DEBUG -#ifdef DEBUG +#ifdef _DEBUG static char *datalog(uae_u8 *src, int len) { static char buf[1000]; @@ -90,7 +81,7 @@ static char *datalog(uae_u8 *src, int len) { return ""; } #define debuglog pclog static int fdi_allocated; -#ifdef DEBUG +#ifdef _DEBUG static void fdi_free (void *p) { int size; @@ -103,7 +94,7 @@ static void fdi_free (void *p) } static void *fdi_malloc (int size) { - void *p = xmalloc (size + sizeof (int)); + void *p = malloc (size + sizeof (int)); ((int*)p)[0] = size; fdi_allocated += size; write_log ("%d allocated (%d)\n", size, fdi_allocated); @@ -111,7 +102,7 @@ static void *fdi_malloc (int size) } #else #define fdi_free free -#define fdi_malloc xmalloc +#define fdi_malloc malloc #endif #define MAX_SRC_BUFFER 4194304 diff --git a/src/floppy/fdi2raw.h b/src/devices/floppy/fdi2raw.h similarity index 100% rename from src/floppy/fdi2raw.h rename to src/devices/floppy/fdi2raw.h diff --git a/src/floppy/lzf/Changes b/src/devices/floppy/lzf/Changes similarity index 100% rename from src/floppy/lzf/Changes rename to src/devices/floppy/lzf/Changes diff --git a/src/floppy/lzf/LICENSE b/src/devices/floppy/lzf/LICENSE similarity index 100% rename from src/floppy/lzf/LICENSE rename to src/devices/floppy/lzf/LICENSE diff --git a/src/floppy/lzf/Makefile.in b/src/devices/floppy/lzf/Makefile.in similarity index 100% rename from src/floppy/lzf/Makefile.in rename to src/devices/floppy/lzf/Makefile.in diff --git a/src/floppy/lzf/README b/src/devices/floppy/lzf/README similarity index 100% rename from src/floppy/lzf/README rename to src/devices/floppy/lzf/README diff --git a/src/floppy/lzf/config.h b/src/devices/floppy/lzf/config.h similarity index 100% rename from src/floppy/lzf/config.h rename to src/devices/floppy/lzf/config.h diff --git a/src/floppy/lzf/configure b/src/devices/floppy/lzf/configure similarity index 100% rename from src/floppy/lzf/configure rename to src/devices/floppy/lzf/configure diff --git a/src/floppy/lzf/configure.ac b/src/devices/floppy/lzf/configure.ac similarity index 100% rename from src/floppy/lzf/configure.ac rename to src/devices/floppy/lzf/configure.ac diff --git a/src/floppy/lzf/crc32.h b/src/devices/floppy/lzf/crc32.h similarity index 100% rename from src/floppy/lzf/crc32.h rename to src/devices/floppy/lzf/crc32.h diff --git a/src/floppy/lzf/install-sh b/src/devices/floppy/lzf/install-sh similarity index 100% rename from src/floppy/lzf/install-sh rename to src/devices/floppy/lzf/install-sh diff --git a/src/floppy/lzf/lzf.c b/src/devices/floppy/lzf/lzf.c similarity index 100% rename from src/floppy/lzf/lzf.c rename to src/devices/floppy/lzf/lzf.c diff --git a/src/floppy/lzf/lzf.h b/src/devices/floppy/lzf/lzf.h similarity index 100% rename from src/floppy/lzf/lzf.h rename to src/devices/floppy/lzf/lzf.h diff --git a/src/floppy/lzf/lzfP.h b/src/devices/floppy/lzf/lzfP.h similarity index 100% rename from src/floppy/lzf/lzfP.h rename to src/devices/floppy/lzf/lzfP.h diff --git a/src/floppy/lzf/lzf_c.c b/src/devices/floppy/lzf/lzf_c.c similarity index 100% rename from src/floppy/lzf/lzf_c.c rename to src/devices/floppy/lzf/lzf_c.c diff --git a/src/floppy/lzf/lzf_d.c b/src/devices/floppy/lzf/lzf_d.c similarity index 100% rename from src/floppy/lzf/lzf_d.c rename to src/devices/floppy/lzf/lzf_d.c diff --git a/src/input/game/joystick.c b/src/devices/input/game/joystick.c similarity index 93% rename from src/input/game/joystick.c rename to src/devices/input/game/joystick.c index 726ee65..ce68637 100644 --- a/src/input/game/joystick.c +++ b/src/devices/input/game/joystick.c @@ -8,7 +8,7 @@ * * Implementation of generic joystick device. * - * Version: @(#)joystick.c 1.0.2 2018/04/26 + * Version: @(#)joystick.c 1.0.3 2018/05/06 * * Authors: Fred N. van Kempen, * Sarah Walker, @@ -39,8 +39,8 @@ #include #include #include -#include "../../emu.h" -#include "../../timer.h" +#include "../../../emu.h" +#include "../../../timer.h" #include "joystick.h" diff --git a/src/input/game/joystick.h b/src/devices/input/game/joystick.h similarity index 100% rename from src/input/game/joystick.h rename to src/devices/input/game/joystick.h diff --git a/src/input/game/js_ch_fs_pro.c b/src/devices/input/game/js_ch_fs_pro.c similarity index 96% rename from src/input/game/js_ch_fs_pro.c rename to src/devices/input/game/js_ch_fs_pro.c index 0f0cea0..7c3608c 100644 --- a/src/input/game/js_ch_fs_pro.c +++ b/src/devices/input/game/js_ch_fs_pro.c @@ -8,7 +8,7 @@ * * Implementation of the Flight Stick Pro. * - * Version: @(#)js_fs_pro.c 1.0.6 2018/04/26 + * Version: @(#)js_fs_pro.c 1.0.7 2018/05/06 * * Authors: Miran Grca, * Sarah Walker, @@ -39,8 +39,8 @@ #include #include #include -#include "../../emu.h" -#include "../../timer.h" +#include "../../../emu.h" +#include "../../../timer.h" #include "../../ports/game_dev.h" #include "joystick.h" diff --git a/src/input/game/js_standard.c b/src/devices/input/game/js_standard.c similarity index 98% rename from src/input/game/js_standard.c rename to src/devices/input/game/js_standard.c index 3331d2a..1ddaca6 100644 --- a/src/input/game/js_standard.c +++ b/src/devices/input/game/js_standard.c @@ -8,7 +8,7 @@ * * Implementation of a standard joystick. * - * Version: @(#)js_standard.c 1.0.8 2018/05/03 + * Version: @(#)js_standard.c 1.0.9 2018/05/06 * * Authors: Fred N. van Kempen, * Sarah Walker, @@ -39,8 +39,8 @@ #include #include #include -#include "../../emu.h" -#include "../../timer.h" +#include "../../../emu.h" +#include "../../../timer.h" #include "../../ports/game_dev.h" #include "joystick.h" diff --git a/src/input/game/js_sw_pad.c b/src/devices/input/game/js_sw_pad.c similarity index 98% rename from src/input/game/js_sw_pad.c rename to src/devices/input/game/js_sw_pad.c index 9584a3e..aec2d20 100644 --- a/src/input/game/js_sw_pad.c +++ b/src/devices/input/game/js_sw_pad.c @@ -29,7 +29,7 @@ * - Some DOS stuff will write to 0x201 while a packet is * being transferred. This seems to be ignored. * - * Version: @(#)js_sw_pad.c 1.0.7 2018/04/26 + * Version: @(#)js_sw_pad.c 1.0.8 2018/05/06 * * Authors: Fred N. van Kempen, * Sarah Walker, @@ -60,8 +60,8 @@ #include #include #include -#include "../../emu.h" -#include "../../timer.h" +#include "../../../emu.h" +#include "../../../timer.h" #include "../../ports/game_dev.h" #include "joystick.h" diff --git a/src/input/game/js_tm_fcs.c b/src/devices/input/game/js_tm_fcs.c similarity index 96% rename from src/input/game/js_tm_fcs.c rename to src/devices/input/game/js_tm_fcs.c index 4a4e34b..e1e7a96 100644 --- a/src/input/game/js_tm_fcs.c +++ b/src/devices/input/game/js_tm_fcs.c @@ -8,7 +8,7 @@ * * Implementation of Thrust Master Flight Control System. * - * Version: @(#)js_tm_fcs.c 1.0.5 2018/04/26 + * Version: @(#)js_tm_fcs.c 1.0.6 2018/05/06 * * Authors: Fred N. van Kempen, * Sarah Walker, @@ -39,8 +39,8 @@ #include #include #include -#include "../../emu.h" -#include "../../timer.h" +#include "../../../emu.h" +#include "../../../timer.h" #include "../../ports/game_dev.h" #include "joystick.h" diff --git a/src/input/keyboard.c b/src/devices/input/keyboard.c similarity index 98% rename from src/input/keyboard.c rename to src/devices/input/keyboard.c index 69e06a7..73d7c24 100644 --- a/src/input/keyboard.c +++ b/src/devices/input/keyboard.c @@ -8,7 +8,7 @@ * * General keyboard driver interface. * - * Version: @(#)keyboard.c 1.0.5 2018/04/26 + * Version: @(#)keyboard.c 1.0.6 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -42,8 +42,8 @@ #include #include #define HAVE_STDARG_H -#include "../emu.h" -#include "../machine/machine.h" +#include "../../emu.h" +#include "../../machines/machine.h" #include "keyboard.h" diff --git a/src/input/keyboard.h b/src/devices/input/keyboard.h similarity index 100% rename from src/input/keyboard.h rename to src/devices/input/keyboard.h diff --git a/src/input/keyboard_at.c b/src/devices/input/keyboard_at.c similarity index 99% rename from src/input/keyboard_at.c rename to src/devices/input/keyboard_at.c index 9817bc8..2890b11 100644 --- a/src/input/keyboard_at.c +++ b/src/devices/input/keyboard_at.c @@ -8,7 +8,7 @@ * * Intel 8042 (AT keyboard controller) emulation. * - * Version: @(#)keyboard_at.c 1.0.11 2018/04/26 + * Version: @(#)keyboard_at.c 1.0.12 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,16 +41,16 @@ #include #include #include -#include "../emu.h" -#include "../cpu/cpu.h" -#include "../machine/machine.h" -#include "../io.h" -#include "../pic.h" -#include "../pit.h" -#include "../ppi.h" -#include "../mem.h" -#include "../timer.h" -#include "../device.h" +#include "../../emu.h" +#include "../../cpu/cpu.h" +#include "../../machines/machine.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../timer.h" +#include "../../device.h" +#include "../system/pic.h" +#include "../system/pit.h" +#include "../system/ppi.h" #include "../floppy/fdd.h" #include "../floppy/fdc.h" #include "../sound/sound.h" @@ -58,8 +58,8 @@ #include "../video/video.h" #include "keyboard.h" -#include "../machine/m_at_t3100e.h" -#include "../machine/m_xt_xi8088.h" +#include "../../machines/m_at_t3100e.h" +#include "../../machines/m_xt_xi8088.h" #define STAT_PARITY 0x80 diff --git a/src/input/keyboard_xt.c b/src/devices/input/keyboard_xt.c similarity index 98% rename from src/input/keyboard_xt.c rename to src/devices/input/keyboard_xt.c index 3807479..fd9a004 100644 --- a/src/input/keyboard_xt.c +++ b/src/devices/input/keyboard_xt.c @@ -8,7 +8,7 @@ * * Implementation of the XT-style keyboard. * - * Version: @(#)keyboard_xt.c 1.0.6 2018/04/26 + * Version: @(#)keyboard_xt.c 1.0.7 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,14 +41,14 @@ #include #include #include -#include "../emu.h" -#include "../machine/machine.h" -#include "../io.h" -#include "../pic.h" -#include "../pit.h" -#include "../ppi.h" -#include "../timer.h" -#include "../device.h" +#include "../../emu.h" +#include "../../machines/machine.h" +#include "../../io.h" +#include "../../timer.h" +#include "../../device.h" +#include "../system/pic.h" +#include "../system/pit.h" +#include "../system/ppi.h" #include "../sound/sound.h" #include "../sound/snd_speaker.h" #include "../video/video.h" diff --git a/src/input/mouse.c b/src/devices/input/mouse.c similarity index 98% rename from src/input/mouse.c rename to src/devices/input/mouse.c index dfd2811..d06ceb4 100644 --- a/src/input/mouse.c +++ b/src/devices/input/mouse.c @@ -10,7 +10,7 @@ * * TODO: Add the Genius bus- and serial mouse. * - * Version: @(#)mouse.c 1.0.10 2018/04/29 + * Version: @(#)mouse.c 1.0.11 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -52,8 +52,8 @@ #include #include #include -#include "../emu.h" -#include "../device.h" +#include "../../emu.h" +#include "../../device.h" #include "mouse.h" diff --git a/src/input/mouse.h b/src/devices/input/mouse.h similarity index 100% rename from src/input/mouse.h rename to src/devices/input/mouse.h diff --git a/src/input/mouse_bus.c b/src/devices/input/mouse_bus.c similarity index 98% rename from src/input/mouse_bus.c rename to src/devices/input/mouse_bus.c index 2d30b68..0d91814 100644 --- a/src/input/mouse_bus.c +++ b/src/devices/input/mouse_bus.c @@ -49,7 +49,7 @@ * * Based on an early driver for MINIX 1.5. * - * Version: @(#)mouse_bus.c 1.0.6 2018/04/26 + * Version: @(#)mouse_bus.c 1.0.7 2018/05/06 * * Author: Fred N. van Kempen, * @@ -90,12 +90,12 @@ #include #include #include -#include "../emu.h" -#include "../config.h" -#include "../io.h" -#include "../pic.h" -#include "../timer.h" -#include "../device.h" +#include "../../emu.h" +#include "../../config.h" +#include "../../io.h" +#include "../../timer.h" +#include "../../device.h" +#include "../system/pic.h" #include "mouse.h" diff --git a/src/input/mouse_ps2.c b/src/devices/input/mouse_ps2.c similarity index 98% rename from src/input/mouse_ps2.c rename to src/devices/input/mouse_ps2.c index a9f706b..ef880d4 100644 --- a/src/input/mouse_ps2.c +++ b/src/devices/input/mouse_ps2.c @@ -8,7 +8,7 @@ * * Implementation of PS/2 series Mouse devices. * - * Version: @(#)mouse_ps2.c 1.0.6 2018/04/26 + * Version: @(#)mouse_ps2.c 1.0.7 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,9 +41,9 @@ #include #include #include -#include "../emu.h" -#include "../config.h" -#include "../device.h" +#include "../../emu.h" +#include "../../config.h" +#include "../../device.h" #include "keyboard.h" #include "mouse.h" diff --git a/src/input/mouse_serial.c b/src/devices/input/mouse_serial.c similarity index 98% rename from src/input/mouse_serial.c rename to src/devices/input/mouse_serial.c index 3b2e670..c8ec2d9 100644 --- a/src/input/mouse_serial.c +++ b/src/devices/input/mouse_serial.c @@ -10,7 +10,7 @@ * * TODO: Add the Genius Serial Mouse. * - * Version: @(#)mouse_serial.c 1.0.8 2018/04/26 + * Version: @(#)mouse_serial.c 1.0.9 2018/05/06 * * Author: Fred N. van Kempen, * @@ -51,10 +51,10 @@ #include #include #include -#include "../emu.h" -#include "../config.h" -#include "../device.h" -#include "../timer.h" +#include "../../emu.h" +#include "../../config.h" +#include "../../device.h" +#include "../../timer.h" #include "../ports/serial.h" #include "mouse.h" diff --git a/src/network/bswap.h b/src/devices/network/bswap.h similarity index 100% rename from src/network/bswap.h rename to src/devices/network/bswap.h diff --git a/src/network/net_ne2000.c b/src/devices/network/net_ne2000.c similarity index 99% rename from src/network/net_ne2000.c rename to src/devices/network/net_ne2000.c index c454148..5e79c1a 100644 --- a/src/network/net_ne2000.c +++ b/src/devices/network/net_ne2000.c @@ -12,7 +12,7 @@ * - Realtek RTL8019AS (ISA 16-bit, PnP); * - Realtek RTL8029AS (PCI). * - * Version: @(#)net_ne2000.c 1.0.9 2018/05/04 + * Version: @(#)net_ne2000.c 1.0.10 2018/05/06 * * Based on @(#)ne2k.cc v1.56.2.1 2004/02/02 22:37:22 cbothamy * @@ -51,18 +51,18 @@ #include #include #define HAVE_STDARG_H -#include "../emu.h" -#include "../config.h" -#include "../machine/machine.h" -#include "../io.h" -#include "../mem.h" -#include "../rom.h" -#include "../pci.h" -#include "../pic.h" -#include "../random.h" -#include "../device.h" -#include "../ui/ui.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../config.h" +#include "../../machines/machine.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../random.h" +#include "../../device.h" +#include "../../ui/ui.h" +#include "../../plat.h" +#include "../system/pci.h" +#include "../system/pic.h" #include "network.h" #include "net_ne2000.h" #include "bswap.h" diff --git a/src/network/net_ne2000.h b/src/devices/network/net_ne2000.h similarity index 100% rename from src/network/net_ne2000.h rename to src/devices/network/net_ne2000.h diff --git a/src/network/net_pcap.c b/src/devices/network/net_pcap.c similarity index 98% rename from src/network/net_pcap.c rename to src/devices/network/net_pcap.c index d50d1bd..2864389 100644 --- a/src/network/net_pcap.c +++ b/src/devices/network/net_pcap.c @@ -8,7 +8,7 @@ * * Handle WinPcap library processing. * - * Version: @(#)net_pcap.c 1.0.5 2018/03/28 + * Version: @(#)net_pcap.c 1.0.6 2018/05/06 * * Author: Fred N. van Kempen, * @@ -53,10 +53,10 @@ # define WIN32 #endif #include -#include "../emu.h" -#include "../config.h" -#include "../device.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../config.h" +#include "../../device.h" +#include "../../plat.h" #include "network.h" diff --git a/src/network/net_slirp.c b/src/devices/network/net_slirp.c similarity index 97% rename from src/network/net_slirp.c rename to src/devices/network/net_slirp.c index 9ca6b41..c45e491 100644 --- a/src/network/net_slirp.c +++ b/src/devices/network/net_slirp.c @@ -8,7 +8,7 @@ * * Handle SLiRP library processing. * - * Version: @(#)net_slirp.c 1.0.2 2018/03/15 + * Version: @(#)net_slirp.c 1.0.3 2018/05/06 * * Author: Fred N. van Kempen, * @@ -51,10 +51,10 @@ #include #include "slirp/slirp.h" #include "slirp/queue.h" -#include "../emu.h" -#include "../config.h" -#include "../device.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../config.h" +#include "../../device.h" +#include "../../plat.h" #include "network.h" diff --git a/src/network/network.c b/src/devices/network/network.c similarity index 98% rename from src/network/network.c rename to src/devices/network/network.c index 33f10ee..0f666d6 100644 --- a/src/network/network.c +++ b/src/devices/network/network.c @@ -12,7 +12,7 @@ * it should be malloc'ed and then linked to the NETCARD def. * Will be done later. * - * Version: @(#)network.c 1.0.8 2018/04/29 + * Version: @(#)network.c 1.0.9 2018/05/06 * * Author: Fred N. van Kempen, * @@ -58,10 +58,10 @@ # include #endif #define HAVE_STDARG_H -#include "../emu.h" -#include "../device.h" -#include "../ui/ui.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../device.h" +#include "../../ui/ui.h" +#include "../../plat.h" #include "network.h" #include "net_ne2000.h" diff --git a/src/network/network.h b/src/devices/network/network.h similarity index 100% rename from src/network/network.h rename to src/devices/network/network.h diff --git a/src/network/pcap_if.c b/src/devices/network/pcap_if.c similarity index 98% rename from src/network/pcap_if.c rename to src/devices/network/pcap_if.c index 6dbe4af..b8e777f 100644 --- a/src/network/pcap_if.c +++ b/src/devices/network/pcap_if.c @@ -10,7 +10,7 @@ * * Based on the "libpcap" examples. * - * Version: @(#)pcap_if.c 1.0.3 2018/03/30 + * Version: @(#)pcap_if.c 1.0.4 2018/05/06 * * Author: Fred N. van Kempen, * @@ -57,8 +57,8 @@ #endif #include #include -#include "../emu.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../plat.h" static void *pcap_handle; /* handle to WinPcap DLL */ diff --git a/src/network/slirp/COPYRIGHT.txt b/src/devices/network/slirp/COPYRIGHT.txt similarity index 100% rename from src/network/slirp/COPYRIGHT.txt rename to src/devices/network/slirp/COPYRIGHT.txt diff --git a/src/network/slirp/VERSION.txt b/src/devices/network/slirp/VERSION.txt similarity index 100% rename from src/network/slirp/VERSION.txt rename to src/devices/network/slirp/VERSION.txt diff --git a/src/network/slirp/bootp.c b/src/devices/network/slirp/bootp.c similarity index 100% rename from src/network/slirp/bootp.c rename to src/devices/network/slirp/bootp.c diff --git a/src/network/slirp/bootp.h b/src/devices/network/slirp/bootp.h similarity index 100% rename from src/network/slirp/bootp.h rename to src/devices/network/slirp/bootp.h diff --git a/src/network/slirp/cksum.c b/src/devices/network/slirp/cksum.c similarity index 100% rename from src/network/slirp/cksum.c rename to src/devices/network/slirp/cksum.c diff --git a/src/network/slirp/ctl.h b/src/devices/network/slirp/ctl.h similarity index 100% rename from src/network/slirp/ctl.h rename to src/devices/network/slirp/ctl.h diff --git a/src/network/slirp/debug.c b/src/devices/network/slirp/debug.c similarity index 100% rename from src/network/slirp/debug.c rename to src/devices/network/slirp/debug.c diff --git a/src/network/slirp/debug.h b/src/devices/network/slirp/debug.h similarity index 100% rename from src/network/slirp/debug.h rename to src/devices/network/slirp/debug.h diff --git a/src/network/slirp/icmp_var.h b/src/devices/network/slirp/icmp_var.h similarity index 100% rename from src/network/slirp/icmp_var.h rename to src/devices/network/slirp/icmp_var.h diff --git a/src/network/slirp/if.c b/src/devices/network/slirp/if.c similarity index 100% rename from src/network/slirp/if.c rename to src/devices/network/slirp/if.c diff --git a/src/network/slirp/if.h b/src/devices/network/slirp/if.h similarity index 100% rename from src/network/slirp/if.h rename to src/devices/network/slirp/if.h diff --git a/src/network/slirp/ip.h b/src/devices/network/slirp/ip.h similarity index 100% rename from src/network/slirp/ip.h rename to src/devices/network/slirp/ip.h diff --git a/src/network/slirp/ip_icmp.c b/src/devices/network/slirp/ip_icmp.c similarity index 100% rename from src/network/slirp/ip_icmp.c rename to src/devices/network/slirp/ip_icmp.c diff --git a/src/network/slirp/ip_icmp.h b/src/devices/network/slirp/ip_icmp.h similarity index 100% rename from src/network/slirp/ip_icmp.h rename to src/devices/network/slirp/ip_icmp.h diff --git a/src/network/slirp/ip_input.c b/src/devices/network/slirp/ip_input.c similarity index 100% rename from src/network/slirp/ip_input.c rename to src/devices/network/slirp/ip_input.c diff --git a/src/network/slirp/ip_output.c b/src/devices/network/slirp/ip_output.c similarity index 100% rename from src/network/slirp/ip_output.c rename to src/devices/network/slirp/ip_output.c diff --git a/src/network/slirp/libslirp.h b/src/devices/network/slirp/libslirp.h similarity index 100% rename from src/network/slirp/libslirp.h rename to src/devices/network/slirp/libslirp.h diff --git a/src/network/slirp/main.h b/src/devices/network/slirp/main.h similarity index 100% rename from src/network/slirp/main.h rename to src/devices/network/slirp/main.h diff --git a/src/network/slirp/mbuf.c b/src/devices/network/slirp/mbuf.c similarity index 100% rename from src/network/slirp/mbuf.c rename to src/devices/network/slirp/mbuf.c diff --git a/src/network/slirp/mbuf.h b/src/devices/network/slirp/mbuf.h similarity index 100% rename from src/network/slirp/mbuf.h rename to src/devices/network/slirp/mbuf.h diff --git a/src/network/slirp/misc.c b/src/devices/network/slirp/misc.c similarity index 100% rename from src/network/slirp/misc.c rename to src/devices/network/slirp/misc.c diff --git a/src/network/slirp/misc.h b/src/devices/network/slirp/misc.h similarity index 100% rename from src/network/slirp/misc.h rename to src/devices/network/slirp/misc.h diff --git a/src/network/slirp/queue.c b/src/devices/network/slirp/queue.c similarity index 100% rename from src/network/slirp/queue.c rename to src/devices/network/slirp/queue.c diff --git a/src/network/slirp/queue.h b/src/devices/network/slirp/queue.h similarity index 100% rename from src/network/slirp/queue.h rename to src/devices/network/slirp/queue.h diff --git a/src/network/slirp/sbuf.c b/src/devices/network/slirp/sbuf.c similarity index 100% rename from src/network/slirp/sbuf.c rename to src/devices/network/slirp/sbuf.c diff --git a/src/network/slirp/sbuf.h b/src/devices/network/slirp/sbuf.h similarity index 100% rename from src/network/slirp/sbuf.h rename to src/devices/network/slirp/sbuf.h diff --git a/src/network/slirp/slirp.c b/src/devices/network/slirp/slirp.c similarity index 100% rename from src/network/slirp/slirp.c rename to src/devices/network/slirp/slirp.c diff --git a/src/network/slirp/slirp.h b/src/devices/network/slirp/slirp.h similarity index 100% rename from src/network/slirp/slirp.h rename to src/devices/network/slirp/slirp.h diff --git a/src/network/slirp/slirp_config.h b/src/devices/network/slirp/slirp_config.h similarity index 100% rename from src/network/slirp/slirp_config.h rename to src/devices/network/slirp/slirp_config.h diff --git a/src/network/slirp/socket.c b/src/devices/network/slirp/socket.c similarity index 100% rename from src/network/slirp/socket.c rename to src/devices/network/slirp/socket.c diff --git a/src/network/slirp/socket.h b/src/devices/network/slirp/socket.h similarity index 100% rename from src/network/slirp/socket.h rename to src/devices/network/slirp/socket.h diff --git a/src/network/slirp/tcp.h b/src/devices/network/slirp/tcp.h similarity index 100% rename from src/network/slirp/tcp.h rename to src/devices/network/slirp/tcp.h diff --git a/src/network/slirp/tcp_input.c b/src/devices/network/slirp/tcp_input.c similarity index 100% rename from src/network/slirp/tcp_input.c rename to src/devices/network/slirp/tcp_input.c diff --git a/src/network/slirp/tcp_output.c b/src/devices/network/slirp/tcp_output.c similarity index 100% rename from src/network/slirp/tcp_output.c rename to src/devices/network/slirp/tcp_output.c diff --git a/src/network/slirp/tcp_subr.c b/src/devices/network/slirp/tcp_subr.c similarity index 100% rename from src/network/slirp/tcp_subr.c rename to src/devices/network/slirp/tcp_subr.c diff --git a/src/network/slirp/tcp_timer.c b/src/devices/network/slirp/tcp_timer.c similarity index 100% rename from src/network/slirp/tcp_timer.c rename to src/devices/network/slirp/tcp_timer.c diff --git a/src/network/slirp/tcp_timer.h b/src/devices/network/slirp/tcp_timer.h similarity index 100% rename from src/network/slirp/tcp_timer.h rename to src/devices/network/slirp/tcp_timer.h diff --git a/src/network/slirp/tcp_var.h b/src/devices/network/slirp/tcp_var.h similarity index 100% rename from src/network/slirp/tcp_var.h rename to src/devices/network/slirp/tcp_var.h diff --git a/src/network/slirp/tcpip.h b/src/devices/network/slirp/tcpip.h similarity index 100% rename from src/network/slirp/tcpip.h rename to src/devices/network/slirp/tcpip.h diff --git a/src/network/slirp/tftp.c b/src/devices/network/slirp/tftp.c similarity index 100% rename from src/network/slirp/tftp.c rename to src/devices/network/slirp/tftp.c diff --git a/src/network/slirp/tftp.h b/src/devices/network/slirp/tftp.h similarity index 100% rename from src/network/slirp/tftp.h rename to src/devices/network/slirp/tftp.h diff --git a/src/network/slirp/udp.c b/src/devices/network/slirp/udp.c similarity index 100% rename from src/network/slirp/udp.c rename to src/devices/network/slirp/udp.c diff --git a/src/network/slirp/udp.h b/src/devices/network/slirp/udp.h similarity index 100% rename from src/network/slirp/udp.h rename to src/devices/network/slirp/udp.h diff --git a/src/ports/game.c b/src/devices/ports/game.c similarity index 96% rename from src/ports/game.c rename to src/devices/ports/game.c index 4c43c69..65d3729 100644 --- a/src/ports/game.c +++ b/src/devices/ports/game.c @@ -8,7 +8,7 @@ * * Implementation of a generic Game Port. * - * Version: @(#)game.c 1.0.13 2018/05/04 + * Version: @(#)game.c 1.0.14 2018/05/06 * * Authors: Fred N. van Kempen, * Sarah Walker, @@ -41,12 +41,12 @@ #include #include #define HAVE_STDARG_H -#include "../emu.h" -#include "../machine/machine.h" -#include "../cpu/cpu.h" -#include "../io.h" -#include "../timer.h" -#include "../device.h" +#include "../../emu.h" +#include "../../machines/machine.h" +#include "../../cpu/cpu.h" +#include "../../io.h" +#include "../../timer.h" +#include "../../device.h" #include "game.h" #include "game_dev.h" diff --git a/src/ports/game.h b/src/devices/ports/game.h similarity index 100% rename from src/ports/game.h rename to src/devices/ports/game.h diff --git a/src/ports/game_dev.c b/src/devices/ports/game_dev.c similarity index 97% rename from src/ports/game_dev.c rename to src/devices/ports/game_dev.c index 5ee1bc6..6a59964 100644 --- a/src/ports/game_dev.c +++ b/src/devices/ports/game_dev.c @@ -8,7 +8,7 @@ * * Handle all the various gameport devices. * - * Version: @(#)game_dev.c 1.0.1 2018/04/26 + * Version: @(#)game_dev.c 1.0.2 2018/05/06 * * Authors: Fred N. van Kempen, * Sarah Walker, @@ -39,7 +39,7 @@ #include #include #include -#include "../emu.h" +#include "../../emu.h" #include "game.h" #include "game_dev.h" diff --git a/src/ports/game_dev.h b/src/devices/ports/game_dev.h similarity index 100% rename from src/ports/game_dev.h rename to src/devices/ports/game_dev.h diff --git a/src/ports/parallel.c b/src/devices/ports/parallel.c similarity index 97% rename from src/ports/parallel.c rename to src/devices/ports/parallel.c index c05482e..bfeb037 100644 --- a/src/ports/parallel.c +++ b/src/devices/ports/parallel.c @@ -8,7 +8,7 @@ * * Implementation of the "LPT" style parallel ports. * - * Version: @(#)parallel.c 1.0.9 2018/04/30 + * Version: @(#)parallel.c 1.0.10 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -42,9 +42,9 @@ #include #include #define HAVE_STDARG_H -#include "../emu.h" -#include "../io.h" -#include "../device.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../device.h" #include "parallel.h" #include "parallel_dev.h" diff --git a/src/ports/parallel.h b/src/devices/ports/parallel.h similarity index 100% rename from src/ports/parallel.h rename to src/devices/ports/parallel.h diff --git a/src/ports/parallel_dev.c b/src/devices/ports/parallel_dev.c similarity index 92% rename from src/ports/parallel_dev.c rename to src/devices/ports/parallel_dev.c index 0c608a4..0a9d0ea 100644 --- a/src/ports/parallel_dev.c +++ b/src/devices/ports/parallel_dev.c @@ -8,7 +8,7 @@ * * Implementation of the parallel-port-attached devices. * - * Version: @(#)parallel_dev.c 1.0.3 2018/04/28 + * Version: @(#)parallel_dev.c 1.0.4 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -40,13 +40,13 @@ #include #include #include -#include "../emu.h" -#include "../io.h" +#include "../../emu.h" +#include "../../io.h" #include "parallel.h" #include "parallel_dev.h" -#include "../sound/snd_lpt_dac.h" -#include "../sound/snd_lpt_dss.h" +#include "../../devices/sound/snd_lpt_dac.h" +#include "../../devices/sound/snd_lpt_dss.h" static const struct { diff --git a/src/ports/parallel_dev.h b/src/devices/ports/parallel_dev.h similarity index 100% rename from src/ports/parallel_dev.h rename to src/devices/ports/parallel_dev.h diff --git a/src/ports/serial.c b/src/devices/ports/serial.c similarity index 97% rename from src/ports/serial.c rename to src/devices/ports/serial.c index bb4d119..37130fa 100644 --- a/src/ports/serial.c +++ b/src/devices/ports/serial.c @@ -8,7 +8,7 @@ * * Implementation of 8250-style serial port. * - * Version: @(#)serial.c 1.0.6 2018/04/30 + * Version: @(#)serial.c 1.0.7 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -43,14 +43,14 @@ #include #include #define HAVE_STDARG_H -#include "../emu.h" -#include "../machine/machine.h" -#include "../io.h" -#include "../pic.h" -#include "../mem.h" -#include "../rom.h" -#include "../timer.h" -#include "../device.h" +#include "../../emu.h" +#include "../../machines/machine.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../timer.h" +#include "../../device.h" +#include "../../devices/system/pic.h" #include "serial.h" diff --git a/src/ports/serial.h b/src/devices/ports/serial.h similarity index 100% rename from src/ports/serial.h rename to src/devices/ports/serial.h diff --git a/src/scsi/queue.h b/src/devices/scsi/queue.h similarity index 100% rename from src/scsi/queue.h rename to src/devices/scsi/queue.h diff --git a/src/scsi/scsi.c b/src/devices/scsi/scsi.c similarity index 97% rename from src/scsi/scsi.c rename to src/devices/scsi/scsi.c index 8c72192..11749fc 100644 --- a/src/scsi/scsi.c +++ b/src/devices/scsi/scsi.c @@ -8,7 +8,7 @@ * * Handling of the SCSI controllers. * - * Version: @(#)scsi.c 1.0.8 2018/04/14 + * Version: @(#)scsi.c 1.0.9 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -42,15 +42,15 @@ #include #include #define HAVE_STDARG_H -#include "../emu.h" -#include "../mem.h" -#include "../rom.h" -#include "../timer.h" -#include "../device.h" +#include "../../emu.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../timer.h" +#include "../../device.h" +#include "../../plat.h" #include "../disk/hdc.h" #include "../disk/zip.h" #include "../cdrom/cdrom.h" -#include "../plat.h" #include "scsi.h" #include "scsi_aha154x.h" #include "scsi_buslogic.h" diff --git a/src/scsi/scsi.h b/src/devices/scsi/scsi.h similarity index 100% rename from src/scsi/scsi.h rename to src/devices/scsi/scsi.h diff --git a/src/scsi/scsi_aha154x.c b/src/devices/scsi/scsi_aha154x.c similarity index 98% rename from src/scsi/scsi_aha154x.c rename to src/devices/scsi/scsi_aha154x.c index 3080f7a..62d5348 100644 --- a/src/scsi/scsi_aha154x.c +++ b/src/devices/scsi/scsi_aha154x.c @@ -10,7 +10,7 @@ * made by Adaptec, Inc. These controllers were designed for * the ISA bus. * - * Version: @(#)scsi_aha154x.c 1.0.8 2018/05/04 + * Version: @(#)scsi_aha154x.c 1.0.9 2018/05/06 * * Based on original code from TheCollector1995 and Miran Grca. * @@ -44,18 +44,17 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../mca.h" -#include "../mem.h" -#include "../mca.h" -#include "../rom.h" -#include "../nvr.h" -#include "../dma.h" -#include "../pic.h" -#include "../timer.h" -#include "../device.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../device.h" +#include "../../nvr.h" +#include "../../timer.h" +#include "../../plat.h" +#include "../system/dma.h" +#include "../system/pic.h" +#include "../system/mca.h" #include "scsi.h" #include "scsi_aha154x.h" #include "scsi_x54x.h" diff --git a/src/scsi/scsi_aha154x.h b/src/devices/scsi/scsi_aha154x.h similarity index 100% rename from src/scsi/scsi_aha154x.h rename to src/devices/scsi/scsi_aha154x.h diff --git a/src/scsi/scsi_bus.c b/src/devices/scsi/scsi_bus.c similarity index 99% rename from src/scsi/scsi_bus.c rename to src/devices/scsi/scsi_bus.c index d1ae192..e46d4ec 100644 --- a/src/scsi/scsi_bus.c +++ b/src/devices/scsi/scsi_bus.c @@ -11,7 +11,7 @@ * NOTES: For now ported from PCem with some modifications * but at least it's a start. * - * Version: @(#)scsi_bus.c 1.0.1 2018/02/14 + * Version: @(#)scsi_bus.c 1.0.2 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -45,7 +45,7 @@ #include #include #define HAVE_STDARG_H -#include "../emu.h" +#include "../../emu.h" #include "scsi.h" #include "scsi_device.h" diff --git a/src/scsi/scsi_buslogic.c b/src/devices/scsi/scsi_buslogic.c similarity index 99% rename from src/scsi/scsi_buslogic.c rename to src/devices/scsi/scsi_buslogic.c index af16af5..fa0325f 100644 --- a/src/scsi/scsi_buslogic.c +++ b/src/devices/scsi/scsi_buslogic.c @@ -13,7 +13,7 @@ * 1 - BT-545S ISA; * 2 - BT-958D PCI * - * Version: @(#)scsi_buslogic.c 1.0.9 2018/04/02 + * Version: @(#)scsi_buslogic.c 1.0.10 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -45,19 +45,18 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../mca.h" -#include "../mem.h" -#include "../mca.h" -#include "../rom.h" -#include "../nvr.h" -#include "../dma.h" -#include "../pic.h" -#include "../pci.h" -#include "../timer.h" -#include "../device.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../timer.h" +#include "../../device.h" +#include "../../nvr.h" +#include "../../plat.h" +#include "../system/dma.h" +#include "../system/pic.h" +#include "../system/pci.h" +#include "../system/mca.h" #include "scsi.h" #include "scsi_buslogic.h" #include "scsi_device.h" diff --git a/src/scsi/scsi_buslogic.h b/src/devices/scsi/scsi_buslogic.h similarity index 100% rename from src/scsi/scsi_buslogic.h rename to src/devices/scsi/scsi_buslogic.h diff --git a/src/scsi/scsi_device.c b/src/devices/scsi/scsi_device.c similarity index 98% rename from src/scsi/scsi_device.c rename to src/devices/scsi/scsi_device.c index 79fd414..27a2843 100644 --- a/src/scsi/scsi_device.c +++ b/src/devices/scsi/scsi_device.c @@ -8,7 +8,7 @@ * * The generic SCSI device command handler. * - * Version: @(#)scsi_device.c 1.0.5 2018/03/19 + * Version: @(#)scsi_device.c 1.0.6 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -38,8 +38,8 @@ #include #include #include -#include "../emu.h" -#include "../device.h" +#include "../../emu.h" +#include "../../device.h" #include "../cdrom/cdrom.h" #include "../disk/hdd.h" #include "../disk/zip.h" diff --git a/src/scsi/scsi_device.h b/src/devices/scsi/scsi_device.h similarity index 100% rename from src/scsi/scsi_device.h rename to src/devices/scsi/scsi_device.h diff --git a/src/scsi/scsi_disk.c b/src/devices/scsi/scsi_disk.c similarity index 99% rename from src/scsi/scsi_disk.c rename to src/devices/scsi/scsi_disk.c index 9cdeff3..c1ac817 100644 --- a/src/scsi/scsi_disk.c +++ b/src/devices/scsi/scsi_disk.c @@ -8,7 +8,7 @@ * * Emulation of SCSI fixed and removable disks. * - * Version: @(#)scsi_disk.c 1.0.9 2018/04/28 + * Version: @(#)scsi_disk.c 1.0.10 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,18 +41,18 @@ #include #include #define HAVE_STDARG_H -#include "../emu.h" -#include "../version.h" -#include "../timer.h" -#include "../device.h" -#include "../intel_piix.h" -#include "../nvr.h" +#include "../../emu.h" +#include "../../version.h" +#include "../../timer.h" +#include "../../device.h" +#include "../../nvr.h" +#include "../../ui/ui.h" +#include "../../plat.h" +//#include "../system/intel_piix.h" #include "../cdrom/cdrom.h" #include "../disk/hdd.h" #include "../disk/hdc.h" #include "../disk/hdc_ide.h" -#include "../ui/ui.h" -#include "../plat.h" #include "scsi.h" #include "scsi_disk.h" diff --git a/src/scsi/scsi_disk.h b/src/devices/scsi/scsi_disk.h similarity index 100% rename from src/scsi/scsi_disk.h rename to src/devices/scsi/scsi_disk.h diff --git a/src/scsi/scsi_ncr5380.c b/src/devices/scsi/scsi_ncr5380.c similarity index 98% rename from src/scsi/scsi_ncr5380.c rename to src/devices/scsi/scsi_ncr5380.c index cc87b78..6203ce3 100644 --- a/src/scsi/scsi_ncr5380.c +++ b/src/devices/scsi/scsi_ncr5380.c @@ -9,7 +9,7 @@ * Implementation of the NCR 5380 series of SCSI Host Adapters * made by NCR. These controllers were designed for the ISA bus. * - * Version: @(#)scsi_ncr5380.c 1.0.6 2018/04/02 + * Version: @(#)scsi_ncr5380.c 1.0.7 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -43,18 +43,18 @@ #include #include #include -#include "../emu.h" -#include "../cpu/cpu.h" -#include "../io.h" -#include "../dma.h" -#include "../pic.h" -#include "../mca.h" -#include "../mem.h" -#include "../rom.h" -#include "../nvr.h" -#include "../device.h" -#include "../timer.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../cpu/cpu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../nvr.h" +#include "../../device.h" +#include "../../timer.h" +#include "../../plat.h" +#include "../system/dma.h" +#include "../system/pic.h" +#include "../system/mca.h" #include "scsi.h" #include "scsi_device.h" #include "scsi_ncr5380.h" diff --git a/src/scsi/scsi_ncr5380.h b/src/devices/scsi/scsi_ncr5380.h similarity index 100% rename from src/scsi/scsi_ncr5380.h rename to src/devices/scsi/scsi_ncr5380.h diff --git a/src/scsi/scsi_ncr53c810.c b/src/devices/scsi/scsi_ncr53c810.c similarity index 99% rename from src/scsi/scsi_ncr53c810.c rename to src/devices/scsi/scsi_ncr53c810.c index 8ed3bcd..e7709ec 100644 --- a/src/scsi/scsi_ncr53c810.c +++ b/src/devices/scsi/scsi_ncr53c810.c @@ -10,7 +10,7 @@ * NCR and later Symbios and LSI. This controller was designed * for the PCI bus. * - * Version: @(#)scsi_ncr53c810.c 1.0.8 2018/04/27 + * Version: @(#)scsi_ncr53c810.c 1.0.9 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -46,17 +46,17 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../dma.h" -#include "../pic.h" -#include "../mem.h" -#include "../rom.h" -#include "../pci.h" -#include "../nvr.h" -#include "../device.h" -#include "../timer.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../timer.h" +#include "../../device.h" +#include "../../nvr.h" +#include "../../plat.h" +#include "../system/dma.h" +#include "../system/pic.h" +#include "../system/pci.h" #include "scsi.h" #include "scsi_device.h" #include "scsi_ncr53c810.h" diff --git a/src/scsi/scsi_ncr53c810.h b/src/devices/scsi/scsi_ncr53c810.h similarity index 100% rename from src/scsi/scsi_ncr53c810.h rename to src/devices/scsi/scsi_ncr53c810.h diff --git a/src/scsi/scsi_x54x.c b/src/devices/scsi/scsi_x54x.c similarity index 99% rename from src/scsi/scsi_x54x.c rename to src/devices/scsi/scsi_x54x.c index d30470b..175bf81 100644 --- a/src/scsi/scsi_x54x.c +++ b/src/devices/scsi/scsi_x54x.c @@ -12,7 +12,7 @@ * * These controllers were designed for various buses. * - * Version: @(#)scsi_x54x.c 1.0.10 2018/04/27 + * Version: @(#)scsi_x54x.c 1.0.11 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -46,18 +46,18 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../dma.h" -#include "../pic.h" -#include "../pci.h" -#include "../mca.h" -#include "../mem.h" -#include "../rom.h" -#include "../nvr.h" -#include "../device.h" -#include "../timer.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../timer.h" +#include "../../device.h" +#include "../../nvr.h" +#include "../../plat.h" +#include "../system/dma.h" +#include "../system/pic.h" +#include "../system/pci.h" +#include "../system/mca.h" #include "scsi.h" #include "scsi_device.h" #include "scsi_aha154x.h" diff --git a/src/scsi/scsi_x54x.h b/src/devices/scsi/scsi_x54x.h similarity index 100% rename from src/scsi/scsi_x54x.h rename to src/devices/scsi/scsi_x54x.h diff --git a/src/sio/sio.h b/src/devices/sio/sio.h similarity index 100% rename from src/sio/sio.h rename to src/devices/sio/sio.h diff --git a/src/sio/sio_detect.c b/src/devices/sio/sio_detect.c similarity index 96% rename from src/sio/sio_detect.c rename to src/devices/sio/sio_detect.c index 0238ae0..fa2f674 100644 --- a/src/sio/sio_detect.c +++ b/src/devices/sio/sio_detect.c @@ -8,7 +8,7 @@ * * Super I/O chip detection code. * - * Version: @(#)sio_detect.c 1.0.2 2018/03/07 + * Version: @(#)sio_detect.c 1.0.3 2018/05/06 * * Author: Miran Grca, * @@ -36,9 +36,9 @@ #include #include #include -#include "../emu.h" -#include "../device.h" -#include "../io.h" +#include "../../emu.h" +#include "../../device.h" +#include "../../io.h" #include "../floppy/fdd.h" #include "../floppy/fdc.h" #include "sio.h" diff --git a/src/sio/sio_fdc37c669.c b/src/devices/sio/sio_fdc37c669.c similarity index 98% rename from src/sio/sio_fdc37c669.c rename to src/devices/sio/sio_fdc37c669.c index 4e002e3..d352fa5 100644 --- a/src/sio/sio_fdc37c669.c +++ b/src/devices/sio/sio_fdc37c669.c @@ -8,7 +8,7 @@ * * Implementation of the SMC FDC37C669 Super I/O Chip. * - * Version: @(#)sio_fdc37c669.c 1.0.6 2018/04/26 + * Version: @(#)sio_fdc37c669.c 1.0.7 2018/05/06 * * Author: Miran Grca, * @@ -36,10 +36,10 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../pci.h" -#include "../device.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../device.h" +#include "../system/pci.h" #include "../ports/parallel.h" #include "../ports/serial.h" #include "../floppy/fdd.h" diff --git a/src/sio/sio_fdc37c66x.c b/src/devices/sio/sio_fdc37c66x.c similarity index 98% rename from src/sio/sio_fdc37c66x.c rename to src/devices/sio/sio_fdc37c66x.c index dd73911..a9f0722 100644 --- a/src/sio/sio_fdc37c66x.c +++ b/src/devices/sio/sio_fdc37c66x.c @@ -9,7 +9,7 @@ * Implementation of the SMC FDC37C663 and FDC37C665 Super * I/O Chips. * - * Version: @(#)sio_fdc37c66x.c 1.0.6 2018/04/26 + * Version: @(#)sio_fdc37c66x.c 1.0.7 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,10 +41,10 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../pci.h" -#include "../device.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../device.h" +#include "../system/pci.h" #include "../ports/parallel.h" #include "../ports/serial.h" #include "../floppy/fdd.h" diff --git a/src/sio/sio_fdc37c93x.c b/src/devices/sio/sio_fdc37c93x.c similarity index 98% rename from src/sio/sio_fdc37c93x.c rename to src/devices/sio/sio_fdc37c93x.c index 712eddd..717815d 100644 --- a/src/sio/sio_fdc37c93x.c +++ b/src/devices/sio/sio_fdc37c93x.c @@ -9,7 +9,7 @@ * Implementation of the SMC FDC37C932FR and FDC37C935 Super * I/O Chips. * - * Version: @(#)sio_fdc37c93x.c 1.0.8 2018/04/26 + * Version: @(#)sio_fdc37c93x.c 1.0.9 2018/05/06 * * Author: Miran Grca, * @@ -37,10 +37,10 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../pci.h" -#include "../device.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../device.h" +#include "../system/pci.h" #include "../ports/parallel.h" #include "../ports/serial.h" #include "../floppy/fdd.h" diff --git a/src/sio/sio_pc87306.c b/src/devices/sio/sio_pc87306.c similarity index 98% rename from src/sio/sio_pc87306.c rename to src/devices/sio/sio_pc87306.c index d9c76f2..829d890 100644 --- a/src/sio/sio_pc87306.c +++ b/src/devices/sio/sio_pc87306.c @@ -8,7 +8,7 @@ * * Emulation of the NatSemi PC87306 Super I/O chip. * - * Version: @(#)sio_pc87306.c 1.0.6 2018/04/26 + * Version: @(#)sio_pc87306.c 1.0.7 2018/05/06 * * Author: Miran Grca, * @@ -36,10 +36,10 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../pci.h" -#include "../device.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../device.h" +#include "../system/pci.h" #include "../ports/parallel.h" #include "../ports/serial.h" #include "../floppy/fdd.h" diff --git a/src/sio/sio_um8669f.c b/src/devices/sio/sio_um8669f.c similarity index 98% rename from src/sio/sio_um8669f.c rename to src/devices/sio/sio_um8669f.c index bad4b39..50e1fc9 100644 --- a/src/sio/sio_um8669f.c +++ b/src/devices/sio/sio_um8669f.c @@ -29,7 +29,7 @@ * 70 - IRQ * 74 - DMA * - * Version: @(#)sio_um8669f.c 1.0.6 2018/04/26 + * Version: @(#)sio_um8669f.c 1.0.7 2018/05/06 * * Author: Miran Grca, * Sarah Walker, @@ -59,10 +59,10 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../pci.h" -#include "../device.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../device.h" +#include "../system/pci.h" #include "../ports/parallel.h" #include "../ports/serial.h" #include "../floppy/fdd.h" diff --git a/src/sio/sio_w83877f.c b/src/devices/sio/sio_w83877f.c similarity index 98% rename from src/sio/sio_w83877f.c rename to src/devices/sio/sio_w83877f.c index 248ab16..6e610c7 100644 --- a/src/sio/sio_w83877f.c +++ b/src/devices/sio/sio_w83877f.c @@ -11,7 +11,7 @@ * Winbond W83877F Super I/O Chip * Used by the Award 430HX * - * Version: @(#)sio_w83877f.c 1.0.6 2018/04/26 + * Version: @(#)sio_w83877f.c 1.0.7 2018/05/06 * * Author: Miran Grca, * @@ -39,13 +39,13 @@ #include #include #include -#include "../emu.h" -#include "../machine/machine.h" -#include "../io.h" -#include "../pci.h" -#include "../mem.h" -#include "../rom.h" -#include "../device.h" +#include "../../emu.h" +#include "../../machines/machine.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../device.h" +#include "../system/pci.h" #include "../ports/parallel.h" #include "../ports/serial.h" #include "../floppy/fdd.h" diff --git a/src/sound/dbopl.cpp b/src/devices/sound/dbopl.cpp similarity index 100% rename from src/sound/dbopl.cpp rename to src/devices/sound/dbopl.cpp diff --git a/src/sound/dbopl.h b/src/devices/sound/dbopl.h similarity index 100% rename from src/sound/dbopl.h rename to src/devices/sound/dbopl.h diff --git a/src/sound/filters.h b/src/devices/sound/filters.h similarity index 100% rename from src/sound/filters.h rename to src/devices/sound/filters.h diff --git a/src/sound/midi.c b/src/devices/sound/midi.c similarity index 98% rename from src/sound/midi.c rename to src/devices/sound/midi.c index 60154bf..81fe683 100644 --- a/src/sound/midi.c +++ b/src/devices/sound/midi.c @@ -8,7 +8,7 @@ * * MIDI support module, main file. * - * Version: @(#)midi.c 1.0.5 2018/04/10 + * Version: @(#)midi.c 1.0.6 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,9 +41,9 @@ #include #include #include -#include "../emu.h" -#include "../device.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../device.h" +#include "../../plat.h" #include "midi.h" #include "midi_system.h" #ifdef USE_FLUIDSYNTH diff --git a/src/sound/midi.h b/src/devices/sound/midi.h similarity index 100% rename from src/sound/midi.h rename to src/devices/sound/midi.h diff --git a/src/sound/midi_fluidsynth.c b/src/devices/sound/midi_fluidsynth.c similarity index 98% rename from src/sound/midi_fluidsynth.c rename to src/devices/sound/midi_fluidsynth.c index 1639798..2dd6e54 100644 --- a/src/sound/midi_fluidsynth.c +++ b/src/devices/sound/midi_fluidsynth.c @@ -17,7 +17,7 @@ * website (for 32bit and 64bit Windows) are working, and * need no additional support files other than sound fonts. * - * Version: @(#)midi_fluidsynth.c 1.0.8 2018/04/27 + * Version: @(#)midi_fluidsynth.c 1.0.9 2018/05/06 * * Code borrowed from scummvm. * @@ -53,11 +53,11 @@ #include #include #include -#include "../emu.h" -#include "../config.h" -#include "../device.h" -#include "../ui/ui.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../config.h" +#include "../../device.h" +#include "../../ui/ui.h" +#include "../../plat.h" #include "midi.h" #include "midi_fluidsynth.h" #include "sound.h" diff --git a/src/sound/midi_fluidsynth.h b/src/devices/sound/midi_fluidsynth.h similarity index 100% rename from src/sound/midi_fluidsynth.h rename to src/devices/sound/midi_fluidsynth.h diff --git a/src/sound/midi_mt32.c b/src/devices/sound/midi_mt32.c similarity index 98% rename from src/sound/midi_mt32.c rename to src/devices/sound/midi_mt32.c index 848de59..731401e 100644 --- a/src/sound/midi_mt32.c +++ b/src/devices/sound/midi_mt32.c @@ -8,7 +8,7 @@ * * Interface to the MuNT32 MIDI synthesizer. * - * Version: @(#)midi_mt32.c 1.0.3 2018/03/31 + * Version: @(#)midi_mt32.c 1.0.4 2018/05/08 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -42,11 +42,11 @@ #include #include #include "munt/c_interface/c_interface.h" -#include "../emu.h" -#include "../device.h" -#include "../mem.h" -#include "../rom.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../device.h" +#include "../../plat.h" #include "sound.h" #include "midi.h" #include "midi_mt32.h" diff --git a/src/sound/midi_mt32.h b/src/devices/sound/midi_mt32.h similarity index 100% rename from src/sound/midi_mt32.h rename to src/devices/sound/midi_mt32.h diff --git a/src/sound/midi_system.c b/src/devices/sound/midi_system.c similarity index 95% rename from src/sound/midi_system.c rename to src/devices/sound/midi_system.c index d5dd7ab..23d179f 100644 --- a/src/sound/midi_system.c +++ b/src/devices/sound/midi_system.c @@ -8,7 +8,7 @@ * * Interface to system MIDI driver. * - * Version: @(#)midi_system.c 1.0.3 2018/03/15 + * Version: @(#)midi_system.c 1.0.4 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,9 +41,9 @@ #include #include #include -#include "../emu.h" -#include "../device.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../device.h" +#include "../../plat.h" #include "midi.h" #include "midi_system.h" diff --git a/src/sound/midi_system.h b/src/devices/sound/midi_system.h similarity index 100% rename from src/sound/midi_system.h rename to src/devices/sound/midi_system.h diff --git a/src/sound/munt/Analog.cpp b/src/devices/sound/munt/Analog.cpp similarity index 100% rename from src/sound/munt/Analog.cpp rename to src/devices/sound/munt/Analog.cpp diff --git a/src/sound/munt/Analog.h b/src/devices/sound/munt/Analog.h similarity index 100% rename from src/sound/munt/Analog.h rename to src/devices/sound/munt/Analog.h diff --git a/src/sound/munt/BReverbModel.cpp b/src/devices/sound/munt/BReverbModel.cpp similarity index 100% rename from src/sound/munt/BReverbModel.cpp rename to src/devices/sound/munt/BReverbModel.cpp diff --git a/src/sound/munt/BReverbModel.h b/src/devices/sound/munt/BReverbModel.h similarity index 100% rename from src/sound/munt/BReverbModel.h rename to src/devices/sound/munt/BReverbModel.h diff --git a/src/sound/munt/Enumerations.h b/src/devices/sound/munt/Enumerations.h similarity index 100% rename from src/sound/munt/Enumerations.h rename to src/devices/sound/munt/Enumerations.h diff --git a/src/sound/munt/File.cpp b/src/devices/sound/munt/File.cpp similarity index 100% rename from src/sound/munt/File.cpp rename to src/devices/sound/munt/File.cpp diff --git a/src/sound/munt/File.h b/src/devices/sound/munt/File.h similarity index 100% rename from src/sound/munt/File.h rename to src/devices/sound/munt/File.h diff --git a/src/sound/munt/FileStream.cpp b/src/devices/sound/munt/FileStream.cpp similarity index 100% rename from src/sound/munt/FileStream.cpp rename to src/devices/sound/munt/FileStream.cpp diff --git a/src/sound/munt/FileStream.h b/src/devices/sound/munt/FileStream.h similarity index 100% rename from src/sound/munt/FileStream.h rename to src/devices/sound/munt/FileStream.h diff --git a/src/sound/munt/LA32FloatWaveGenerator.cpp b/src/devices/sound/munt/LA32FloatWaveGenerator.cpp similarity index 100% rename from src/sound/munt/LA32FloatWaveGenerator.cpp rename to src/devices/sound/munt/LA32FloatWaveGenerator.cpp diff --git a/src/sound/munt/LA32FloatWaveGenerator.h b/src/devices/sound/munt/LA32FloatWaveGenerator.h similarity index 100% rename from src/sound/munt/LA32FloatWaveGenerator.h rename to src/devices/sound/munt/LA32FloatWaveGenerator.h diff --git a/src/sound/munt/LA32Ramp.cpp b/src/devices/sound/munt/LA32Ramp.cpp similarity index 100% rename from src/sound/munt/LA32Ramp.cpp rename to src/devices/sound/munt/LA32Ramp.cpp diff --git a/src/sound/munt/LA32Ramp.h b/src/devices/sound/munt/LA32Ramp.h similarity index 100% rename from src/sound/munt/LA32Ramp.h rename to src/devices/sound/munt/LA32Ramp.h diff --git a/src/sound/munt/LA32WaveGenerator.cpp b/src/devices/sound/munt/LA32WaveGenerator.cpp similarity index 100% rename from src/sound/munt/LA32WaveGenerator.cpp rename to src/devices/sound/munt/LA32WaveGenerator.cpp diff --git a/src/sound/munt/LA32WaveGenerator.h b/src/devices/sound/munt/LA32WaveGenerator.h similarity index 100% rename from src/sound/munt/LA32WaveGenerator.h rename to src/devices/sound/munt/LA32WaveGenerator.h diff --git a/src/sound/munt/MemoryRegion.h b/src/devices/sound/munt/MemoryRegion.h similarity index 100% rename from src/sound/munt/MemoryRegion.h rename to src/devices/sound/munt/MemoryRegion.h diff --git a/src/sound/munt/MidiEventQueue.h b/src/devices/sound/munt/MidiEventQueue.h similarity index 100% rename from src/sound/munt/MidiEventQueue.h rename to src/devices/sound/munt/MidiEventQueue.h diff --git a/src/sound/munt/MidiStreamParser.cpp b/src/devices/sound/munt/MidiStreamParser.cpp similarity index 100% rename from src/sound/munt/MidiStreamParser.cpp rename to src/devices/sound/munt/MidiStreamParser.cpp diff --git a/src/sound/munt/MidiStreamParser.h b/src/devices/sound/munt/MidiStreamParser.h similarity index 100% rename from src/sound/munt/MidiStreamParser.h rename to src/devices/sound/munt/MidiStreamParser.h diff --git a/src/sound/munt/Part.cpp b/src/devices/sound/munt/Part.cpp similarity index 100% rename from src/sound/munt/Part.cpp rename to src/devices/sound/munt/Part.cpp diff --git a/src/sound/munt/Part.h b/src/devices/sound/munt/Part.h similarity index 100% rename from src/sound/munt/Part.h rename to src/devices/sound/munt/Part.h diff --git a/src/sound/munt/Partial.cpp b/src/devices/sound/munt/Partial.cpp similarity index 100% rename from src/sound/munt/Partial.cpp rename to src/devices/sound/munt/Partial.cpp diff --git a/src/sound/munt/Partial.h b/src/devices/sound/munt/Partial.h similarity index 100% rename from src/sound/munt/Partial.h rename to src/devices/sound/munt/Partial.h diff --git a/src/sound/munt/PartialManager.cpp b/src/devices/sound/munt/PartialManager.cpp similarity index 100% rename from src/sound/munt/PartialManager.cpp rename to src/devices/sound/munt/PartialManager.cpp diff --git a/src/sound/munt/PartialManager.h b/src/devices/sound/munt/PartialManager.h similarity index 100% rename from src/sound/munt/PartialManager.h rename to src/devices/sound/munt/PartialManager.h diff --git a/src/sound/munt/Poly.cpp b/src/devices/sound/munt/Poly.cpp similarity index 100% rename from src/sound/munt/Poly.cpp rename to src/devices/sound/munt/Poly.cpp diff --git a/src/sound/munt/Poly.h b/src/devices/sound/munt/Poly.h similarity index 100% rename from src/sound/munt/Poly.h rename to src/devices/sound/munt/Poly.h diff --git a/src/sound/munt/ROMInfo.cpp b/src/devices/sound/munt/ROMInfo.cpp similarity index 100% rename from src/sound/munt/ROMInfo.cpp rename to src/devices/sound/munt/ROMInfo.cpp diff --git a/src/sound/munt/ROMInfo.h b/src/devices/sound/munt/ROMInfo.h similarity index 100% rename from src/sound/munt/ROMInfo.h rename to src/devices/sound/munt/ROMInfo.h diff --git a/src/sound/munt/SampleRateConverter.cpp b/src/devices/sound/munt/SampleRateConverter.cpp similarity index 100% rename from src/sound/munt/SampleRateConverter.cpp rename to src/devices/sound/munt/SampleRateConverter.cpp diff --git a/src/sound/munt/SampleRateConverter.h b/src/devices/sound/munt/SampleRateConverter.h similarity index 100% rename from src/sound/munt/SampleRateConverter.h rename to src/devices/sound/munt/SampleRateConverter.h diff --git a/src/sound/munt/SampleRateConverter_dummy.cpp b/src/devices/sound/munt/SampleRateConverter_dummy.cpp similarity index 98% rename from src/sound/munt/SampleRateConverter_dummy.cpp rename to src/devices/sound/munt/SampleRateConverter_dummy.cpp index 9094f15..4d26b02 100644 --- a/src/sound/munt/SampleRateConverter_dummy.cpp +++ b/src/devices/sound/munt/SampleRateConverter_dummy.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../plat.h" +#include "../../../plat.h" #include "SampleRateConverter.h" #include "Synth.h" diff --git a/src/sound/munt/Structures.h b/src/devices/sound/munt/Structures.h similarity index 100% rename from src/sound/munt/Structures.h rename to src/devices/sound/munt/Structures.h diff --git a/src/sound/munt/Synth.cpp b/src/devices/sound/munt/Synth.cpp similarity index 100% rename from src/sound/munt/Synth.cpp rename to src/devices/sound/munt/Synth.cpp diff --git a/src/sound/munt/Synth.h b/src/devices/sound/munt/Synth.h similarity index 100% rename from src/sound/munt/Synth.h rename to src/devices/sound/munt/Synth.h diff --git a/src/sound/munt/TVA.cpp b/src/devices/sound/munt/TVA.cpp similarity index 100% rename from src/sound/munt/TVA.cpp rename to src/devices/sound/munt/TVA.cpp diff --git a/src/sound/munt/TVA.h b/src/devices/sound/munt/TVA.h similarity index 100% rename from src/sound/munt/TVA.h rename to src/devices/sound/munt/TVA.h diff --git a/src/sound/munt/TVF.cpp b/src/devices/sound/munt/TVF.cpp similarity index 100% rename from src/sound/munt/TVF.cpp rename to src/devices/sound/munt/TVF.cpp diff --git a/src/sound/munt/TVF.h b/src/devices/sound/munt/TVF.h similarity index 100% rename from src/sound/munt/TVF.h rename to src/devices/sound/munt/TVF.h diff --git a/src/sound/munt/TVP.cpp b/src/devices/sound/munt/TVP.cpp similarity index 100% rename from src/sound/munt/TVP.cpp rename to src/devices/sound/munt/TVP.cpp diff --git a/src/sound/munt/TVP.h b/src/devices/sound/munt/TVP.h similarity index 100% rename from src/sound/munt/TVP.h rename to src/devices/sound/munt/TVP.h diff --git a/src/sound/munt/Tables.cpp b/src/devices/sound/munt/Tables.cpp similarity index 100% rename from src/sound/munt/Tables.cpp rename to src/devices/sound/munt/Tables.cpp diff --git a/src/sound/munt/Tables.h b/src/devices/sound/munt/Tables.h similarity index 100% rename from src/sound/munt/Tables.h rename to src/devices/sound/munt/Tables.h diff --git a/src/sound/munt/Types.h b/src/devices/sound/munt/Types.h similarity index 100% rename from src/sound/munt/Types.h rename to src/devices/sound/munt/Types.h diff --git a/src/sound/munt/c_interface/c_interface.cpp b/src/devices/sound/munt/c_interface/c_interface.cpp similarity index 100% rename from src/sound/munt/c_interface/c_interface.cpp rename to src/devices/sound/munt/c_interface/c_interface.cpp diff --git a/src/sound/munt/c_interface/c_interface.h b/src/devices/sound/munt/c_interface/c_interface.h similarity index 100% rename from src/sound/munt/c_interface/c_interface.h rename to src/devices/sound/munt/c_interface/c_interface.h diff --git a/src/sound/munt/c_interface/c_types.h b/src/devices/sound/munt/c_interface/c_types.h similarity index 100% rename from src/sound/munt/c_interface/c_types.h rename to src/devices/sound/munt/c_interface/c_types.h diff --git a/src/sound/munt/c_interface/cpp_interface.h b/src/devices/sound/munt/c_interface/cpp_interface.h similarity index 100% rename from src/sound/munt/c_interface/cpp_interface.h rename to src/devices/sound/munt/c_interface/cpp_interface.h diff --git a/src/sound/munt/config.h b/src/devices/sound/munt/config.h similarity index 100% rename from src/sound/munt/config.h rename to src/devices/sound/munt/config.h diff --git a/src/sound/munt/globals.h b/src/devices/sound/munt/globals.h similarity index 100% rename from src/sound/munt/globals.h rename to src/devices/sound/munt/globals.h diff --git a/src/sound/munt/internals.h b/src/devices/sound/munt/internals.h similarity index 100% rename from src/sound/munt/internals.h rename to src/devices/sound/munt/internals.h diff --git a/src/sound/munt/mmath.h b/src/devices/sound/munt/mmath.h similarity index 100% rename from src/sound/munt/mmath.h rename to src/devices/sound/munt/mmath.h diff --git a/src/sound/munt/mt32emu.h b/src/devices/sound/munt/mt32emu.h similarity index 100% rename from src/sound/munt/mt32emu.h rename to src/devices/sound/munt/mt32emu.h diff --git a/src/sound/munt/sha1/sha1.cpp b/src/devices/sound/munt/sha1/sha1.cpp similarity index 100% rename from src/sound/munt/sha1/sha1.cpp rename to src/devices/sound/munt/sha1/sha1.cpp diff --git a/src/sound/munt/sha1/sha1.h b/src/devices/sound/munt/sha1/sha1.h similarity index 100% rename from src/sound/munt/sha1/sha1.h rename to src/devices/sound/munt/sha1/sha1.h diff --git a/src/sound/munt/srchelper/InternalResampler.cpp b/src/devices/sound/munt/srchelper/InternalResampler.cpp similarity index 100% rename from src/sound/munt/srchelper/InternalResampler.cpp rename to src/devices/sound/munt/srchelper/InternalResampler.cpp diff --git a/src/sound/munt/srchelper/InternalResampler.h b/src/devices/sound/munt/srchelper/InternalResampler.h similarity index 100% rename from src/sound/munt/srchelper/InternalResampler.h rename to src/devices/sound/munt/srchelper/InternalResampler.h diff --git a/src/sound/munt/srchelper/SamplerateAdapter.cpp b/src/devices/sound/munt/srchelper/SamplerateAdapter.cpp similarity index 100% rename from src/sound/munt/srchelper/SamplerateAdapter.cpp rename to src/devices/sound/munt/srchelper/SamplerateAdapter.cpp diff --git a/src/sound/munt/srchelper/SamplerateAdapter.h b/src/devices/sound/munt/srchelper/SamplerateAdapter.h similarity index 100% rename from src/sound/munt/srchelper/SamplerateAdapter.h rename to src/devices/sound/munt/srchelper/SamplerateAdapter.h diff --git a/src/sound/munt/srchelper/SoxrAdapter.cpp b/src/devices/sound/munt/srchelper/SoxrAdapter.cpp similarity index 100% rename from src/sound/munt/srchelper/SoxrAdapter.cpp rename to src/devices/sound/munt/srchelper/SoxrAdapter.cpp diff --git a/src/sound/munt/srchelper/SoxrAdapter.h b/src/devices/sound/munt/srchelper/SoxrAdapter.h similarity index 100% rename from src/sound/munt/srchelper/SoxrAdapter.h rename to src/devices/sound/munt/srchelper/SoxrAdapter.h diff --git a/src/sound/munt/srchelper/srctools/include/FIRResampler.h b/src/devices/sound/munt/srchelper/srctools/include/FIRResampler.h similarity index 100% rename from src/sound/munt/srchelper/srctools/include/FIRResampler.h rename to src/devices/sound/munt/srchelper/srctools/include/FIRResampler.h diff --git a/src/sound/munt/srchelper/srctools/include/FloatSampleProvider.h b/src/devices/sound/munt/srchelper/srctools/include/FloatSampleProvider.h similarity index 100% rename from src/sound/munt/srchelper/srctools/include/FloatSampleProvider.h rename to src/devices/sound/munt/srchelper/srctools/include/FloatSampleProvider.h diff --git a/src/sound/munt/srchelper/srctools/include/IIR2xResampler.h b/src/devices/sound/munt/srchelper/srctools/include/IIR2xResampler.h similarity index 100% rename from src/sound/munt/srchelper/srctools/include/IIR2xResampler.h rename to src/devices/sound/munt/srchelper/srctools/include/IIR2xResampler.h diff --git a/src/sound/munt/srchelper/srctools/include/LinearResampler.h b/src/devices/sound/munt/srchelper/srctools/include/LinearResampler.h similarity index 100% rename from src/sound/munt/srchelper/srctools/include/LinearResampler.h rename to src/devices/sound/munt/srchelper/srctools/include/LinearResampler.h diff --git a/src/sound/munt/srchelper/srctools/include/ResamplerModel.h b/src/devices/sound/munt/srchelper/srctools/include/ResamplerModel.h similarity index 100% rename from src/sound/munt/srchelper/srctools/include/ResamplerModel.h rename to src/devices/sound/munt/srchelper/srctools/include/ResamplerModel.h diff --git a/src/sound/munt/srchelper/srctools/include/ResamplerStage.h b/src/devices/sound/munt/srchelper/srctools/include/ResamplerStage.h similarity index 100% rename from src/sound/munt/srchelper/srctools/include/ResamplerStage.h rename to src/devices/sound/munt/srchelper/srctools/include/ResamplerStage.h diff --git a/src/sound/munt/srchelper/srctools/include/SincResampler.h b/src/devices/sound/munt/srchelper/srctools/include/SincResampler.h similarity index 100% rename from src/sound/munt/srchelper/srctools/include/SincResampler.h rename to src/devices/sound/munt/srchelper/srctools/include/SincResampler.h diff --git a/src/sound/munt/srchelper/srctools/src/FIRResampler.cpp b/src/devices/sound/munt/srchelper/srctools/src/FIRResampler.cpp similarity index 100% rename from src/sound/munt/srchelper/srctools/src/FIRResampler.cpp rename to src/devices/sound/munt/srchelper/srctools/src/FIRResampler.cpp diff --git a/src/sound/munt/srchelper/srctools/src/IIR2xResampler.cpp b/src/devices/sound/munt/srchelper/srctools/src/IIR2xResampler.cpp similarity index 100% rename from src/sound/munt/srchelper/srctools/src/IIR2xResampler.cpp rename to src/devices/sound/munt/srchelper/srctools/src/IIR2xResampler.cpp diff --git a/src/sound/munt/srchelper/srctools/src/LinearResampler.cpp b/src/devices/sound/munt/srchelper/srctools/src/LinearResampler.cpp similarity index 100% rename from src/sound/munt/srchelper/srctools/src/LinearResampler.cpp rename to src/devices/sound/munt/srchelper/srctools/src/LinearResampler.cpp diff --git a/src/sound/munt/srchelper/srctools/src/ResamplerModel.cpp b/src/devices/sound/munt/srchelper/srctools/src/ResamplerModel.cpp similarity index 100% rename from src/sound/munt/srchelper/srctools/src/ResamplerModel.cpp rename to src/devices/sound/munt/srchelper/srctools/src/ResamplerModel.cpp diff --git a/src/sound/munt/srchelper/srctools/src/SincResampler.cpp b/src/devices/sound/munt/srchelper/srctools/src/SincResampler.cpp similarity index 100% rename from src/sound/munt/srchelper/srctools/src/SincResampler.cpp rename to src/devices/sound/munt/srchelper/srctools/src/SincResampler.cpp diff --git a/src/sound/nukedopl.cpp b/src/devices/sound/nukedopl.cpp similarity index 100% rename from src/sound/nukedopl.cpp rename to src/devices/sound/nukedopl.cpp diff --git a/src/sound/nukedopl.h b/src/devices/sound/nukedopl.h similarity index 100% rename from src/sound/nukedopl.h rename to src/devices/sound/nukedopl.h diff --git a/src/sound/openal.c b/src/devices/sound/openal.c similarity index 99% rename from src/sound/openal.c rename to src/devices/sound/openal.c index 3fbe6db..b1b9b2c 100644 --- a/src/sound/openal.c +++ b/src/devices/sound/openal.c @@ -8,7 +8,7 @@ * * Interface to the OpenAL sound processing library. * - * Version: @(#)openal.c 1.0.10 2018/04/27 + * Version: @(#)openal.c 1.0.11 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -51,9 +51,9 @@ # include # include #endif -#include "../emu.h" -#include "../ui/ui.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../ui/ui.h" +#include "../../plat.h" #include "sound.h" #include "midi.h" diff --git a/src/sound/resid-fp/AUTHORS b/src/devices/sound/resid-fp/AUTHORS similarity index 100% rename from src/sound/resid-fp/AUTHORS rename to src/devices/sound/resid-fp/AUTHORS diff --git a/src/sound/resid-fp/COPYING b/src/devices/sound/resid-fp/COPYING similarity index 100% rename from src/sound/resid-fp/COPYING rename to src/devices/sound/resid-fp/COPYING diff --git a/src/sound/resid-fp/ChangeLog b/src/devices/sound/resid-fp/ChangeLog similarity index 100% rename from src/sound/resid-fp/ChangeLog rename to src/devices/sound/resid-fp/ChangeLog diff --git a/src/sound/resid-fp/INSTALL b/src/devices/sound/resid-fp/INSTALL similarity index 100% rename from src/sound/resid-fp/INSTALL rename to src/devices/sound/resid-fp/INSTALL diff --git a/src/sound/resid-fp/Makefile.am b/src/devices/sound/resid-fp/Makefile.am similarity index 100% rename from src/sound/resid-fp/Makefile.am rename to src/devices/sound/resid-fp/Makefile.am diff --git a/src/sound/resid-fp/Makefile.in b/src/devices/sound/resid-fp/Makefile.in similarity index 100% rename from src/sound/resid-fp/Makefile.in rename to src/devices/sound/resid-fp/Makefile.in diff --git a/src/sound/resid-fp/NEWS b/src/devices/sound/resid-fp/NEWS similarity index 100% rename from src/sound/resid-fp/NEWS rename to src/devices/sound/resid-fp/NEWS diff --git a/src/sound/resid-fp/README b/src/devices/sound/resid-fp/README similarity index 100% rename from src/sound/resid-fp/README rename to src/devices/sound/resid-fp/README diff --git a/src/sound/resid-fp/README.VICE b/src/devices/sound/resid-fp/README.VICE similarity index 100% rename from src/sound/resid-fp/README.VICE rename to src/devices/sound/resid-fp/README.VICE diff --git a/src/sound/resid-fp/aclocal.m4 b/src/devices/sound/resid-fp/aclocal.m4 similarity index 100% rename from src/sound/resid-fp/aclocal.m4 rename to src/devices/sound/resid-fp/aclocal.m4 diff --git a/src/sound/resid-fp/configure b/src/devices/sound/resid-fp/configure similarity index 100% rename from src/sound/resid-fp/configure rename to src/devices/sound/resid-fp/configure diff --git a/src/sound/resid-fp/configure.in b/src/devices/sound/resid-fp/configure.in similarity index 100% rename from src/sound/resid-fp/configure.in rename to src/devices/sound/resid-fp/configure.in diff --git a/src/sound/resid-fp/convolve-sse.cpp b/src/devices/sound/resid-fp/convolve-sse.cpp similarity index 100% rename from src/sound/resid-fp/convolve-sse.cpp rename to src/devices/sound/resid-fp/convolve-sse.cpp diff --git a/src/sound/resid-fp/convolve.cpp b/src/devices/sound/resid-fp/convolve.cpp similarity index 100% rename from src/sound/resid-fp/convolve.cpp rename to src/devices/sound/resid-fp/convolve.cpp diff --git a/src/sound/resid-fp/envelope.cpp b/src/devices/sound/resid-fp/envelope.cpp similarity index 100% rename from src/sound/resid-fp/envelope.cpp rename to src/devices/sound/resid-fp/envelope.cpp diff --git a/src/sound/resid-fp/envelope.h b/src/devices/sound/resid-fp/envelope.h similarity index 100% rename from src/sound/resid-fp/envelope.h rename to src/devices/sound/resid-fp/envelope.h diff --git a/src/sound/resid-fp/extfilt.cpp b/src/devices/sound/resid-fp/extfilt.cpp similarity index 100% rename from src/sound/resid-fp/extfilt.cpp rename to src/devices/sound/resid-fp/extfilt.cpp diff --git a/src/sound/resid-fp/extfilt.h b/src/devices/sound/resid-fp/extfilt.h similarity index 100% rename from src/sound/resid-fp/extfilt.h rename to src/devices/sound/resid-fp/extfilt.h diff --git a/src/sound/resid-fp/filter.cpp b/src/devices/sound/resid-fp/filter.cpp similarity index 100% rename from src/sound/resid-fp/filter.cpp rename to src/devices/sound/resid-fp/filter.cpp diff --git a/src/sound/resid-fp/filter.h b/src/devices/sound/resid-fp/filter.h similarity index 100% rename from src/sound/resid-fp/filter.h rename to src/devices/sound/resid-fp/filter.h diff --git a/src/sound/resid-fp/pot.cpp b/src/devices/sound/resid-fp/pot.cpp similarity index 100% rename from src/sound/resid-fp/pot.cpp rename to src/devices/sound/resid-fp/pot.cpp diff --git a/src/sound/resid-fp/pot.h b/src/devices/sound/resid-fp/pot.h similarity index 100% rename from src/sound/resid-fp/pot.h rename to src/devices/sound/resid-fp/pot.h diff --git a/src/sound/resid-fp/samp2src.pl b/src/devices/sound/resid-fp/samp2src.pl similarity index 100% rename from src/sound/resid-fp/samp2src.pl rename to src/devices/sound/resid-fp/samp2src.pl diff --git a/src/sound/resid-fp/sid.cpp b/src/devices/sound/resid-fp/sid.cpp similarity index 100% rename from src/sound/resid-fp/sid.cpp rename to src/devices/sound/resid-fp/sid.cpp diff --git a/src/sound/resid-fp/sid.h b/src/devices/sound/resid-fp/sid.h similarity index 100% rename from src/sound/resid-fp/sid.h rename to src/devices/sound/resid-fp/sid.h diff --git a/src/sound/resid-fp/siddefs-fp.h b/src/devices/sound/resid-fp/siddefs-fp.h similarity index 100% rename from src/sound/resid-fp/siddefs-fp.h rename to src/devices/sound/resid-fp/siddefs-fp.h diff --git a/src/sound/resid-fp/siddefs-fp.h.in b/src/devices/sound/resid-fp/siddefs-fp.h.in similarity index 100% rename from src/sound/resid-fp/siddefs-fp.h.in rename to src/devices/sound/resid-fp/siddefs-fp.h.in diff --git a/src/sound/resid-fp/version.cpp b/src/devices/sound/resid-fp/version.cpp similarity index 100% rename from src/sound/resid-fp/version.cpp rename to src/devices/sound/resid-fp/version.cpp diff --git a/src/sound/resid-fp/voice.cpp b/src/devices/sound/resid-fp/voice.cpp similarity index 100% rename from src/sound/resid-fp/voice.cpp rename to src/devices/sound/resid-fp/voice.cpp diff --git a/src/sound/resid-fp/voice.h b/src/devices/sound/resid-fp/voice.h similarity index 100% rename from src/sound/resid-fp/voice.h rename to src/devices/sound/resid-fp/voice.h diff --git a/src/sound/resid-fp/wave.cpp b/src/devices/sound/resid-fp/wave.cpp similarity index 100% rename from src/sound/resid-fp/wave.cpp rename to src/devices/sound/resid-fp/wave.cpp diff --git a/src/sound/resid-fp/wave.h b/src/devices/sound/resid-fp/wave.h similarity index 100% rename from src/sound/resid-fp/wave.h rename to src/devices/sound/resid-fp/wave.h diff --git a/src/sound/resid-fp/wave6581_PST.cpp b/src/devices/sound/resid-fp/wave6581_PST.cpp similarity index 100% rename from src/sound/resid-fp/wave6581_PST.cpp rename to src/devices/sound/resid-fp/wave6581_PST.cpp diff --git a/src/sound/resid-fp/wave6581_PST.dat b/src/devices/sound/resid-fp/wave6581_PST.dat similarity index 100% rename from src/sound/resid-fp/wave6581_PST.dat rename to src/devices/sound/resid-fp/wave6581_PST.dat diff --git a/src/sound/resid-fp/wave6581_PS_.cpp b/src/devices/sound/resid-fp/wave6581_PS_.cpp similarity index 100% rename from src/sound/resid-fp/wave6581_PS_.cpp rename to src/devices/sound/resid-fp/wave6581_PS_.cpp diff --git a/src/sound/resid-fp/wave6581_PS_.dat b/src/devices/sound/resid-fp/wave6581_PS_.dat similarity index 100% rename from src/sound/resid-fp/wave6581_PS_.dat rename to src/devices/sound/resid-fp/wave6581_PS_.dat diff --git a/src/sound/resid-fp/wave6581_P_T.cpp b/src/devices/sound/resid-fp/wave6581_P_T.cpp similarity index 100% rename from src/sound/resid-fp/wave6581_P_T.cpp rename to src/devices/sound/resid-fp/wave6581_P_T.cpp diff --git a/src/sound/resid-fp/wave6581_P_T.dat b/src/devices/sound/resid-fp/wave6581_P_T.dat similarity index 100% rename from src/sound/resid-fp/wave6581_P_T.dat rename to src/devices/sound/resid-fp/wave6581_P_T.dat diff --git a/src/sound/resid-fp/wave6581__ST.cpp b/src/devices/sound/resid-fp/wave6581__ST.cpp similarity index 100% rename from src/sound/resid-fp/wave6581__ST.cpp rename to src/devices/sound/resid-fp/wave6581__ST.cpp diff --git a/src/sound/resid-fp/wave6581__ST.dat b/src/devices/sound/resid-fp/wave6581__ST.dat similarity index 100% rename from src/sound/resid-fp/wave6581__ST.dat rename to src/devices/sound/resid-fp/wave6581__ST.dat diff --git a/src/sound/resid-fp/wave8580_PST.cpp b/src/devices/sound/resid-fp/wave8580_PST.cpp similarity index 100% rename from src/sound/resid-fp/wave8580_PST.cpp rename to src/devices/sound/resid-fp/wave8580_PST.cpp diff --git a/src/sound/resid-fp/wave8580_PST.dat b/src/devices/sound/resid-fp/wave8580_PST.dat similarity index 100% rename from src/sound/resid-fp/wave8580_PST.dat rename to src/devices/sound/resid-fp/wave8580_PST.dat diff --git a/src/sound/resid-fp/wave8580_PS_.cpp b/src/devices/sound/resid-fp/wave8580_PS_.cpp similarity index 100% rename from src/sound/resid-fp/wave8580_PS_.cpp rename to src/devices/sound/resid-fp/wave8580_PS_.cpp diff --git a/src/sound/resid-fp/wave8580_PS_.dat b/src/devices/sound/resid-fp/wave8580_PS_.dat similarity index 100% rename from src/sound/resid-fp/wave8580_PS_.dat rename to src/devices/sound/resid-fp/wave8580_PS_.dat diff --git a/src/sound/resid-fp/wave8580_P_T.cpp b/src/devices/sound/resid-fp/wave8580_P_T.cpp similarity index 100% rename from src/sound/resid-fp/wave8580_P_T.cpp rename to src/devices/sound/resid-fp/wave8580_P_T.cpp diff --git a/src/sound/resid-fp/wave8580_P_T.dat b/src/devices/sound/resid-fp/wave8580_P_T.dat similarity index 100% rename from src/sound/resid-fp/wave8580_P_T.dat rename to src/devices/sound/resid-fp/wave8580_P_T.dat diff --git a/src/sound/resid-fp/wave8580__ST.cpp b/src/devices/sound/resid-fp/wave8580__ST.cpp similarity index 100% rename from src/sound/resid-fp/wave8580__ST.cpp rename to src/devices/sound/resid-fp/wave8580__ST.cpp diff --git a/src/sound/resid-fp/wave8580__ST.dat b/src/devices/sound/resid-fp/wave8580__ST.dat similarity index 100% rename from src/sound/resid-fp/wave8580__ST.dat rename to src/devices/sound/resid-fp/wave8580__ST.dat diff --git a/src/sound/snd_ad1848.c b/src/devices/sound/snd_ad1848.c similarity index 98% rename from src/sound/snd_ad1848.c rename to src/devices/sound/snd_ad1848.c index 00e0d65..11923f4 100644 --- a/src/sound/snd_ad1848.c +++ b/src/devices/sound/snd_ad1848.c @@ -8,7 +8,7 @@ * * Emulation of the AD1848 (Windows Sound System) CODEC. * - * Version: @(#)snd_ad1848.c 1.0.3 2018/05/04 + * Version: @(#)snd_ad1848.c 1.0.4 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,10 +41,10 @@ #include #include #include -#include "../emu.h" -#include "../dma.h" -#include "../pic.h" -#include "../timer.h" +#include "../../emu.h" +#include "../../timer.h" +#include "../system/dma.h" +#include "../system/pic.h" #include "sound.h" #include "snd_ad1848.h" diff --git a/src/sound/snd_ad1848.h b/src/devices/sound/snd_ad1848.h similarity index 100% rename from src/sound/snd_ad1848.h rename to src/devices/sound/snd_ad1848.h diff --git a/src/sound/snd_adlib.c b/src/devices/sound/snd_adlib.c similarity index 96% rename from src/sound/snd_adlib.c rename to src/devices/sound/snd_adlib.c index 98e6600..7c1449e 100644 --- a/src/sound/snd_adlib.c +++ b/src/devices/sound/snd_adlib.c @@ -8,7 +8,7 @@ * * Implementation of the ADLIB sound device. * - * Version: @(#)snd_adlib.c 1.0.3 2018/04/08 + * Version: @(#)snd_adlib.c 1.0.4 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,10 +41,10 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../mca.h" -#include "../device.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../device.h" +#include "../system/mca.h" #include "sound.h" #include "snd_opl.h" diff --git a/src/sound/snd_adlibgold.c b/src/devices/sound/snd_adlibgold.c similarity index 99% rename from src/sound/snd_adlibgold.c rename to src/devices/sound/snd_adlibgold.c index 6f04ad0..7a36ff9 100644 --- a/src/sound/snd_adlibgold.c +++ b/src/devices/sound/snd_adlibgold.c @@ -10,7 +10,7 @@ * * TODO: Stack allocation of big buffers (line 688 et al.) * - * Version: @(#)snd_adlibgold.c 1.0.7 2018/04/08 + * Version: @(#)snd_adlibgold.c 1.0.8 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -43,17 +43,17 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../dma.h" -#include "../pic.h" -#include "../pit.h" -#include "../mem.h" -#include "../rom.h" -#include "../nvr.h" -#include "../timer.h" -#include "../device.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../timer.h" +#include "../../device.h" +#include "../../nvr.h" +#include "../../plat.h" +#include "../system/dma.h" +#include "../system/pic.h" +#include "../system/pit.h" #include "sound.h" #include "filters.h" #include "snd_opl.h" diff --git a/src/sound/snd_audiopci.c b/src/devices/sound/snd_audiopci.c similarity index 99% rename from src/sound/snd_audiopci.c rename to src/devices/sound/snd_audiopci.c index 492e350..4c280fe 100644 --- a/src/sound/snd_audiopci.c +++ b/src/devices/sound/snd_audiopci.c @@ -8,7 +8,7 @@ * * Implementation of the AudioPCI sound device. * - * Version: @(#)snd_audiopci.c 1.0.11 2018/04/08 + * Version: @(#)snd_audiopci.c 1.0.12 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,13 +41,13 @@ #include #include #include -#include "../emu.h" -#include "../device.h" -#include "../io.h" -#include "../nmi.h" -#include "../mem.h" -#include "../pci.h" -#include "../timer.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../timer.h" +#include "../../device.h" +#include "../system/nmi.h" +#include "../system/pci.h" #include "sound.h" diff --git a/src/sound/snd_cms.c b/src/devices/sound/snd_cms.c similarity index 98% rename from src/sound/snd_cms.c rename to src/devices/sound/snd_cms.c index 803deb6..f2a13cd 100644 --- a/src/sound/snd_cms.c +++ b/src/devices/sound/snd_cms.c @@ -8,7 +8,7 @@ * * Implementation of the Creative CMS/GameBlaster sound device. * - * Version: @(#)snd_cms.c 1.0.4 2018/04/08 + * Version: @(#)snd_cms.c 1.0.5 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,9 +41,9 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../device.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../device.h" #include "sound.h" diff --git a/src/sound/snd_dbopl.cpp b/src/devices/sound/snd_dbopl.cpp similarity index 100% rename from src/sound/snd_dbopl.cpp rename to src/devices/sound/snd_dbopl.cpp diff --git a/src/sound/snd_dbopl.h b/src/devices/sound/snd_dbopl.h similarity index 100% rename from src/sound/snd_dbopl.h rename to src/devices/sound/snd_dbopl.h diff --git a/src/sound/snd_emu8k.c b/src/devices/sound/snd_emu8k.c similarity index 99% rename from src/sound/snd_emu8k.c rename to src/devices/sound/snd_emu8k.c index 4ee677b..17d90f9 100644 --- a/src/sound/snd_emu8k.c +++ b/src/devices/sound/snd_emu8k.c @@ -8,7 +8,7 @@ * * Implementation of Emu8000 emulator. * - * Version: @(#)snd_emu8k.c 1.0.10 2018/05/04 + * Version: @(#)snd_emu8k.c 1.0.11 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -45,13 +45,13 @@ #include #include #define HAVE_STDARG_H -#include "../emu.h" -#include "../device.h" -#include "../io.h" -#include "../mem.h" -#include "../rom.h" -#include "../timer.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../timer.h" +#include "../../device.h" +#include "../../plat.h" #include "sound.h" #include "snd_emu8k.h" diff --git a/src/sound/snd_emu8k.h b/src/devices/sound/snd_emu8k.h similarity index 100% rename from src/sound/snd_emu8k.h rename to src/devices/sound/snd_emu8k.h diff --git a/src/sound/snd_gus.c b/src/devices/sound/snd_gus.c similarity index 99% rename from src/sound/snd_gus.c rename to src/devices/sound/snd_gus.c index 1a2e78e..32bd7ba 100644 --- a/src/sound/snd_gus.c +++ b/src/devices/sound/snd_gus.c @@ -8,7 +8,7 @@ * * Implementation of the Gravis UltraSound sound device. * - * Version: @(#)snd_gus.c 1.0.4 2018/04/08 + * Version: @(#)snd_gus.c 1.0.5 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,13 +41,13 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../nmi.h" -#include "../pic.h" -#include "../dma.h" -#include "../timer.h" -#include "../device.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../timer.h" +#include "../../device.h" +#include "../system/dma.h" +#include "../system/nmi.h" +#include "../system/pic.h" #include "sound.h" diff --git a/src/sound/snd_lpt_dac.c b/src/devices/sound/snd_lpt_dac.c similarity index 95% rename from src/sound/snd_lpt_dac.c rename to src/devices/sound/snd_lpt_dac.c index 821cb79..922eb23 100644 --- a/src/sound/snd_lpt_dac.c +++ b/src/devices/sound/snd_lpt_dac.c @@ -8,7 +8,7 @@ * * Implemantation of LPT-based sound devices. * - * Version: @(#)snd_lpt_dac.c 1.0.6 2018/04/26 + * Version: @(#)snd_lpt_dac.c 1.0.7 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,11 +41,11 @@ #include #include #include -#include "../emu.h" -#include "../cpu/cpu.h" -#include "../machine/machine.h" +#include "../../emu.h" +#include "../../cpu/cpu.h" +#include "../../machines/machine.h" +#include "../../timer.h" #include "../ports/parallel_dev.h" -#include "../timer.h" #include "sound.h" #include "filters.h" #include "snd_lpt_dac.h" diff --git a/src/sound/snd_lpt_dac.h b/src/devices/sound/snd_lpt_dac.h similarity index 100% rename from src/sound/snd_lpt_dac.h rename to src/devices/sound/snd_lpt_dac.h diff --git a/src/sound/snd_lpt_dss.c b/src/devices/sound/snd_lpt_dss.c similarity index 95% rename from src/sound/snd_lpt_dss.c rename to src/devices/sound/snd_lpt_dss.c index 57eee54..614037e 100644 --- a/src/sound/snd_lpt_dss.c +++ b/src/devices/sound/snd_lpt_dss.c @@ -8,7 +8,7 @@ * * Implementation of the LPT-based DSS sound device. * - * Version: @(#)snd_lpt_dss.c 1.0.6 2018/04/26 + * Version: @(#)snd_lpt_dss.c 1.0.7 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,10 +41,10 @@ #include #include #include -#include "../emu.h" -#include "../cpu/cpu.h" -#include "../machine/machine.h" -#include "../timer.h" +#include "../../emu.h" +#include "../../cpu/cpu.h" +#include "../../machines/machine.h" +#include "../../timer.h" #include "../ports/parallel_dev.h" #include "sound.h" #include "filters.h" diff --git a/src/sound/snd_lpt_dss.h b/src/devices/sound/snd_lpt_dss.h similarity index 100% rename from src/sound/snd_lpt_dss.h rename to src/devices/sound/snd_lpt_dss.h diff --git a/src/sound/snd_mpu401.c b/src/devices/sound/snd_mpu401.c similarity index 99% rename from src/sound/snd_mpu401.c rename to src/devices/sound/snd_mpu401.c index e5b1ccb..2c9ce80 100644 --- a/src/sound/snd_mpu401.c +++ b/src/devices/sound/snd_mpu401.c @@ -8,7 +8,7 @@ * * Roland MPU-401 emulation. * - * Version: @(#)snd_mpu401.c 1.0.7 2018/04/14 + * Version: @(#)snd_mpu401.c 1.0.8 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -46,11 +46,11 @@ #include #include #define HAVE_STDARG_H -#include "../emu.h" -#include "../device.h" -#include "../io.h" -#include "../pic.h" -#include "../timer.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../timer.h" +#include "../../device.h" +#include "../system/pic.h" #include "sound.h" #include "snd_mpu401.h" #include "midi.h" diff --git a/src/sound/snd_mpu401.h b/src/devices/sound/snd_mpu401.h similarity index 100% rename from src/sound/snd_mpu401.h rename to src/devices/sound/snd_mpu401.h diff --git a/src/sound/snd_opl.c b/src/devices/sound/snd_opl.c similarity index 97% rename from src/sound/snd_opl.c rename to src/devices/sound/snd_opl.c index 02ce008..0dad542 100644 --- a/src/sound/snd_opl.c +++ b/src/devices/sound/snd_opl.c @@ -8,7 +8,7 @@ * * Interface to the actual OPL emulator. * - * Version: @(#)snd_opl.c 1.0.1 2018/02/14 + * Version: @(#)snd_opl.c 1.0.2 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -42,10 +42,10 @@ #include #include #include -#include "../emu.h" -#include "../cpu/cpu.h" -#include "../io.h" -#include "../timer.h" +#include "../../emu.h" +#include "../../cpu/cpu.h" +#include "../../io.h" +#include "../../timer.h" #include "sound.h" #include "snd_opl.h" #include "snd_dbopl.h" diff --git a/src/sound/snd_opl.h b/src/devices/sound/snd_opl.h similarity index 100% rename from src/sound/snd_opl.h rename to src/devices/sound/snd_opl.h diff --git a/src/sound/snd_pas16.c b/src/devices/sound/snd_pas16.c similarity index 99% rename from src/sound/snd_pas16.c rename to src/devices/sound/snd_pas16.c index 1b91711..a210838 100644 --- a/src/sound/snd_pas16.c +++ b/src/devices/sound/snd_pas16.c @@ -79,7 +79,7 @@ * FF88 - board model * 3 = PAS16 * - * Version: @(#)snd_pas16.c 1.0.5 2018/04/09 + * Version: @(#)snd_pas16.c 1.0.6 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -112,14 +112,14 @@ #include #include #include -#include "../emu.h" -#include "../cpu/cpu.h" -#include "../io.h" -#include "../pic.h" -#include "../pit.h" -#include "../dma.h" -#include "../timer.h" -#include "../device.h" +#include "../../emu.h" +#include "../../cpu/cpu.h" +#include "../../io.h" +#include "../../timer.h" +#include "../../device.h" +#include "../system/dma.h" +#include "../system/pic.h" +#include "../system/pit.h" #include "sound.h" #include "filters.h" #include "snd_mpu401.h" diff --git a/src/sound/snd_resid.cpp b/src/devices/sound/snd_resid.cpp similarity index 98% rename from src/sound/snd_resid.cpp rename to src/devices/sound/snd_resid.cpp index 3fdd851..084b628 100644 --- a/src/sound/snd_resid.cpp +++ b/src/devices/sound/snd_resid.cpp @@ -8,7 +8,7 @@ * * Interface to the ReSid library. * - * Version: @(#)snd_resid.cpp 1.0.3 2018/04/08 + * Version: @(#)snd_resid.cpp 1.0.4 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,7 +41,7 @@ #include #include #include "resid-fp/sid.h" -#include "../plat.h" +#include "../../plat.h" #include "sound.h" #include "snd_resid.h" diff --git a/src/sound/snd_resid.h b/src/devices/sound/snd_resid.h similarity index 100% rename from src/sound/snd_resid.h rename to src/devices/sound/snd_resid.h diff --git a/src/sound/snd_sb.c b/src/devices/sound/snd_sb.c similarity index 99% rename from src/sound/snd_sb.c rename to src/devices/sound/snd_sb.c index 5707e56..fc6f23b 100644 --- a/src/sound/snd_sb.c +++ b/src/devices/sound/snd_sb.c @@ -8,7 +8,7 @@ * * Sound Blaster emulation. * - * Version: @(#)sound_sb.c 1.0.5 2018/04/08 + * Version: @(#)sound_sb.c 1.0.6 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -42,12 +42,12 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../mca.h" -#include "../mem.h" -#include "../rom.h" -#include "../device.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../device.h" +#include "../system/mca.h" #include "sound.h" #include "filters.h" #include "snd_dbopl.h" diff --git a/src/sound/snd_sb.h b/src/devices/sound/snd_sb.h similarity index 100% rename from src/sound/snd_sb.h rename to src/devices/sound/snd_sb.h diff --git a/src/sound/snd_sb_dsp.c b/src/devices/sound/snd_sb_dsp.c similarity index 99% rename from src/sound/snd_sb_dsp.c rename to src/devices/sound/snd_sb_dsp.c index 62a842f..6f52946 100644 --- a/src/sound/snd_sb_dsp.c +++ b/src/devices/sound/snd_sb_dsp.c @@ -14,7 +14,7 @@ * 486-50 - 32kHz * Pentium - 45kHz * - * Version: @(#)snd_sb_dsp.c 1.0.5 2018/05/04 + * Version: @(#)snd_sb_dsp.c 1.0.6 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -48,12 +48,12 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../pic.h" -#include "../dma.h" -#include "../timer.h" -#include "../device.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../timer.h" +#include "../../device.h" +#include "../system/dma.h" +#include "../system/pic.h" #include "sound.h" #include "midi.h" #include "snd_mpu401.h" diff --git a/src/sound/snd_sb_dsp.h b/src/devices/sound/snd_sb_dsp.h similarity index 100% rename from src/sound/snd_sb_dsp.h rename to src/devices/sound/snd_sb_dsp.h diff --git a/src/sound/snd_sn76489.c b/src/devices/sound/snd_sn76489.c similarity index 98% rename from src/sound/snd_sn76489.c rename to src/devices/sound/snd_sn76489.c index 1e3f7af..ffda12d 100644 --- a/src/sound/snd_sn76489.c +++ b/src/devices/sound/snd_sn76489.c @@ -8,7 +8,7 @@ * * Implementation of the TI SN74689 PSG sound devices. * - * Version: @(#)snd_sn76489.c 1.0.3 2018/03/28 + * Version: @(#)snd_sn76489.c 1.0.4 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -42,9 +42,9 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../device.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../device.h" #include "sound.h" #include "snd_sn76489.h" diff --git a/src/sound/snd_sn76489.h b/src/devices/sound/snd_sn76489.h similarity index 100% rename from src/sound/snd_sn76489.h rename to src/devices/sound/snd_sn76489.h diff --git a/src/sound/snd_speaker.c b/src/devices/sound/snd_speaker.c similarity index 96% rename from src/sound/snd_speaker.c rename to src/devices/sound/snd_speaker.c index 860b515..2ab7b46 100644 --- a/src/sound/snd_speaker.c +++ b/src/devices/sound/snd_speaker.c @@ -8,7 +8,7 @@ * * Implementation of the PC-Speaker device. * - * Version: @(#)snd_speaker.c 1.0.1 2018/02/14 + * Version: @(#)snd_speaker.c 1.0.2 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -40,8 +40,8 @@ #include #include #include -#include "../emu.h" -#include "../pit.h" +#include "../../emu.h" +#include "../system/pit.h" #include "sound.h" #include "snd_speaker.h" diff --git a/src/sound/snd_speaker.h b/src/devices/sound/snd_speaker.h similarity index 100% rename from src/sound/snd_speaker.h rename to src/devices/sound/snd_speaker.h diff --git a/src/sound/snd_ssi2001.c b/src/devices/sound/snd_ssi2001.c similarity index 97% rename from src/sound/snd_ssi2001.c rename to src/devices/sound/snd_ssi2001.c index 21a018f..771db9d 100644 --- a/src/sound/snd_ssi2001.c +++ b/src/devices/sound/snd_ssi2001.c @@ -8,7 +8,7 @@ * * Implementation of the SSI2001 sound device. * - * Version: @(#)snd_ssi2001.c 1.0.4 2018/04/09 + * Version: @(#)snd_ssi2001.c 1.0.5 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,9 +41,9 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../device.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../device.h" #include "sound.h" #include "snd_resid.h" diff --git a/src/sound/snd_wss.c b/src/devices/sound/snd_wss.c similarity index 95% rename from src/sound/snd_wss.c rename to src/devices/sound/snd_wss.c index 4dc9b76..81e4b45 100644 --- a/src/sound/snd_wss.c +++ b/src/devices/sound/snd_wss.c @@ -8,7 +8,7 @@ * * Implementation of the Windows Sound System sound device. * - * Version: @(#)snd_wss.c 1.0.3 2018/04/08 + * Version: @(#)snd_wss.c 1.0.4 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -42,11 +42,11 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../pic.h" -#include "../dma.h" -#include "../device.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../device.h" +#include "../system/dma.h" +#include "../system/pic.h" #include "sound.h" #include "snd_ad1848.h" #include "snd_opl.h" diff --git a/src/sound/snd_ym7128.c b/src/devices/sound/snd_ym7128.c similarity index 98% rename from src/sound/snd_ym7128.c rename to src/devices/sound/snd_ym7128.c index 69e6a48..808bb21 100644 --- a/src/sound/snd_ym7128.c +++ b/src/devices/sound/snd_ym7128.c @@ -8,7 +8,7 @@ * * Implementation of the Yamaha YM7128 sound device. * - * Version: @(#)snd_ym7128.c 1.0.1 2018/02/14 + * Version: @(#)snd_ym7128.c 1.0.2 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -40,7 +40,7 @@ #include #include #include -#include "../emu.h" +#include "../../emu.h" #include "snd_ym7128.h" diff --git a/src/sound/snd_ym7128.h b/src/devices/sound/snd_ym7128.h similarity index 100% rename from src/sound/snd_ym7128.h rename to src/devices/sound/snd_ym7128.h diff --git a/src/sound/sound.c b/src/devices/sound/sound.c similarity index 98% rename from src/sound/sound.c rename to src/devices/sound/sound.c index 675de0e..f892825 100644 --- a/src/sound/sound.c +++ b/src/devices/sound/sound.c @@ -8,7 +8,7 @@ * * Sound emulation core. * - * Version: @(#)sound.c 1.0.10 2018/04/14 + * Version: @(#)sound.c 1.0.11 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -43,11 +43,11 @@ #include #include #define HAVE_STDARG_H -#include "../emu.h" -#include "../device.h" -#include "../timer.h" +#include "../../emu.h" +#include "../../timer.h" +#include "../../device.h" +#include "../../plat.h" #include "../cdrom/cdrom.h" -#include "../plat.h" #include "sound.h" #include "midi.h" #ifdef USE_FLUIDSYNTH diff --git a/src/sound/sound.h b/src/devices/sound/sound.h similarity index 100% rename from src/sound/sound.h rename to src/devices/sound/sound.h diff --git a/src/sound/sound_dev.c b/src/devices/sound/sound_dev.c similarity index 97% rename from src/sound/sound_dev.c rename to src/devices/sound/sound_dev.c index 35d1380..e8f1b23 100644 --- a/src/sound/sound_dev.c +++ b/src/devices/sound/sound_dev.c @@ -8,7 +8,7 @@ * * Sound devices support module. * - * Version: @(#)sound_dev.c 1.0.5 2018/05/03 + * Version: @(#)sound_dev.c 1.0.6 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -43,9 +43,9 @@ #include #include #define HAVE_STDARG_H -#include "../emu.h" -#include "../device.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../device.h" +#include "../../plat.h" #include "sound.h" diff --git a/src/dma.c b/src/devices/system/dma.c similarity index 98% rename from src/dma.c rename to src/devices/system/dma.c index 5bfa71c..c00f6b6 100644 --- a/src/dma.c +++ b/src/devices/system/dma.c @@ -8,7 +8,7 @@ * * Implementation of the Intel DMA controllers. * - * Version: @(#)dma.c 1.0.4 2018/04/26 + * Version: @(#)dma.c 1.0.5 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -40,15 +40,15 @@ #include #include #include -#include "emu.h" -#include "cpu/cpu.h" -#include "cpu/x86.h" -#include "machine/machine.h" +#include "../../emu.h" +#include "../../cpu/cpu.h" +#include "../../cpu/x86.h" +#include "../../machines/machine.h" +#include "../../mem.h" +#include "../../io.h" +#include "../../plat.h" #include "mca.h" -#include "mem.h" -#include "io.h" #include "dma.h" -#include "plat.h" dma_t dma[8]; diff --git a/src/dma.h b/src/devices/system/dma.h similarity index 100% rename from src/dma.h rename to src/devices/system/dma.h diff --git a/src/i82335.c b/src/devices/system/i82335.c similarity index 97% rename from src/i82335.c rename to src/devices/system/i82335.c index c144800..7038643 100644 --- a/src/i82335.c +++ b/src/devices/system/i82335.c @@ -8,7 +8,7 @@ * * Intel 82335 SX emulation, used by the Phoenix 386 clone. * - * Version: @(#)i82335.c 1.0.2 2018/04/26 + * Version: @(#)i82335.c 1.0.3 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -40,9 +40,9 @@ #include #include #include -#include "io.h" -#include "mem.h" -#include "plat.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../plat.h" typedef struct { diff --git a/src/i82335.h b/src/devices/system/i82335.h similarity index 100% rename from src/i82335.h rename to src/devices/system/i82335.h diff --git a/src/intel.c b/src/devices/system/intel.c similarity index 93% rename from src/intel.c rename to src/devices/system/intel.c index d7da2ea..f43fef9 100644 --- a/src/intel.c +++ b/src/devices/system/intel.c @@ -8,7 +8,7 @@ * * Implementation of Intel mainboards. * - * Version: @(#)intel.c 1.0.4 2018/05/04 + * Version: @(#)intel.c 1.0.5 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -40,14 +40,14 @@ #include #include #include -#include "cpu/cpu.h" -#include "machine/machine.h" -#include "io.h" -#include "mem.h" -#include "pit.h" -#include "timer.h" +#include "../../cpu/cpu.h" +#include "../../machines/machine.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../timer.h" +#include "../../plat.h" #include "intel.h" -#include "plat.h" +#include "pit.h" static uint16_t bm_timer_latch; diff --git a/src/intel.h b/src/devices/system/intel.h similarity index 100% rename from src/intel.h rename to src/devices/system/intel.h diff --git a/src/intel_flash.c b/src/devices/system/intel_flash.c similarity index 97% rename from src/intel_flash.c rename to src/devices/system/intel_flash.c index b25d94a..c9d6657 100644 --- a/src/intel_flash.c +++ b/src/devices/system/intel_flash.c @@ -8,7 +8,7 @@ * * Implementation of the Intel 2 Mbit 8-bit flash devices. * - * Version: @(#)intel_flash.c 1.0.5 2018/03/31 + * Version: @(#)intel_flash.c 1.0.6 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,13 +41,13 @@ #include #include #include -#include "emu.h" -#include "cpu/cpu.h" -#include "device.h" -#include "mem.h" -#include "machine/machine.h" -#include "nvr.h" -#include "plat.h" +#include "../../emu.h" +#include "../../cpu/cpu.h" +#include "../../machines/machine.h" +#include "../../device.h" +#include "../../mem.h" +#include "../../nvr.h" +#include "../../plat.h" #define FLASH_IS_BXB 2 diff --git a/src/intel_flash.h b/src/devices/system/intel_flash.h similarity index 100% rename from src/intel_flash.h rename to src/devices/system/intel_flash.h diff --git a/src/intel_piix.c b/src/devices/system/intel_piix.c similarity index 99% rename from src/intel_piix.c rename to src/devices/system/intel_piix.c index 583b92e..03ebd97 100644 --- a/src/intel_piix.c +++ b/src/devices/system/intel_piix.c @@ -12,7 +12,7 @@ * word 0 - base address * word 1 - bits 1-15 = byte count, bit 31 = end of transfer * - * Version: @(#)intel_piix.c 1.0.3 2018/04/26 + * Version: @(#)intel_piix.c 1.0.4 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -44,15 +44,15 @@ #include #include #include -#include "emu.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../device.h" +#include "../input/keyboard.h" +#include "../disk/hdc.h" +#include "../disk/hdc_ide.h" #include "dma.h" -#include "io.h" #include "pci.h" -#include "mem.h" -#include "device.h" -#include "input/keyboard.h" -#include "disk/hdc.h" -#include "disk/hdc_ide.h" #include "intel_piix.h" diff --git a/src/intel_piix.h b/src/devices/system/intel_piix.h similarity index 100% rename from src/intel_piix.h rename to src/devices/system/intel_piix.h diff --git a/src/intel_piix4.c b/src/devices/system/intel_piix4.c similarity index 98% rename from src/intel_piix4.c rename to src/devices/system/intel_piix4.c index e376afb..9743b5a 100644 --- a/src/intel_piix4.c +++ b/src/devices/system/intel_piix4.c @@ -12,7 +12,7 @@ * word 0 - base address * word 1 - bits 1-15 = byte count, bit 31 = end of transfer * - * Version: @(#)intel_piix4.c 1.0.2 2018/04/26 + * Version: @(#)intel_piix4.c 1.0.3 2018/05/06 * * Author: Miran Grca, * @@ -40,15 +40,15 @@ #include #include #include -#include "emu.h" -#include "io.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../device.h" +#include "../input/keyboard.h" +#include "../disk/hdc.h" +#include "../disk/hdc_ide.h" #include "dma.h" #include "pci.h" -#include "mem.h" -#include "device.h" -#include "input/keyboard.h" -#include "disk/hdc.h" -#include "disk/hdc_ide.h" #include "intel_piix.h" diff --git a/src/intel_sio.c b/src/devices/system/intel_sio.c similarity index 97% rename from src/intel_sio.c rename to src/devices/system/intel_sio.c index a175980..91ab9e0 100644 --- a/src/intel_sio.c +++ b/src/devices/system/intel_sio.c @@ -8,7 +8,7 @@ * * Emulation of Intel System I/O PCI chip. * - * Version: @(#)intel_sio.c 1.0.1 2018/02/14 + * Version: @(#)intel_sio.c 1.0.2 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -40,10 +40,10 @@ #include #include #include -#include "cpu/cpu.h" -#include "io.h" +#include "../../cpu/cpu.h" +#include "../../io.h" +#include "../../mem.h" #include "dma.h" -#include "mem.h" #include "pci.h" #include "intel_sio.h" diff --git a/src/intel_sio.h b/src/devices/system/intel_sio.h similarity index 100% rename from src/intel_sio.h rename to src/devices/system/intel_sio.h diff --git a/src/mca.c b/src/devices/system/mca.c similarity index 97% rename from src/mca.c rename to src/devices/system/mca.c index cf6897e..1d59f76 100644 --- a/src/mca.c +++ b/src/devices/system/mca.c @@ -8,7 +8,7 @@ * * Implementation of the MCA bus primitives. * - * Version: @(#)mca.c 1.0.1 2018/02/14 + * Version: @(#)mca.c 1.0.2 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -40,7 +40,7 @@ #include #include #include -#include "io.h" +#include "../../io.h" #include "mca.h" diff --git a/src/mca.h b/src/devices/system/mca.h similarity index 100% rename from src/mca.h rename to src/devices/system/mca.h diff --git a/src/mcr.c b/src/devices/system/mcr.c similarity index 69% rename from src/mcr.c rename to src/devices/system/mcr.c index 7f54b6c..0ce7baa 100644 --- a/src/mcr.c +++ b/src/devices/system/mcr.c @@ -10,7 +10,7 @@ * This chip was used as part of many 386 chipsets. * It controls memory addressing and shadowing. * - * Version: @(#)mcr.c 1.0.1 2018/02/14 + * Version: @(#)mcr.c 1.0.2 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -42,36 +42,44 @@ #include #include #include -#include "emu.h" -#include "cpu/cpu.h" -#include "mem.h" +#include "../../emu.h" +#include "../../cpu/cpu.h" +#include "../../mem.h" -int nextreg6; -uint8_t mcr22; -int mcrlock,mcrfirst; +int nextreg6; +uint8_t mcr22; +int mcrlock, + mcrfirst; -void resetmcr(void) +void +resetmcr(void) { - mcrlock=0; - mcrfirst=1; - shadowbios=0; + mcrlock = 0; + mcrfirst = 1; + shadowbios = 0; } -void writemcr(uint16_t addr, uint8_t val) -{ - pclog("MCR: write %04X %02X %04X:%04X\n",addr,val,CS,cpu_state.pc); - switch (addr) - { - case 0x22: - if (val==6 && mcr22==6) nextreg6=1; - else nextreg6=0; - break; - case 0x23: - if (nextreg6) shadowbios=!val; - break; - } - mcr22=val; -} +void +writemcr(uint16_t addr, uint8_t val) +{ + pclog("MCR: write %04X %02X %04X:%04X\n",addr,val,CS,cpu_state.pc); + + switch (addr) { + case 0x22: + if (val == 6 && mcr22 == 6) + nextreg6 = 1; + else + nextreg6=0; + break; + + case 0x23: + if (nextreg6) + shadowbios = !val; + break; + } + + mcr22 = val; +} diff --git a/src/memregs.c b/src/devices/system/memregs.c similarity index 59% rename from src/memregs.c rename to src/devices/system/memregs.c index a384c79..e2f5520 100644 --- a/src/memregs.c +++ b/src/devices/system/memregs.c @@ -9,7 +9,7 @@ * Emulation of the memory I/O scratch registers on ports 0xE1 * and 0xE2, used by just about any emulated machine. * - * Version: @(#)memregs.c 1.0.1 2018/02/14 + * Version: @(#)memregs.c 1.0.2 2018/05/06 * * Author: Miran Grca, * @@ -37,47 +37,60 @@ #include #include #include -#include "emu.h" -#include "io.h" +#include "../../emu.h" +#include "../../io.h" #include "memregs.h" -static uint8_t mem_regs[16] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; - +static uint8_t mem_regs[16] = { + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff +}; static uint8_t mem_reg_ffff = 0; -void memregs_write(uint16_t port, uint8_t val, void *priv) +static void +memregs_write(uint16_t port, uint8_t val, void *priv) { - if (port == 0xffff) - { - mem_reg_ffff = 0; - } + if (port == 0xffff) + mem_reg_ffff = 0; - mem_regs[port & 0xf] = val; + mem_regs[port & 0xf] = val; } -uint8_t memregs_read(uint16_t port, void *priv) -{ - if (port == 0xffff) - { - return mem_reg_ffff; - } - return mem_regs[port & 0xf]; +static uint8_t +memregs_read(uint16_t port, void *priv) +{ + if (port == 0xffff) + return mem_reg_ffff; + + return mem_regs[port & 0xf]; } -void memregs_init(void) -{ - /* pclog("Memory Registers Init\n"); */ - io_sethandler(0x00e1, 0x0002, memregs_read, NULL, NULL, memregs_write, NULL, NULL, NULL); +void +memregs_init(void) +{ +#if 0 + pclog("Memory Registers Init\n"); +#endif + + io_sethandler(0x00e1, 2, + memregs_read,NULL,NULL, memregs_write,NULL,NULL, NULL); } -void powermate_memregs_init(void) -{ - /* pclog("Memory Registers Init\n"); */ - io_sethandler(0x00ed, 0x0002, memregs_read, NULL, NULL, memregs_write, NULL, NULL, NULL); - io_sethandler(0xffff, 0x0001, memregs_read, NULL, NULL, memregs_write, NULL, NULL, NULL); +void +powermate_memregs_init(void) +{ +#if 0 + pclog("Memory Registers Init\n"); +#endif + + io_sethandler(0x00ed, 2, + memregs_read,NULL,NULL, memregs_write,NULL,NULL, NULL); + + io_sethandler(0xffff, 1, + memregs_read,NULL,NULL, memregs_write,NULL,NULL, NULL); } diff --git a/src/memregs.h b/src/devices/system/memregs.h similarity index 100% rename from src/memregs.h rename to src/devices/system/memregs.h diff --git a/src/nmi.c b/src/devices/system/nmi.c similarity index 92% rename from src/nmi.c rename to src/devices/system/nmi.c index 2106ade..eb1f5cd 100644 --- a/src/nmi.c +++ b/src/devices/system/nmi.c @@ -8,7 +8,7 @@ * * Implementation of the NMI handler. * - * Version: @(#)nmi.c 1.0.1 2018/02/14 + * Version: @(#)nmi.c 1.0.2 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -40,15 +40,15 @@ #include #include #include -#include "io.h" +#include "../../io.h" #include "nmi.h" -int nmi_mask; +int nmi_mask; -void -nmi_write(uint16_t port, uint8_t val, void *p) +static void +nmi_write(uint16_t port, uint8_t val, void *priv) { nmi_mask = val & 0x80; } diff --git a/src/nmi.h b/src/devices/system/nmi.h similarity index 93% rename from src/nmi.h rename to src/devices/system/nmi.h index 5fe36e9..e6b3cea 100644 --- a/src/nmi.h +++ b/src/devices/system/nmi.h @@ -8,7 +8,7 @@ * * Definitions for the NMI handler. * - * Version: @(#)nmi.h 1.0.1 2018/02/14 + * Version: @(#)nmi.h 1.0.2 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -46,7 +46,7 @@ extern int nmi_auto_clear; extern void nmi_init(void); -extern void nmi_write(uint16_t port, uint8_t val, void *p); +//extern void nmi_write(uint16_t port, uint8_t val, void *p); #endif /*EMU_NMI_H*/ diff --git a/src/nvr_at.c b/src/devices/system/nvr_at.c similarity index 98% rename from src/nvr_at.c rename to src/devices/system/nvr_at.c index 4da9d59..654eaab 100644 --- a/src/nvr_at.c +++ b/src/devices/system/nvr_at.c @@ -189,7 +189,7 @@ * including the later update (DS12887A) which implemented a * "century" register to be compatible with Y2K. * - * Version: @(#)nvr_at.c 1.0.7 2018/04/28 + * Version: @(#)nvr_at.c 1.0.8 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -225,16 +225,16 @@ #include #include #include -#include "emu.h" -#include "cpu/cpu.h" -#include "machine/machine.h" -#include "io.h" +#include "../../emu.h" +#include "../../cpu/cpu.h" +#include "../../machines/machine.h" +#include "../../io.h" +#include "../../timer.h" +#include "../../device.h" +#include "../../nvr.h" #include "pic.h" #include "pit.h" #include "nmi.h" -#include "timer.h" -#include "device.h" -#include "nvr.h" /* RTC registers and bit definitions. */ diff --git a/src/nvr_ps2.c b/src/devices/system/nvr_ps2.c similarity index 94% rename from src/nvr_ps2.c rename to src/devices/system/nvr_ps2.c index d4b1780..8085d6e 100644 --- a/src/nvr_ps2.c +++ b/src/devices/system/nvr_ps2.c @@ -8,7 +8,7 @@ * * Handling of the PS/2 series CMOS devices. * - * Version: @(#)nvr_ps2.c 1.0.6 2018/03/31 + * Version: @(#)nvr_ps2.c 1.0.7 2018/05/06 * * Authors: Fred N. van Kempen, * Sarah Walker, @@ -39,13 +39,13 @@ #include #include #include -#include "emu.h" -#include "cpu/cpu.h" -#include "machine/machine.h" -#include "device.h" -#include "io.h" -#include "nvr.h" -#include "plat.h" +#include "../../emu.h" +#include "../../cpu/cpu.h" +#include "../../machines/machine.h" +#include "../../device.h" +#include "../../io.h" +#include "../../nvr.h" +#include "../../plat.h" #include "nvr_ps2.h" diff --git a/src/nvr_ps2.h b/src/devices/system/nvr_ps2.h similarity index 100% rename from src/nvr_ps2.h rename to src/devices/system/nvr_ps2.h diff --git a/src/pci.c b/src/devices/system/pci.c similarity index 98% rename from src/pci.c rename to src/devices/system/pci.c index 3b5ca02..4a5a404 100644 --- a/src/pci.c +++ b/src/devices/system/pci.c @@ -8,7 +8,7 @@ * * Implement the PCI bus. * - * Version: @(#)pci.c 1.0.4 2018/04/29 + * Version: @(#)pci.c 1.0.5 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -42,23 +42,21 @@ #include #include #define HAVE_STDARG_H -#include "emu.h" -#include "machine/machine.h" -#include "cpu/cpu.h" -#include "io.h" +#include "../../emu.h" +#include "../../machines/machine.h" +#include "../../cpu/cpu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../device.h" +#include "../input/keyboard.h" +#include "../disk/hdc.h" +#include "../disk/hdc_ide.h" +#include "../disk/zip.h" +#include "../cdrom/cdrom.h" #include "pic.h" #include "pci.h" -#include "mem.h" -#include "device.h" -#include "input/keyboard.h" -#include "disk/hdc.h" -#include "disk/hdc_ide.h" -#include "disk/zip.h" -#include "cdrom/cdrom.h" -static uint64_t pci_irq_hold[16]; - typedef struct { uint8_t id, type; @@ -68,6 +66,13 @@ typedef struct void * priv; } pci_card_t; +typedef struct +{ + uint8_t enabled; + uint8_t irq_line; +} pci_mirq_t; + + static pci_card_t pci_cards[32]; static uint8_t last_pci_card = 0; @@ -76,12 +81,7 @@ static uint8_t pci_card_to_slot_mapping[32]; static uint8_t elcr[2] = { 0, 0 }; static uint8_t pci_irqs[4]; - -typedef struct -{ - uint8_t enabled; - uint8_t irq_line; -} pci_mirq_t; +static uint64_t pci_irq_hold[16]; static pci_mirq_t pci_mirqs[2]; diff --git a/src/pci.h b/src/devices/system/pci.h similarity index 100% rename from src/pci.h rename to src/devices/system/pci.h diff --git a/src/pci_dummy.c b/src/devices/system/pci_dummy.c similarity index 98% rename from src/pci_dummy.c rename to src/devices/system/pci_dummy.c index 0c7a04d..0f57d05 100644 --- a/src/pci_dummy.c +++ b/src/devices/system/pci_dummy.c @@ -8,7 +8,7 @@ * * Example implementation of a PCI device. * - * Version: @(#)pci_dummy.c 1.0.2 2018/05/03 + * Version: @(#)pci_dummy.c 1.0.3 2018/05/06 * * Author: Miran Grca, * @@ -36,8 +36,8 @@ #include #include #include -#include "emu.h -#include "io.h" +#include "../../emu.h +#include "../../io.h" #include "pci.h" #include "pci_dummy.h" diff --git a/src/pci_dummy.h b/src/devices/system/pci_dummy.h similarity index 100% rename from src/pci_dummy.h rename to src/devices/system/pci_dummy.h diff --git a/src/pic.c b/src/devices/system/pic.c similarity index 90% rename from src/pic.c rename to src/devices/system/pic.c index 4e7ca94..69576cb 100644 --- a/src/pic.c +++ b/src/devices/system/pic.c @@ -8,7 +8,7 @@ * * Implementation of Intel 8259 interrupt controller. * - * Version: @(#)pic.c 1.0.1 2018/02/14 + * Version: @(#)pic.c 1.0.2 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -40,23 +40,23 @@ #include #include #include -#include "emu.h" -#include "machine/machine.h" -#include "io.h" +#include "../../emu.h" +#include "../../machines/machine.h" +#include "../../io.h" #include "pci.h" #include "pic.h" #include "pit.h" -int output; -int intclear; -int keywaiting=0; -int pic_intpending; -PIC pic, pic2; +int output; +int intclear; +int keywaiting=0; +int pic_intpending; +PIC pic, pic2; uint16_t pic_current; -void pic_updatepending() +void pic_updatepending(void) { uint16_t temp_pending = 0; if (AT) @@ -81,7 +81,7 @@ void pic_updatepending() } -void pic_reset() +void pic_reset(void) { pic.icw=0; pic.mask=0xFF; @@ -129,7 +129,7 @@ static int picint_is_level(uint16_t irq) } } -static void pic_autoeoi() +static void pic_autoeoi(void) { int c; @@ -160,7 +160,9 @@ static void pic_autoeoi() } } -void pic_write(uint16_t addr, uint8_t val, void *priv) + +static void +pic_write(uint16_t addr, uint8_t val, void *priv) { int c; if (addr&1) @@ -262,19 +264,25 @@ void pic_write(uint16_t addr, uint8_t val, void *priv) } } -uint8_t pic_read(uint16_t addr, void *priv) + +static uint8_t +pic_read(uint16_t addr, void *priv) { if (addr&1) { /*pclog("Read PIC mask %02X\n",pic.mask);*/ return pic.mask; } if (pic.read) { /*pclog("Read PIC ins %02X\n",pic.ins);*/ return pic.ins | (pic2.ins ? 4 : 0); } return pic.pend; } -void pic_init() + +void +pic_init(void) { - io_sethandler(0x0020, 0x0002, pic_read, NULL, NULL, pic_write, NULL, NULL, NULL); + io_sethandler(0x0020, 2, + pic_read,NULL,NULL, pic_write,NULL,NULL, NULL); } -static void pic2_autoeoi() + +static void pic2_autoeoi(void) { int c; @@ -297,7 +305,9 @@ static void pic2_autoeoi() } } -void pic2_write(uint16_t addr, uint8_t val, void *priv) + +static void +pic2_write(uint16_t addr, uint8_t val, void *priv) { int c; if (addr&1) @@ -380,7 +390,9 @@ void pic2_write(uint16_t addr, uint8_t val, void *priv) } } -uint8_t pic2_read(uint16_t addr, void *priv) + +static uint8_t +pic2_read(uint16_t addr, void *priv) { if (addr&1) { /*pclog("Read PIC2 mask %02X %04X:%08X\n",pic2.mask,CS,pc);*/ return pic2.mask; } if (pic2.read) { /*pclog("Read PIC2 ins %02X %04X:%08X\n",pic2.ins,CS,pc);*/ return pic2.ins; } @@ -388,19 +400,25 @@ uint8_t pic2_read(uint16_t addr, void *priv) return pic2.pend; } -void pic2_init() + +void +pic2_init(void) { - io_sethandler(0x00a0, 0x0002, pic2_read, NULL, NULL, pic2_write, NULL, NULL, NULL); + io_sethandler(0x00a0, 2, + pic2_read,NULL,NULL, pic2_write,NULL,NULL, NULL); } -void clearpic() +void +clearpic(void) { - pic_current=pic.pend=pic.ins=0; - pic_updatepending(); + pic_current=pic.pend=pic.ins=0; + pic_updatepending(); } -void picint_common(uint16_t num, int level) + +void +picint_common(uint16_t num, int level) { int c = 0; @@ -453,21 +471,27 @@ void picint_common(uint16_t num, int level) } } -void picint(uint16_t num) + +void +picint(uint16_t num) { - picint_common(num, 0); + picint_common(num, 0); } -void picintlevel(uint16_t num) + +void +picintlevel(uint16_t num) { - picint_common(num, 1); + picint_common(num, 1); } -void picintc(uint16_t num) -{ - int c = 0; - if (!num) +void +picintc(uint16_t num) +{ + int c = 0; + + if (!num) { /* pclog("Attempting to lower null IRQ\n"); */ return; @@ -513,6 +537,7 @@ void picintc(uint16_t num) pic_updatepending(); } + /* TODO: Verify this whole level-edge thing... edge/level mode is supposedly handled by bit 3 of ICW1, but the PIIX spec mandates it being able to be edge/level per IRQ... maybe the PCI-era on-board PIC ignores bit 3 of ICW1 but instead uses whatever is set in ELCR? @@ -562,7 +587,8 @@ static uint8_t pic_process_interrupt(PIC* target_pic, int c) } } -uint8_t picinterrupt() + +uint8_t picinterrupt(void) { int c, d; uint8_t ret; @@ -586,12 +612,12 @@ uint8_t picinterrupt() return 0xFF; } -void dumppic() -{ - pclog("PIC1 : MASK %02X PEND %02X INS %02X LEVEL %02X VECTOR %02X CASCADE %02X\n", pic.mask, pic.pend, pic.ins, (pic.icw1 & 8) ? 1 : 0, pic.vector, pic.icw3); - if (AT) - { - pclog("PIC2 : MASK %02X PEND %02X INS %02X LEVEL %02X VECTOR %02X CASCADE %02X\n", pic2.mask, pic2.pend, pic2.ins, (pic2.icw1 & 8) ? 1 : 0, pic2.vector, pic2.icw3); - } -} +void +dumppic(void) +{ + pclog("PIC1 : MASK %02X PEND %02X INS %02X LEVEL %02X VECTOR %02X CASCADE %02X\n", pic.mask, pic.pend, pic.ins, (pic.icw1 & 8) ? 1 : 0, pic.vector, pic.icw3); + if (AT) { + pclog("PIC2 : MASK %02X PEND %02X INS %02X LEVEL %02X VECTOR %02X CASCADE %02X\n", pic2.mask, pic2.pend, pic2.ins, (pic2.icw1 & 8) ? 1 : 0, pic2.vector, pic2.icw3); + } +} diff --git a/src/pic.h b/src/devices/system/pic.h similarity index 100% rename from src/pic.h rename to src/devices/system/pic.h diff --git a/src/pit.c b/src/devices/system/pit.c similarity index 98% rename from src/pit.c rename to src/devices/system/pit.c index ebe5ec7..094d32e 100644 --- a/src/pit.c +++ b/src/devices/system/pit.c @@ -8,7 +8,7 @@ * * Implement the PIT (Programmable Interval Timer.) * - * Version: @(#)pit.c 1.0.5 2018/05/04 + * Version: @(#)pit.c 1.0.6 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -40,20 +40,20 @@ #include #include #include -#include "emu.h" -#include "cpu/cpu.h" -#include "dma.h" -#include "io.h" +#include "../../emu.h" +#include "../../cpu/cpu.h" +#include "../../machines/machine.h" +#include "../../io.h" +#include "../../device.h" +#include "../../timer.h" +#include "../sound/sound.h" +#include "../sound/snd_speaker.h" +#include "../video/video.h" #include "nmi.h" +#include "dma.h" #include "pic.h" #include "pit.h" #include "ppi.h" -#include "device.h" -#include "timer.h" -#include "machine/machine.h" -#include "sound/sound.h" -#include "sound/snd_speaker.h" -#include "video/video.h" /*B0 to 40, two writes to 43, then two reads - value does not change!*/ diff --git a/src/pit.h b/src/devices/system/pit.h similarity index 100% rename from src/pit.h rename to src/devices/system/pit.h diff --git a/src/ppi.c b/src/devices/system/ppi.c similarity index 92% rename from src/ppi.c rename to src/devices/system/ppi.c index 19f44bc..4a32848 100644 --- a/src/ppi.c +++ b/src/devices/system/ppi.c @@ -14,7 +14,7 @@ * CX is loops between bit 4 of $62 changing * BX is timer difference between calls * - * Version: @(#)ppi.c 1.0.1 2018/02/14 + * Version: @(#)ppi.c 1.0.2 2018/05/06 * * Author: Sarah Walker, * @@ -46,12 +46,13 @@ #include "ppi.h" -PPI ppi; -int ppispeakon; +PPI ppi; +int ppispeakon; -void ppi_reset(void) +void +ppi_reset(void) { - ppi.pa=0x0; - ppi.pb=0x40; + ppi.pa = 0x0; + ppi.pb = 0x40; } diff --git a/src/ppi.h b/src/devices/system/ppi.h similarity index 100% rename from src/ppi.h rename to src/devices/system/ppi.h diff --git a/src/video/vid_ati18800.c b/src/devices/video/vid_ati18800.c similarity index 98% rename from src/video/vid_ati18800.c rename to src/devices/video/vid_ati18800.c index 86ed08d..bf5e4af 100644 --- a/src/video/vid_ati18800.c +++ b/src/devices/video/vid_ati18800.c @@ -8,7 +8,7 @@ * * ATI 18800 emulation (VGA Edge-16) * - * Version: @(#)vid_ati18800.c 1.0.7 2018/04/09 + * Version: @(#)vid_ati18800.c 1.0.8 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,12 +41,12 @@ #include #include #include -#include "../emu.h" -#include "../cpu/cpu.h" -#include "../io.h" -#include "../mem.h" -#include "../rom.h" -#include "../device.h" +#include "../../emu.h" +#include "../../cpu/cpu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../device.h" #include "video.h" #include "vid_svga.h" #include "vid_svga_render.h" diff --git a/src/video/vid_ati28800.c b/src/devices/video/vid_ati28800.c similarity index 98% rename from src/video/vid_ati28800.c rename to src/devices/video/vid_ati28800.c index 873c73f..ac0d1dd 100644 --- a/src/video/vid_ati28800.c +++ b/src/devices/video/vid_ati28800.c @@ -8,7 +8,7 @@ * * ATI 28800 emulation (VGA Charger and Korean VGA) * - * Version: @(#)vid_ati28800.c 1.0.12 2018/04/09 + * Version: @(#)vid_ati28800.c 1.0.13 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -42,14 +42,14 @@ #include #include #include -#include "../emu.h" -#include "../cpu/cpu.h" -#include "../io.h" -#include "../pit.h" -#include "../mem.h" -#include "../rom.h" -#include "../device.h" -#include "../timer.h" +#include "../../emu.h" +#include "../../cpu/cpu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../timer.h" +#include "../../device.h" +#include "../system/pit.h" #include "video.h" #include "vid_svga.h" #include "vid_svga_render.h" diff --git a/src/video/vid_ati68860_ramdac.c b/src/devices/video/vid_ati68860_ramdac.c similarity index 98% rename from src/video/vid_ati68860_ramdac.c rename to src/devices/video/vid_ati68860_ramdac.c index ee85a1e..0b76ac7 100644 --- a/src/video/vid_ati68860_ramdac.c +++ b/src/devices/video/vid_ati68860_ramdac.c @@ -28,7 +28,7 @@ * 7 If set can remove "snow" in some cases * (A860_Delay_L ?) ?? * - * Version: @(#)vid_ati68860.c 1.0.2 2018/04/09 + * Version: @(#)vid_ati68860.c 1.0.3 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -60,8 +60,8 @@ #include #include #include -#include "../emu.h" -#include "../mem.h" +#include "../../emu.h" +#include "../../mem.h" #include "video.h" #include "vid_svga.h" #include "vid_svga_render.h" diff --git a/src/video/vid_ati68860_ramdac.h b/src/devices/video/vid_ati68860_ramdac.h similarity index 100% rename from src/video/vid_ati68860_ramdac.h rename to src/devices/video/vid_ati68860_ramdac.h diff --git a/src/video/vid_ati_eeprom.c b/src/devices/video/vid_ati_eeprom.c similarity index 98% rename from src/video/vid_ati_eeprom.c rename to src/devices/video/vid_ati_eeprom.c index 0f71671..a6a53ba 100644 --- a/src/video/vid_ati_eeprom.c +++ b/src/devices/video/vid_ati_eeprom.c @@ -8,7 +8,7 @@ * * Emulation of the EEPROM on select ATI cards. * - * Version: @(#)vid_ati_eeprom.c 1.0.2 2018/03/31 + * Version: @(#)vid_ati_eeprom.c 1.0.3 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -40,10 +40,10 @@ #include #include #include -#include "../emu.h" -#include "../mem.h" -#include "../nvr.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../mem.h" +#include "../../nvr.h" +#include "../../plat.h" #include "vid_ati_eeprom.h" diff --git a/src/video/vid_ati_eeprom.h b/src/devices/video/vid_ati_eeprom.h similarity index 100% rename from src/video/vid_ati_eeprom.h rename to src/devices/video/vid_ati_eeprom.h diff --git a/src/video/vid_ati_mach64.c b/src/devices/video/vid_ati_mach64.c similarity index 99% rename from src/video/vid_ati_mach64.c rename to src/devices/video/vid_ati_mach64.c index e4643b8..293ce11 100644 --- a/src/video/vid_ati_mach64.c +++ b/src/devices/video/vid_ati_mach64.c @@ -8,7 +8,7 @@ * * ATi Mach64 graphics card emulation. * - * Version: @(#)vid_ati_mach64.c 1.0.11 2018/05/04 + * Version: @(#)vid_ati_mach64.c 1.0.12 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,14 +41,14 @@ #include #include #include -#include "../emu.h" -#include "../machine/machine.h" -#include "../device.h" -#include "../io.h" -#include "../mem.h" -#include "../pci.h" -#include "../rom.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../machines/machine.h" +#include "../../device.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../plat.h" +#include "../system/pci.h" #include "video.h" #include "vid_svga.h" #include "vid_svga_render.h" diff --git a/src/video/vid_bt485_ramdac.c b/src/devices/video/vid_bt485_ramdac.c similarity index 98% rename from src/video/vid_bt485_ramdac.c rename to src/devices/video/vid_bt485_ramdac.c index 1fc9f20..c18b0c8 100644 --- a/src/video/vid_bt485_ramdac.c +++ b/src/devices/video/vid_bt485_ramdac.c @@ -11,7 +11,7 @@ * Currently only a dummy stub for logging and passing output * to the generic SVGA handler. * - * Version: @(#)vid_bt485_ramdac.c 1.0.2 2018/03/08 + * Version: @(#)vid_bt485_ramdac.c 1.0.3 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -43,8 +43,8 @@ #include #include #include -#include "../emu.h" -#include "../mem.h" +#include "../../emu.h" +#include "../../mem.h" #include "video.h" #include "vid_svga.h" #include "vid_bt485_ramdac.h" diff --git a/src/video/vid_bt485_ramdac.h b/src/devices/video/vid_bt485_ramdac.h similarity index 100% rename from src/video/vid_bt485_ramdac.h rename to src/devices/video/vid_bt485_ramdac.h diff --git a/src/video/vid_cga.c b/src/devices/video/vid_cga.c similarity index 99% rename from src/video/vid_cga.c rename to src/devices/video/vid_cga.c index a42f753..edd2a6f 100644 --- a/src/video/vid_cga.c +++ b/src/devices/video/vid_cga.c @@ -8,7 +8,7 @@ * * Emulation of the old and new IBM CGA graphics cards. * - * Version: @(#)vid_cga.c 1.0.3 2018/04/03 + * Version: @(#)vid_cga.c 1.0.4 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -42,14 +42,14 @@ #include #include #include -#include "../emu.h" -#include "../cpu/cpu.h" -#include "../io.h" -#include "../pit.h" -#include "../mem.h" -#include "../rom.h" -#include "../timer.h" -#include "../device.h" +#include "../../emu.h" +#include "../../cpu/cpu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../timer.h" +#include "../../device.h" +#include "../system/pit.h" #include "video.h" #include "vid_cga.h" #include "vid_cga_comp.h" diff --git a/src/video/vid_cga.h b/src/devices/video/vid_cga.h similarity index 100% rename from src/video/vid_cga.h rename to src/devices/video/vid_cga.h diff --git a/src/video/vid_cga_comp.c b/src/devices/video/vid_cga_comp.c similarity index 98% rename from src/video/vid_cga_comp.c rename to src/devices/video/vid_cga_comp.c index 51a9f6b..82e6160 100644 --- a/src/video/vid_cga_comp.c +++ b/src/devices/video/vid_cga_comp.c @@ -9,7 +9,7 @@ * IBM CGA composite filter, borrowed from reenigne's DOSBox * patch and ported to C. * - * Version: @(#)vid_cga_comp.c 1.0.3 2018/05/04 + * Version: @(#)vid_cga_comp.c 1.0.4 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -42,9 +42,9 @@ #include #include #include -#include "../emu.h" -#include "../device.h" -#include "../mem.h" +#include "../../emu.h" +#include "../../mem.h" +#include "../../device.h" #include "vid_cga.h" #include "vid_cga_comp.h" diff --git a/src/video/vid_cga_comp.h b/src/devices/video/vid_cga_comp.h similarity index 100% rename from src/video/vid_cga_comp.h rename to src/devices/video/vid_cga_comp.h diff --git a/src/video/vid_cl54xx.c b/src/devices/video/vid_cl54xx.c similarity index 99% rename from src/video/vid_cl54xx.c rename to src/devices/video/vid_cl54xx.c index 0bfbd04..0004799 100644 --- a/src/video/vid_cl54xx.c +++ b/src/devices/video/vid_cl54xx.c @@ -9,7 +9,7 @@ * Emulation of select Cirrus Logic cards (CL-GD 5428, * CL-GD 5429, 5430, 5434 and 5436 are supported). * - * Version: @(#)vid_cl54xx.c 1.0.16 2018/05/04 + * Version: @(#)vid_cl54xx.c 1.0.17 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -46,13 +46,13 @@ #include #include #include -#include "../emu.h" -#include "../cpu/cpu.h" -#include "../io.h" -#include "../mem.h" -#include "../pci.h" -#include "../rom.h" -#include "../device.h" +#include "../../emu.h" +#include "../../cpu/cpu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../device.h" +#include "../system/pci.h" #include "video.h" #include "vid_svga.h" #include "vid_svga_render.h" diff --git a/src/video/vid_colorplus.c b/src/devices/video/vid_colorplus.c similarity index 98% rename from src/video/vid_colorplus.c rename to src/devices/video/vid_colorplus.c index 1ae2c59..7bda2c3 100644 --- a/src/video/vid_colorplus.c +++ b/src/devices/video/vid_colorplus.c @@ -8,7 +8,7 @@ * * Plantronics ColorPlus emulation. * - * Version: @(#)vid_colorplus.c 1.0.6 2018/04/26 + * Version: @(#)vid_colorplus.c 1.0.7 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -42,13 +42,13 @@ #include #include #include -#include "../emu.h" -#include "../cpu/cpu.h" -#include "../io.h" -#include "../pit.h" -#include "../mem.h" -#include "../timer.h" -#include "../device.h" +#include "../../emu.h" +#include "../../cpu/cpu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../timer.h" +#include "../../device.h" +#include "../system/pit.h" #include "../ports/parallel.h" #include "video.h" #include "vid_cga.h" diff --git a/src/video/vid_compaq_cga.c b/src/devices/video/vid_compaq_cga.c similarity index 98% rename from src/video/vid_compaq_cga.c rename to src/devices/video/vid_compaq_cga.c index 863810e..132c98e 100644 --- a/src/video/vid_compaq_cga.c +++ b/src/devices/video/vid_compaq_cga.c @@ -8,7 +8,7 @@ * * Implementation of CGA used by Compaq PC's. * - * Version: @(#)vid_cga_compaq.c 1.0.3 2018/04/09 + * Version: @(#)vid_cga_compaq.c 1.0.4 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,14 +41,14 @@ #include #include #include -#include "../emu.h" -#include "../cpu/cpu.h" -#include "../io.h" -#include "../pit.h" -#include "../mem.h" -#include "../rom.h" -#include "../timer.h" -#include "../device.h" +#include "../../emu.h" +#include "../../cpu/cpu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../timer.h" +#include "../../device.h" +#include "../system/pit.h" #include "video.h" #include "vid_cga.h" #include "vid_cga_comp.h" diff --git a/src/video/vid_ega.c b/src/devices/video/vid_ega.c similarity index 99% rename from src/video/vid_ega.c rename to src/devices/video/vid_ega.c index 02b64ab..414a09a 100644 --- a/src/video/vid_ega.c +++ b/src/devices/video/vid_ega.c @@ -9,7 +9,7 @@ * Emulation of the EGA, Chips & Technologies SuperEGA, and * AX JEGA graphics cards. * - * Version: @(#)vid_ega.c 1.0.7 2018/04/14 + * Version: @(#)vid_ega.c 1.0.8 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -42,14 +42,14 @@ #include #include #include -#include "../emu.h" -#include "../cpu/cpu.h" -#include "../io.h" -#include "../pit.h" -#include "../mem.h" -#include "../rom.h" -#include "../timer.h" -#include "../device.h" +#include "../../emu.h" +#include "../../cpu/cpu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../timer.h" +#include "../../device.h" +#include "../system/pit.h" #include "video.h" #include "vid_ega.h" #include "vid_ega_render.h" diff --git a/src/video/vid_ega.h b/src/devices/video/vid_ega.h similarity index 100% rename from src/video/vid_ega.h rename to src/devices/video/vid_ega.h diff --git a/src/video/vid_ega_render.c b/src/devices/video/vid_ega_render.c similarity index 99% rename from src/video/vid_ega_render.c rename to src/devices/video/vid_ega_render.c index 0349de3..d091804 100644 --- a/src/video/vid_ega_render.c +++ b/src/devices/video/vid_ega_render.c @@ -9,7 +9,7 @@ * EGA renderers. * NOTE: FIXME: make sure this works (line 99 shadow parameter) * - * Version: @(#)vid_ega_render.c 1.0.2 2018/05/04 + * Version: @(#)vid_ega_render.c 1.0.3 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,10 +41,10 @@ #include #include #include -#include "../emu.h" -#include "../device.h" -#include "../mem.h" -#include "../rom.h" +#include "../../emu.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../device.h" #include "video.h" #include "vid_ega.h" #include "vid_ega_render.h" diff --git a/src/video/vid_ega_render.h b/src/devices/video/vid_ega_render.h similarity index 100% rename from src/video/vid_ega_render.h rename to src/devices/video/vid_ega_render.h diff --git a/src/video/vid_et4000.c b/src/devices/video/vid_et4000.c similarity index 97% rename from src/video/vid_et4000.c rename to src/devices/video/vid_et4000.c index 107ab3d..f2a89b0 100644 --- a/src/video/vid_et4000.c +++ b/src/devices/video/vid_et4000.c @@ -8,7 +8,7 @@ * * Emulation of the Tseng Labs ET4000. * - * Version: @(#)vid_et4000.c 1.0.6 2018/04/09 + * Version: @(#)vid_et4000.c 1.0.7 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,11 +41,11 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../mem.h" -#include "../rom.h" -#include "../device.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../device.h" #include "video.h" #include "vid_svga.h" #include "vid_sc1502x_ramdac.h" diff --git a/src/video/vid_et4000w32.c b/src/devices/video/vid_et4000w32.c similarity index 99% rename from src/video/vid_et4000w32.c rename to src/devices/video/vid_et4000w32.c index e107da9..5f237bd 100644 --- a/src/video/vid_et4000w32.c +++ b/src/devices/video/vid_et4000w32.c @@ -10,7 +10,7 @@ * * Known bugs: Accelerator doesn't work in planar modes * - * Version: @(#)vid_et4000w32.c 1.0.9 2018/05/04 + * Version: @(#)vid_et4000w32.c 1.0.10 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -43,14 +43,14 @@ #include #include #include -#include "../emu.h" -#include "../cpu/cpu.h" -#include "../io.h" -#include "../mem.h" -#include "../pci.h" -#include "../rom.h" -#include "../device.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../cpu/cpu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../device.h" +#include "../../plat.h" +#include "../system/pci.h" #include "video.h" #include "vid_svga.h" #if defined(DEV_BRANCH) && defined(USE_STEALTH32) diff --git a/src/video/vid_et4000w32i.c b/src/devices/video/vid_et4000w32i.c similarity index 99% rename from src/video/vid_et4000w32i.c rename to src/devices/video/vid_et4000w32i.c index 10638f2..abd7443 100644 --- a/src/video/vid_et4000w32i.c +++ b/src/devices/video/vid_et4000w32i.c @@ -14,7 +14,7 @@ * * This might be of use for an attempt at an ET4000/W32i. * - * Version: @(#)vid_et4000w32i.c 1.0.1 2018/02/14 + * Version: @(#)vid_et4000w32i.c 1.0.2 2018/05/06 * * Author: Sarah Walker, * @@ -42,7 +42,7 @@ #include #include #include -#include "../emu.h" +#include "../../emu.h" int et4k_b8000; diff --git a/src/video/vid_genius.c b/src/devices/video/vid_genius.c similarity index 98% rename from src/video/vid_genius.c rename to src/devices/video/vid_genius.c index d29106f..bb86e4b 100644 --- a/src/video/vid_genius.c +++ b/src/devices/video/vid_genius.c @@ -63,7 +63,7 @@ * reducing the height of characters so they fit in an 8x12 cell * if necessary. * - * Version: @(#)vid_genius.c 1.0.5 2018/04/09 + * Version: @(#)vid_genius.c 1.0.6 2018/04/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -96,14 +96,14 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../pit.h" -#include "../mem.h" -#include "../rom.h" -#include "../timer.h" -#include "../device.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../timer.h" +#include "../../device.h" +#include "../../plat.h" +#include "../system/pit.h" #include "video.h" diff --git a/src/video/vid_hercules.c b/src/devices/video/vid_hercules.c similarity index 98% rename from src/video/vid_hercules.c rename to src/devices/video/vid_hercules.c index c2eb6cd..050ddd4 100644 --- a/src/video/vid_hercules.c +++ b/src/devices/video/vid_hercules.c @@ -8,7 +8,7 @@ * * Hercules emulation. * - * Version: @(#)vid_hercules.c 1.0.5 2018/04/26 + * Version: @(#)vid_hercules.c 1.0.6 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,13 +41,13 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../pit.h" -#include "../mem.h" -#include "../rom.h" -#include "../timer.h" -#include "../device.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../timer.h" +#include "../../device.h" +#include "../system/pit.h" #include "../ports/parallel.h" #include "video.h" diff --git a/src/video/vid_herculesplus.c b/src/devices/video/vid_herculesplus.c similarity index 99% rename from src/video/vid_herculesplus.c rename to src/devices/video/vid_herculesplus.c index 49c0f32..aca4ec6 100644 --- a/src/video/vid_herculesplus.c +++ b/src/devices/video/vid_herculesplus.c @@ -8,7 +8,7 @@ * * Hercules InColor emulation. * - * Version: @(#)vid_hercules_plus.c 1.0.7 2018/04/26 + * Version: @(#)vid_hercules_plus.c 1.0.8 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,13 +41,13 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../pit.h" -#include "../mem.h" -#include "../rom.h" -#include "../timer.h" -#include "../device.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../timer.h" +#include "../../device.h" +#include "../system/pit.h" #include "../ports/parallel.h" #include "video.h" diff --git a/src/video/vid_icd2061.c b/src/devices/video/vid_icd2061.c similarity index 98% rename from src/video/vid_icd2061.c rename to src/devices/video/vid_icd2061.c index 2c33fb5..9f9b50e 100644 --- a/src/video/vid_icd2061.c +++ b/src/devices/video/vid_icd2061.c @@ -10,7 +10,7 @@ * * Used by ET4000w32/p (Diamond Stealth 32) * - * Version: @(#)vid_icd2061.c 1.0.1 2018/02/14 + * Version: @(#)vid_icd2061.c 1.0.2 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -42,7 +42,7 @@ #include #include #include -#include "../emu.h" +#include "../../emu.h" #include "vid_icd2061.h" diff --git a/src/video/vid_icd2061.h b/src/devices/video/vid_icd2061.h similarity index 100% rename from src/video/vid_icd2061.h rename to src/devices/video/vid_icd2061.h diff --git a/src/video/vid_ics2595.c b/src/devices/video/vid_ics2595.c similarity index 97% rename from src/video/vid_ics2595.c rename to src/devices/video/vid_ics2595.c index f545e80..1d31c5c 100644 --- a/src/video/vid_ics2595.c +++ b/src/devices/video/vid_ics2595.c @@ -8,7 +8,7 @@ * * ICS2595 clock chip emulation. Used by ATI Mach64. * - * Version: @(#)vid_ics2595.c 1.0.1 2018/02/14 + * Version: @(#)vid_ics2595.c 1.0.2 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -40,7 +40,7 @@ #include #include #include -#include "../emu.h" +#include "../../emu.h" #include "vid_ics2595.h" diff --git a/src/video/vid_ics2595.h b/src/devices/video/vid_ics2595.h similarity index 100% rename from src/video/vid_ics2595.h rename to src/devices/video/vid_ics2595.h diff --git a/src/video/vid_incolor.c b/src/devices/video/vid_incolor.c similarity index 99% rename from src/video/vid_incolor.c rename to src/devices/video/vid_incolor.c index 9005804..3402d94 100644 --- a/src/video/vid_incolor.c +++ b/src/devices/video/vid_incolor.c @@ -8,7 +8,7 @@ * * Hercules InColor emulation. * - * Version: @(#)vid_incolor.c 1.0.7 2018/04/26 + * Version: @(#)vid_incolor.c 1.0.8 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,13 +41,13 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../pit.h" -#include "../mem.h" -#include "../rom.h" -#include "../timer.h" -#include "../device.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../timer.h" +#include "../../device.h" +#include "../system/pit.h" #include "../ports/parallel.h" #include "video.h" diff --git a/src/video/vid_mda.c b/src/devices/video/vid_mda.c similarity index 98% rename from src/video/vid_mda.c rename to src/devices/video/vid_mda.c index b4bf970..0098e8e 100644 --- a/src/video/vid_mda.c +++ b/src/devices/video/vid_mda.c @@ -8,7 +8,7 @@ * * MDA emulation. * - * Version: @(#)vid_mda.c 1.0.6 2018/04/26 + * Version: @(#)vid_mda.c 1.0.7 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,13 +41,13 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../pit.h" -#include "../mem.h" -#include "../rom.h" -#include "../timer.h" -#include "../device.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../timer.h" +#include "../../device.h" +#include "../system/pit.h" #include "../ports/parallel.h" #include "video.h" diff --git a/src/video/vid_oak_oti.c b/src/devices/video/vid_oak_oti.c similarity index 98% rename from src/video/vid_oak_oti.c rename to src/devices/video/vid_oak_oti.c index f191c77..0436fde 100644 --- a/src/video/vid_oak_oti.c +++ b/src/devices/video/vid_oak_oti.c @@ -8,7 +8,7 @@ * * Oak OTI037C/67/077 emulation. * - * Version: @(#)vid_oak_oti.c 1.0.9 2018/04/09 + * Version: @(#)vid_oak_oti.c 1.0.10 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,11 +41,11 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../mem.h" -#include "../rom.h" -#include "../device.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../device.h" #include "video.h" #include "vid_svga.h" diff --git a/src/video/vid_paradise.c b/src/devices/video/vid_paradise.c similarity index 99% rename from src/video/vid_paradise.c rename to src/devices/video/vid_paradise.c index 2ef0859..e4912f7 100644 --- a/src/video/vid_paradise.c +++ b/src/devices/video/vid_paradise.c @@ -13,7 +13,7 @@ * NOTE: The MegaPC video device should be moved to the MegaPC * machine file. * - * Version: @(#)vid_paradise.c 1.0.5 2018/04/09 + * Version: @(#)vid_paradise.c 1.0.6 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -46,11 +46,11 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../mem.h" -#include "../rom.h" -#include "../device.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../device.h" #include "video.h" #include "vid_svga.h" #include "vid_svga_render.h" diff --git a/src/video/vid_s3.c b/src/devices/video/vid_s3.c similarity index 99% rename from src/video/vid_s3.c rename to src/devices/video/vid_s3.c index 0319f17..b6f0a06 100644 --- a/src/video/vid_s3.c +++ b/src/devices/video/vid_s3.c @@ -10,7 +10,7 @@ * * NOTE: ROM images need more/better organization per chipset. * - * Version: @(#)vid_s3.c 1.0.9 2018/05/04 + * Version: @(#)vid_s3.c 1.0.10 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -43,13 +43,13 @@ #include #include #include -#include "../emu.h" -#include "../device.h" -#include "../io.h" -#include "../mem.h" -#include "../pci.h" -#include "../rom.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../device.h" +#include "../../plat.h" +#include "../system/pci.h" #include "video.h" #include "vid_svga.h" #include "vid_svga_render.h" diff --git a/src/video/vid_s3_virge.c b/src/devices/video/vid_s3_virge.c similarity index 99% rename from src/video/vid_s3_virge.c rename to src/devices/video/vid_s3_virge.c index 8b01148..04c0355 100644 --- a/src/video/vid_s3_virge.c +++ b/src/devices/video/vid_s3_virge.c @@ -8,7 +8,7 @@ * * S3 ViRGE emulation. * - * Version: @(#)vid_s3_virge.c 1.0.10 2018/05/04 + * Version: @(#)vid_s3_virge.c 1.0.11 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,13 +41,13 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../mem.h" -#include "../pci.h" -#include "../rom.h" -#include "../device.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../device.h" +#include "../../plat.h" +#include "../system/pci.h" #include "video.h" #include "vid_svga.h" #include "vid_svga_render.h" diff --git a/src/video/vid_sc1502x_ramdac.c b/src/devices/video/vid_sc1502x_ramdac.c similarity index 97% rename from src/video/vid_sc1502x_ramdac.c rename to src/devices/video/vid_sc1502x_ramdac.c index 7464ad3..6ba94ec 100644 --- a/src/video/vid_sc1502x_ramdac.c +++ b/src/devices/video/vid_sc1502x_ramdac.c @@ -10,7 +10,7 @@ * * Used by the TLIVESA1 driver for ET4000. * - * Version: @(#)vid_sc1502x_ramdac.c 1.0.1 2018/02/14 + * Version: @(#)vid_sc1502x_ramdac.c 1.0.2 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -42,8 +42,8 @@ #include #include #include -#include "../emu.h" -#include "../mem.h" +#include "../../emu.h" +#include "../../mem.h" #include "video.h" #include "vid_svga.h" #include "vid_sc1502x_ramdac.h" diff --git a/src/video/vid_sc1502x_ramdac.h b/src/devices/video/vid_sc1502x_ramdac.h similarity index 100% rename from src/video/vid_sc1502x_ramdac.h rename to src/devices/video/vid_sc1502x_ramdac.h diff --git a/src/video/vid_sdac_ramdac.c b/src/devices/video/vid_sdac_ramdac.c similarity index 98% rename from src/video/vid_sdac_ramdac.c rename to src/devices/video/vid_sdac_ramdac.c index 8d6efad..e77a0d1 100644 --- a/src/video/vid_sdac_ramdac.c +++ b/src/devices/video/vid_sdac_ramdac.c @@ -10,7 +10,7 @@ * * Misidentifies as AT&T 21C504. * - * Version: @(#)vid_sdac_ramdac.c 1.0.3 2018/03/21 + * Version: @(#)vid_sdac_ramdac.c 1.0.4 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -42,8 +42,8 @@ #include #include #include -#include "../emu.h" -#include "../mem.h" +#include "../../emu.h" +#include "../../mem.h" #include "video.h" #include "vid_svga.h" #include "vid_sdac_ramdac.h" diff --git a/src/video/vid_sdac_ramdac.h b/src/devices/video/vid_sdac_ramdac.h similarity index 100% rename from src/video/vid_sdac_ramdac.h rename to src/devices/video/vid_sdac_ramdac.h diff --git a/src/video/vid_stg_ramdac.c b/src/devices/video/vid_stg_ramdac.c similarity index 98% rename from src/video/vid_stg_ramdac.c rename to src/devices/video/vid_stg_ramdac.c index e6107e3..6190d1e 100644 --- a/src/video/vid_stg_ramdac.c +++ b/src/devices/video/vid_stg_ramdac.c @@ -8,7 +8,7 @@ * * STG1702 true color RAMDAC emulation. * - * Version: @(#)vid_stg_ramdac.c 1.0.2 2018/03/08 + * Version: @(#)vid_stg_ramdac.c 1.0.3 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -40,8 +40,8 @@ #include #include #include -#include "../emu.h" -#include "../mem.h" +#include "../../emu.h" +#include "../../mem.h" #include "video.h" #include "vid_svga.h" #include "vid_stg_ramdac.h" diff --git a/src/video/vid_stg_ramdac.h b/src/devices/video/vid_stg_ramdac.h similarity index 100% rename from src/video/vid_stg_ramdac.h rename to src/devices/video/vid_stg_ramdac.h diff --git a/src/video/vid_svga.c b/src/devices/video/vid_svga.c similarity index 99% rename from src/video/vid_svga.c rename to src/devices/video/vid_svga.c index 89ac9b1..6b78bb6 100644 --- a/src/video/vid_svga.c +++ b/src/devices/video/vid_svga.c @@ -11,7 +11,7 @@ * This is intended to be used by another SVGA driver, * and not as a card in it's own right. * - * Version: @(#)vid_svga.c 1.0.9 2018/04/07 + * Version: @(#)vid_svga.c 1.0.10 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -45,14 +45,14 @@ #include #include #include -#include "../emu.h" -#include "../cpu/cpu.h" -#include "../machine/machine.h" -#include "../io.h" -#include "../pit.h" -#include "../mem.h" -#include "../rom.h" -#include "../timer.h" +#include "../../emu.h" +#include "../../cpu/cpu.h" +#include "../../machines/machine.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../timer.h" +#include "../system/pit.h" #include "video.h" #include "vid_svga.h" #include "vid_svga_render.h" diff --git a/src/video/vid_svga.h b/src/devices/video/vid_svga.h similarity index 100% rename from src/video/vid_svga.h rename to src/devices/video/vid_svga.h diff --git a/src/video/vid_svga_render.c b/src/devices/video/vid_svga_render.c similarity index 99% rename from src/video/vid_svga_render.c rename to src/devices/video/vid_svga_render.c index d8b2355..b4bb7e5 100644 --- a/src/video/vid_svga_render.c +++ b/src/devices/video/vid_svga_render.c @@ -8,7 +8,7 @@ * * SVGA renderers. * - * Version: @(#)vid_svga_render.c 1.0.9 2018/04/14 + * Version: @(#)vid_svga_render.c 1.0.10 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -40,8 +40,8 @@ #include #include #include -#include "../emu.h" -#include "../mem.h" +#include "../../emu.h" +#include "../../mem.h" #include "video.h" #include "vid_svga.h" #include "vid_svga_render.h" diff --git a/src/video/vid_svga_render.h b/src/devices/video/vid_svga_render.h similarity index 100% rename from src/video/vid_svga_render.h rename to src/devices/video/vid_svga_render.h diff --git a/src/video/vid_tgui9440.c b/src/devices/video/vid_tgui9440.c similarity index 99% rename from src/video/vid_tgui9440.c rename to src/devices/video/vid_tgui9440.c index 3f7c02c..c370576 100644 --- a/src/video/vid_tgui9440.c +++ b/src/devices/video/vid_tgui9440.c @@ -47,7 +47,7 @@ * access size or host data has any affect, but the Windows 3.1 * driver always reads bytes and write words of 0xffff. * - * Version: @(#)vid_tgui9440.c 1.0.7 2018/05/04 + * Version: @(#)vid_tgui9440.c 1.0.8 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -80,14 +80,14 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../mem.h" -#include "../pci.h" -#include "../rom.h" -#include "../device.h" -#include "../cpu/cpu.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../cpu/cpu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../device.h" +#include "../../plat.h" +#include "../system/pci.h" #include "video.h" #include "vid_svga.h" #include "vid_svga_render.h" diff --git a/src/video/vid_ti_cf62011.c b/src/devices/video/vid_ti_cf62011.c similarity index 97% rename from src/video/vid_ti_cf62011.c rename to src/devices/video/vid_ti_cf62011.c index 02ec9f0..8a35ef0 100644 --- a/src/video/vid_ti_cf62011.c +++ b/src/devices/video/vid_ti_cf62011.c @@ -42,7 +42,7 @@ * which are the same as the XGA. It supports up to 1MB of VRAM, * but we lock it down to 512K. The PS/1 2122 had 256K. * - * Version: @(#)vid_ti_cf62011.c 1.0.3 2018/04/09 + * Version: @(#)vid_ti_cf62011.c 1.0.4 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -75,12 +75,12 @@ #include #include #include -#include "../emu.h" -#include "../config.h" -#include "../io.h" -#include "../mem.h" -#include "../rom.h" -#include "../device.h" +#include "../../emu.h" +#include "../../config.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../device.h" #include "video.h" #include "vid_svga.h" diff --git a/src/video/vid_tkd8001_ramdac.c b/src/devices/video/vid_tkd8001_ramdac.c similarity index 96% rename from src/video/vid_tkd8001_ramdac.c rename to src/devices/video/vid_tkd8001_ramdac.c index 4d8149d..40d6a13 100644 --- a/src/video/vid_tkd8001_ramdac.c +++ b/src/devices/video/vid_tkd8001_ramdac.c @@ -8,7 +8,7 @@ * * Trident TKD8001 RAMDAC emulation. * - * Version: @(#)vid_tkd8001_ramdac.c 1.0.1 2018/02/14 + * Version: @(#)vid_tkd8001_ramdac.c 1.0.2 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -40,8 +40,8 @@ #include #include #include -#include "../emu.h" -#include "../mem.h" +#include "../../emu.h" +#include "../../mem.h" #include "video.h" #include "vid_svga.h" #include "vid_tkd8001_ramdac.h" diff --git a/src/video/vid_tkd8001_ramdac.h b/src/devices/video/vid_tkd8001_ramdac.h similarity index 100% rename from src/video/vid_tkd8001_ramdac.h rename to src/devices/video/vid_tkd8001_ramdac.h diff --git a/src/video/vid_tvga.c b/src/devices/video/vid_tvga.c similarity index 98% rename from src/video/vid_tvga.c rename to src/devices/video/vid_tvga.c index 75ac5e7..149745a 100644 --- a/src/video/vid_tvga.c +++ b/src/devices/video/vid_tvga.c @@ -8,7 +8,7 @@ * * Trident TVGA (8900D) emulation. * - * Version: @(#)vid_tvga.c 1.0.6 2018/04/09 + * Version: @(#)vid_tvga.c 1.0.7 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,11 +41,11 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../mem.h" -#include "../rom.h" -#include "../device.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../device.h" #include "video.h" #include "vid_svga.h" #include "vid_svga_render.h" diff --git a/src/video/vid_vga.c b/src/devices/video/vid_vga.c similarity index 97% rename from src/video/vid_vga.c rename to src/devices/video/vid_vga.c index 84b4658..ea585cd 100644 --- a/src/video/vid_vga.c +++ b/src/devices/video/vid_vga.c @@ -8,7 +8,7 @@ * * IBM VGA emulation. * - * Version: @(#)vid_vga.c 1.0.5 2018/04/09 + * Version: @(#)vid_vga.c 1.0.6 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,11 +41,11 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../mem.h" -#include "../rom.h" -#include "../device.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../device.h" #include "video.h" #include "vid_svga.h" diff --git a/src/video/vid_voodoo.c b/src/devices/video/vid_voodoo.c similarity index 99% rename from src/video/vid_voodoo.c rename to src/devices/video/vid_voodoo.c index e5376ec..c9548c9 100644 --- a/src/video/vid_voodoo.c +++ b/src/devices/video/vid_voodoo.c @@ -8,7 +8,7 @@ * * Emulation of the 3DFX Voodoo Graphics controller. * - * Version: @(#)vid_voodoo.c 1.0.9 2018/05/04 + * Version: @(#)vid_voodoo.c 1.0.10 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -50,16 +50,15 @@ #include #include #define HAVE_STDARG_H -#include "../emu.h" -#include "../cpu/cpu.h" -#include "../machine/machine.h" -#include "../device.h" -#include "../mem.h" -#include "../pci.h" -#include "../nvr.h" -#include "../timer.h" -#include "../device.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../cpu/cpu.h" +#include "../../machines/machine.h" +#include "../../mem.h" +#include "../../timer.h" +#include "../../device.h" +#include "../../nvr.h" +#include "../../plat.h" +#include "../system/pci.h" #include "video.h" #include "vid_svga.h" #include "vid_voodoo_dither.h" diff --git a/src/video/vid_voodoo_codegen_x86-64.h b/src/devices/video/vid_voodoo_codegen_x86-64.h similarity index 100% rename from src/video/vid_voodoo_codegen_x86-64.h rename to src/devices/video/vid_voodoo_codegen_x86-64.h diff --git a/src/video/vid_voodoo_codegen_x86.h b/src/devices/video/vid_voodoo_codegen_x86.h similarity index 100% rename from src/video/vid_voodoo_codegen_x86.h rename to src/devices/video/vid_voodoo_codegen_x86.h diff --git a/src/video/vid_voodoo_dither.h b/src/devices/video/vid_voodoo_dither.h similarity index 100% rename from src/video/vid_voodoo_dither.h rename to src/devices/video/vid_voodoo_dither.h diff --git a/src/video/vid_wy700.c b/src/devices/video/vid_wy700.c similarity index 99% rename from src/video/vid_wy700.c rename to src/devices/video/vid_wy700.c index 7350ce6..19b3933 100644 --- a/src/video/vid_wy700.c +++ b/src/devices/video/vid_wy700.c @@ -53,7 +53,7 @@ * What doesn't work, is untested or not well understood: * - Cursor detach (commands 4 and 5) * - * Version: @(#)vid_wy700.c 1.0.3 2018/04/09 + * Version: @(#)vid_wy700.c 1.0.4 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -86,12 +86,12 @@ #include #include #include -#include "../emu.h" -#include "../io.h" -#include "../pit.h" -#include "../mem.h" -#include "../timer.h" -#include "../device.h" +#include "../../emu.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../timer.h" +#include "../../device.h" +#include "../system/pit.h" #include "video.h" diff --git a/src/video/video.c b/src/devices/video/video.c similarity index 98% rename from src/video/video.c rename to src/devices/video/video.c index eaa6c36..5212577 100644 --- a/src/video/video.c +++ b/src/devices/video/video.c @@ -40,7 +40,7 @@ * W = 3 bus clocks * L = 4 bus clocks * - * Version: @(#)video.c 1.0.15 2018/05/04 + * Version: @(#)video.c 1.0.16 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -74,15 +74,14 @@ #include #include #include -#include "../emu.h" -#include "../cpu/cpu.h" -#include "../machine/machine.h" -#include "../io.h" -#include "../mem.h" -#include "../rom.h" -#include "../config.h" -#include "../timer.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../cpu/cpu.h" +#include "../../machines/machine.h" +#include "../../io.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../timer.h" +#include "../../plat.h" #include "video.h" #include "vid_svga.h" diff --git a/src/video/video.h b/src/devices/video/video.h similarity index 100% rename from src/video/video.h rename to src/devices/video/video.h diff --git a/src/video/video_dev.c b/src/devices/video/video_dev.c similarity index 99% rename from src/video/video_dev.c rename to src/devices/video/video_dev.c index 82b13fb..f757151 100644 --- a/src/video/video_dev.c +++ b/src/devices/video/video_dev.c @@ -12,7 +12,7 @@ * an "extern" reference to its device into this file, and * add an entry for it into the table. * - * Version: @(#)video_dev.c 1.0.17 2018/04/14 + * Version: @(#)video_dev.c 1.0.18 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -43,13 +43,13 @@ #include #include #include -#include "../emu.h" -#include "../machine/machine.h" -#include "../mem.h" -#include "../rom.h" -#include "../device.h" -#include "../timer.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../machines/machine.h" +#include "../../mem.h" +#include "../../rom.h" +#include "../../timer.h" +#include "../../device.h" +#include "../../plat.h" #include "video.h" diff --git a/src/machine/m_amstrad.c b/src/machines/m_amstrad.c similarity index 98% rename from src/machine/m_amstrad.c rename to src/machines/m_amstrad.c index c67bb4a..8a75f30 100644 --- a/src/machine/m_amstrad.c +++ b/src/machines/m_amstrad.c @@ -32,7 +32,7 @@ * BIOSES: I need to re-do the bios.txt format so we can load non-BIOS * ROM files for a given machine, such as font roms here.. * - * Version: @(#)m_amstrad.c 1.0.15 2018/04/26 + * Version: @(#)m_amstrad.c 1.0.16 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -68,25 +68,25 @@ #include "../emu.h" #include "../cpu/cpu.h" #include "../io.h" -#include "../nmi.h" -#include "../pic.h" -#include "../pit.h" -#include "../ppi.h" #include "../mem.h" #include "../rom.h" #include "../timer.h" #include "../device.h" #include "../nvr.h" -#include "../ports/parallel.h" -#include "../input/keyboard.h" -#include "../input/mouse.h" -#include "../floppy/fdd.h" -#include "../floppy/fdc.h" -#include "../sound/sound.h" -#include "../sound/snd_speaker.h" -#include "../video/video.h" -#include "../video/vid_cga.h" -#include "../video/vid_ega.h" +#include "../devices/system/nmi.h" +#include "../devices/system/pic.h" +#include "../devices/system/pit.h" +#include "../devices/system/ppi.h" +#include "../devices/ports/parallel.h" +#include "../devices/input/keyboard.h" +#include "../devices/input/mouse.h" +#include "../devices/floppy/fdd.h" +#include "../devices/floppy/fdc.h" +#include "../devices/sound/sound.h" +#include "../devices/sound/snd_speaker.h" +#include "../devices/video/video.h" +#include "../devices/video/vid_cga.h" +#include "../devices/video/vid_ega.h" #include "machine.h" diff --git a/src/machine/m_at.c b/src/machines/m_at.c similarity index 90% rename from src/machine/m_at.c rename to src/machines/m_at.c index 83125a9..fbb148f 100644 --- a/src/machine/m_at.c +++ b/src/machines/m_at.c @@ -8,7 +8,7 @@ * * Standard PC/AT implementation. * - * Version: @(#)m_at.c 1.0.8 2018/04/26 + * Version: @(#)m_at.c 1.0.9 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,16 +41,16 @@ #include #include #include "../emu.h" -#include "../pic.h" -#include "../pit.h" -#include "../dma.h" #include "../mem.h" #include "../device.h" #include "../nvr.h" -#include "../input/keyboard.h" -#include "../floppy/fdd.h" -#include "../floppy/fdc.h" -#include "../disk/hdc.h" +#include "../devices/system/pic.h" +#include "../devices/system/pit.h" +#include "../devices/system/dma.h" +#include "../devices/input/keyboard.h" +#include "../devices/floppy/fdd.h" +#include "../devices/floppy/fdc.h" +#include "../devices/disk/hdc.h" #include "machine.h" diff --git a/src/machine/m_at_430fx.c b/src/machines/m_at_430fx.c similarity index 97% rename from src/machine/m_at_430fx.c rename to src/machines/m_at_430fx.c index 7538c80..f23ca1b 100644 --- a/src/machine/m_at_430fx.c +++ b/src/machines/m_at_430fx.c @@ -8,7 +8,7 @@ * * Implementation of the Intel 430FX PCISet chip. * - * Version: @(#)m_at_430fx.c 1.0.11 2018/04/26 + * Version: @(#)m_at_430fx.c 1.0.12 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,16 +41,16 @@ #include #include #include "../emu.h" -#include "../pci.h" #include "../mem.h" -#include "../memregs.h" #include "../rom.h" #include "../device.h" -#include "../input/keyboard.h" -#include "../sio/sio.h" -#include "../intel_piix.h" -#include "../intel_flash.h" -#include "../video/video.h" +#include "../devices/system/pci.h" +#include "../devices/system/memregs.h" +#include "../devices/system/intel_piix.h" +#include "../devices/system/intel_flash.h" +#include "../devices/input/keyboard.h" +#include "../devices/sio/sio.h" +#include "../devices/video/video.h" #include "machine.h" diff --git a/src/machine/m_at_430hx.c b/src/machines/m_at_430hx.c similarity index 97% rename from src/machine/m_at_430hx.c rename to src/machines/m_at_430hx.c index fa5e325..b145923 100644 --- a/src/machine/m_at_430hx.c +++ b/src/machines/m_at_430hx.c @@ -8,7 +8,7 @@ * * Implementation of the Intel 430HX PCISet chip. * - * Version: @(#)m_at_430hx.c 1.0.5 2018/04/26 + * Version: @(#)m_at_430hx.c 1.0.6 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -43,13 +43,13 @@ #include "../emu.h" #include "../io.h" #include "../mem.h" -#include "../memregs.h" -#include "../pci.h" #include "../device.h" -#include "../sio/sio.h" -#include "../input/keyboard.h" -#include "../intel_piix.h" -#include "../intel_flash.h" +#include "../devices/system/memregs.h" +#include "../devices/system/pci.h" +#include "../devices/system/intel_piix.h" +#include "../devices/system/intel_flash.h" +#include "../devices/sio/sio.h" +#include "../devices/input/keyboard.h" #include "machine.h" diff --git a/src/machine/m_at_430lx_nx.c b/src/machines/m_at_430lx_nx.c similarity index 96% rename from src/machine/m_at_430lx_nx.c rename to src/machines/m_at_430lx_nx.c index b67d936..576798c 100644 --- a/src/machine/m_at_430lx_nx.c +++ b/src/machines/m_at_430lx_nx.c @@ -8,7 +8,7 @@ * * Implementation of the Intel 430LX and 430NX PCISet chips. * - * Version: @(#)m_at_430lx_nx.c 1.0.5 2018/04/26 + * Version: @(#)m_at_430lx_nx.c 1.0.6 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,16 +41,16 @@ #include #include #include "../emu.h" -#include "../pci.h" #include "../mem.h" -#include "../memregs.h" #include "../rom.h" #include "../device.h" -#include "../input/keyboard.h" -#include "../sio/sio.h" -#include "../intel.h" -#include "../intel_flash.h" -#include "../intel_sio.h" +#include "../devices/system/pci.h" +#include "../devices/system/memregs.h" +#include "../devices/system/intel.h" +#include "../devices/system/intel_flash.h" +#include "../devices/system/intel_sio.h" +#include "../devices/input/keyboard.h" +#include "../devices/sio/sio.h" #include "machine.h" diff --git a/src/machine/m_at_430vx.c b/src/machines/m_at_430vx.c similarity index 96% rename from src/machine/m_at_430vx.c rename to src/machines/m_at_430vx.c index b5a61dd..6f9d348 100644 --- a/src/machine/m_at_430vx.c +++ b/src/machines/m_at_430vx.c @@ -8,7 +8,7 @@ * * Implementation of the Intel 430VX PCISet chip. * - * Version: @(#)m_at_430vx.c 1.0.4 2018/03/21 + * Version: @(#)m_at_430vx.c 1.0.5 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -42,13 +42,13 @@ #include #include "../emu.h" #include "../io.h" -#include "../pci.h" #include "../mem.h" -#include "../memregs.h" #include "../device.h" -#include "../intel_piix.h" -#include "../intel_flash.h" -#include "../sio/sio.h" +#include "../devices/system/pci.h" +#include "../devices/system/memregs.h" +#include "../devices/system/intel_piix.h" +#include "../devices/system/intel_flash.h" +#include "../devices/sio/sio.h" #include "machine.h" diff --git a/src/machine/m_at_440fx.c b/src/machines/m_at_440fx.c similarity index 96% rename from src/machine/m_at_440fx.c rename to src/machines/m_at_440fx.c index e3cca08..0534f40 100644 --- a/src/machine/m_at_440fx.c +++ b/src/machines/m_at_440fx.c @@ -8,7 +8,7 @@ * * Implementation of the Intel 440FX PCISet chip. * - * Version: @(#)m_at_440fx.c 1.0.5 2018/04/26 + * Version: @(#)m_at_440fx.c 1.0.6 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -42,14 +42,14 @@ #include #include "../emu.h" #include "../io.h" -#include "../pci.h" #include "../mem.h" -#include "../memregs.h" #include "../device.h" -#include "../sio/sio.h" -#include "../input/keyboard.h" -#include "../intel_piix.h" -#include "../intel_flash.h" +#include "../devices/system/pci.h" +#include "../devices/system/memregs.h" +#include "../devices/system/intel_piix.h" +#include "../devices/system/intel_flash.h" +#include "../devices/sio/sio.h" +#include "../devices/input/keyboard.h" #include "machine.h" diff --git a/src/machine/m_at_4gpv31.c b/src/machines/m_at_4gpv31.c similarity index 96% rename from src/machine/m_at_4gpv31.c rename to src/machines/m_at_4gpv31.c index d5af118..3b8a38c 100644 --- a/src/machine/m_at_4gpv31.c +++ b/src/machines/m_at_4gpv31.c @@ -11,7 +11,7 @@ * NOTE: The NEAT 82c206 code should be moved into a 82c206 module, * so it can be re-used by other boards. * - * Version: @(#)m_4gpv31.c 1.0.5 2018/04/27 + * Version: @(#)m_4gpv31.c 1.0.6 2018/05/06 * * Author: Fred N. van Kempen, * @@ -55,9 +55,9 @@ #include "../emu.h" #include "../io.h" #include "../device.h" -#include "../input/keyboard.h" -#include "../floppy/fdd.h" -#include "../floppy/fdc.h" +#include "../devices/input/keyboard.h" +#include "../devices/floppy/fdd.h" +#include "../devices/floppy/fdc.h" #include "machine.h" diff --git a/src/machine/m_at_ali1429.c b/src/machines/m_at_ali1429.c similarity index 93% rename from src/machine/m_at_ali1429.c rename to src/machines/m_at_ali1429.c index 5c27544..a7eb090 100644 --- a/src/machine/m_at_ali1429.c +++ b/src/machines/m_at_ali1429.c @@ -8,7 +8,7 @@ * * Implementation the ALI M1429 mainboard. * - * Version: @(#)m_at_ali1429.c 1.0.4 2018/04/26 + * Version: @(#)m_at_ali1429.c 1.0.5 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -45,11 +45,11 @@ #include "../io.h" #include "../mem.h" #include "../device.h" -#include "../input/keyboard.h" -#include "../floppy/fdd.h" -#include "../floppy/fdc.h" -#include "../disk/hdc.h" -#include "../disk/hdc_ide.h" +#include "../devices/input/keyboard.h" +#include "../devices/floppy/fdd.h" +#include "../devices/floppy/fdc.h" +#include "../devices/disk/hdc.h" +#include "../devices/disk/hdc_ide.h" #include "machine.h" diff --git a/src/machine/m_at_commodore.c b/src/machines/m_at_commodore.c similarity index 91% rename from src/machine/m_at_commodore.c rename to src/machines/m_at_commodore.c index cd8b83c..2d3c5fc 100644 --- a/src/machine/m_at_commodore.c +++ b/src/machines/m_at_commodore.c @@ -8,7 +8,7 @@ * * Implementation of the Commodore PC3 system. * - * Version: @(#)m_at_commodore.c 1.0.6 2018/04/26 + * Version: @(#)m_at_commodore.c 1.0.7 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,12 +41,12 @@ #include #include #include "../emu.h" -#include "../device.h" #include "../io.h" -#include "../ports/parallel.h" -#include "../ports/serial.h" -#include "../floppy/fdd.h" -#include "../floppy/fdc.h" +#include "../device.h" +#include "../devices/ports/parallel.h" +#include "../devices/ports/serial.h" +#include "../devices/floppy/fdd.h" +#include "../devices/floppy/fdc.h" #include "machine.h" diff --git a/src/machine/m_at_compaq.c b/src/machines/m_at_compaq.c similarity index 95% rename from src/machine/m_at_compaq.c rename to src/machines/m_at_compaq.c index 71f98e8..d7c7a19 100644 --- a/src/machine/m_at_compaq.c +++ b/src/machines/m_at_compaq.c @@ -8,7 +8,7 @@ * * Emulation of various Compaq PC's. * - * Version: @(#)m_at_compaq.c 1.0.5 2018/04/05 + * Version: @(#)m_at_compaq.c 1.0.6 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -46,10 +46,10 @@ #include "../mem.h" #include "../rom.h" #include "../device.h" -#include "../floppy/fdd.h" -#include "../floppy/fdc.h" -#include "../disk/hdc.h" -#include "../disk/hdc_ide.h" +#include "../devices/floppy/fdd.h" +#include "../devices/floppy/fdc.h" +#include "../devices/disk/hdc.h" +#include "../devices/disk/hdc_ide.h" #include "machine.h" diff --git a/src/machine/m_at_headland.c b/src/machines/m_at_headland.c similarity index 92% rename from src/machine/m_at_headland.c rename to src/machines/m_at_headland.c index 1fef80b..520c628 100644 --- a/src/machine/m_at_headland.c +++ b/src/machines/m_at_headland.c @@ -8,7 +8,7 @@ * * Implementation of the HEADLAND AT286 chipset. * - * Version: @(#)m_at_headland.c 1.0.4 2018/04/26 + * Version: @(#)m_at_headland.c 1.0.5 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -46,14 +46,14 @@ #include "../io.h" #include "../mem.h" #include "../device.h" -#include "../input/keyboard.h" -#include "../floppy/fdd.h" -#include "../floppy/fdc.h" +#include "../devices/input/keyboard.h" +#include "../devices/floppy/fdd.h" +#include "../devices/floppy/fdc.h" #include "machine.h" -static int headland_index; -static uint8_t headland_regs[256]; +static int headland_index; +static uint8_t headland_regs[256]; static void diff --git a/src/machine/m_at_neat.c b/src/machines/m_at_neat.c similarity index 95% rename from src/machine/m_at_neat.c rename to src/machines/m_at_neat.c index a238cc5..ffc4cd6 100644 --- a/src/machine/m_at_neat.c +++ b/src/machines/m_at_neat.c @@ -10,7 +10,7 @@ * * This is the chipset used in the AMI 286 clone model. * - * Version: @(#)m_at_neat.c 1.0.5 2018/04/27 + * Version: @(#)m_at_neat.c 1.0.6 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -45,9 +45,9 @@ #include "../emu.h" #include "../io.h" #include "../device.h" -#include "../input/keyboard.h" -#include "../floppy/fdd.h" -#include "../floppy/fdc.h" +#include "../devices/input/keyboard.h" +#include "../devices/floppy/fdd.h" +#include "../devices/floppy/fdc.h" #include "machine.h" diff --git a/src/machine/m_at_opti495.c b/src/machines/m_at_opti495.c similarity index 98% rename from src/machine/m_at_opti495.c rename to src/machines/m_at_opti495.c index 1c05345..d5e3de6 100644 --- a/src/machine/m_at_opti495.c +++ b/src/machines/m_at_opti495.c @@ -260,7 +260,7 @@ Note: the block address is forced to be a multiple of the block size by ignoring the appropriate number of the least-significant bits SeeAlso: #P0178,#P0187 * - * Version: @(#)m_at_opti495.c 1.0.4 2018/04/26 + * Version: @(#)m_at_opti495.c 1.0.5 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -297,9 +297,9 @@ SeeAlso: #P0178,#P0187 #include "../io.h" #include "../mem.h" #include "../device.h" -#include "../input/keyboard.h" -#include "../floppy/fdd.h" -#include "../floppy/fdc.h" +#include "../devices/input/keyboard.h" +#include "../devices/floppy/fdd.h" +#include "../devices/floppy/fdc.h" #include "machine.h" diff --git a/src/machine/m_at_scat.c b/src/machines/m_at_scat.c similarity index 99% rename from src/machine/m_at_scat.c rename to src/machines/m_at_scat.c index e392cbd..bac3b7a 100644 --- a/src/machine/m_at_scat.c +++ b/src/machines/m_at_scat.c @@ -10,7 +10,7 @@ * * Re-worked version based on the 82C235 datasheet and errata. * - * Version: @(#)m_at_scat.c 1.0.7 2018/04/26 + * Version: @(#)m_at_scat.c 1.0.8 2018/05/06 * * Authors: Fred N. van Kempen, * Original by GreatPsycho for PCem. @@ -45,12 +45,12 @@ #include "../cpu/cpu.h" #include "../cpu/x86.h" #include "../io.h" -#include "../nmi.h" #include "../mem.h" #include "../device.h" -#include "../input/keyboard.h" -#include "../floppy/fdd.h" -#include "../floppy/fdc.h" +#include "../devices/system/nmi.h" +#include "../devices/input/keyboard.h" +#include "../devices/floppy/fdd.h" +#include "../devices/floppy/fdc.h" #include "machine.h" diff --git a/src/machine/m_at_sis_85c471.c b/src/machines/m_at_sis_85c471.c similarity index 93% rename from src/machine/m_at_sis_85c471.c rename to src/machines/m_at_sis_85c471.c index 9953878..6d8aba9 100644 --- a/src/machine/m_at_sis_85c471.c +++ b/src/machines/m_at_sis_85c471.c @@ -12,7 +12,7 @@ * * Used by DTK PKM-0038S E-2 * - * Version: @(#)m_at_sis85c471.c 1.0.8 2018/04/26 + * Version: @(#)m_at_sis85c471.c 1.0.9 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -44,14 +44,14 @@ #include #include "../emu.h" #include "../io.h" -#include "../memregs.h" #include "../device.h" -#include "../ports/serial.h" -#include "../ports/parallel.h" -#include "../floppy/fdd.h" -#include "../floppy/fdc.h" -#include "../disk/hdc.h" -#include "../disk/hdc_ide.h" +#include "../devices/system/memregs.h" +#include "../devices/ports/serial.h" +#include "../devices/ports/parallel.h" +#include "../devices/floppy/fdd.h" +#include "../devices/floppy/fdc.h" +#include "../devices/disk/hdc.h" +#include "../devices/disk/hdc_ide.h" #include "machine.h" diff --git a/src/machine/m_at_sis_85c496.c b/src/machines/m_at_sis_85c496.c similarity index 96% rename from src/machine/m_at_sis_85c496.c rename to src/machines/m_at_sis_85c496.c index 8e3ea83..c19f810 100644 --- a/src/machine/m_at_sis_85c496.c +++ b/src/machines/m_at_sis_85c496.c @@ -8,7 +8,7 @@ * * Implementation of the SiS 85C496 chipset. * - * Version: @(#)m_at_sis_85c496.c 1.0.4 2018/03/21 + * Version: @(#)m_at_sis_85c496.c 1.0.5 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -44,12 +44,12 @@ #include "../emu.h" #include "../cpu/cpu.h" #include "../io.h" -#include "../pci.h" #include "../device.h" #include "../mem.h" -#include "../memregs.h" -#include "../sio/sio.h" -#include "../disk/hdc.h" +#include "../devices/system/pci.h" +#include "../devices/system/memregs.h" +#include "../devices/sio/sio.h" +#include "../devices/disk/hdc.h" #include "machine.h" diff --git a/src/machine/m_at_sis_85c50x.c b/src/machines/m_at_sis_85c50x.c similarity index 99% rename from src/machine/m_at_sis_85c50x.c rename to src/machines/m_at_sis_85c50x.c index f652970..f488180 100644 --- a/src/machine/m_at_sis_85c50x.c +++ b/src/machines/m_at_sis_85c50x.c @@ -8,7 +8,7 @@ * * Emulation of the SiS 85C50x PCI chips. * - * Version: @(#)m_at_sis_85c50x.c 1.0.2 2018/03/15 + * Version: @(#)m_at_sis_85c50x.c 1.0.3 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,8 +41,8 @@ #include #include "../emu.h" #include "../io.h" -#include "../pci.h" #include "../mem.h" +#include "../devices/system/pci.h" #include "machine.h" diff --git a/src/machine/m_at_t3100e.c b/src/machines/m_at_t3100e.c similarity index 99% rename from src/machine/m_at_t3100e.c rename to src/machines/m_at_t3100e.c index 87aab04..ca35242 100644 --- a/src/machine/m_at_t3100e.c +++ b/src/machines/m_at_t3100e.c @@ -117,7 +117,7 @@ * bit 2 set for single-pixel LCD font * bits 0,1 for display font * - * Version: @(#)m_at_t3100e.c 1.0.7 2018/04/27 + * Version: @(#)m_at_t3100e.c 1.0.8 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -155,10 +155,10 @@ #include "../io.h" #include "../mem.h" #include "../device.h" -#include "../input/keyboard.h" -#include "../input/mouse.h" -#include "../floppy/fdd.h" -#include "../floppy/fdc.h" +#include "../devices/input/keyboard.h" +#include "../devices/input/mouse.h" +#include "../devices/floppy/fdd.h" +#include "../devices/floppy/fdc.h" #include "machine.h" #include "m_at_t3100e.h" diff --git a/src/machine/m_at_t3100e.h b/src/machines/m_at_t3100e.h similarity index 100% rename from src/machine/m_at_t3100e.h rename to src/machines/m_at_t3100e.h diff --git a/src/machine/m_at_t3100e_vid.c b/src/machines/m_at_t3100e_vid.c similarity index 99% rename from src/machine/m_at_t3100e_vid.c rename to src/machines/m_at_t3100e_vid.c index 80e39c5..3a6434a 100644 --- a/src/machine/m_at_t3100e_vid.c +++ b/src/machines/m_at_t3100e_vid.c @@ -22,7 +22,7 @@ * 61 50 52 0F 19 06 19 19 02 0D 0B 0C MONO * 2D 28 22 0A 67 00 64 67 02 03 06 07 640x400 * - * Version: @(#)m_at_t3100e_vid.c 1.0.4 2018/03/15 + * Version: @(#)m_at_t3100e_vid.c 1.0.5 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -56,13 +56,13 @@ #include #include #include "../emu.h" -#include "../device.h" +#include "../cpu/cpu.h" #include "../io.h" #include "../mem.h" #include "../timer.h" -#include "../cpu/cpu.h" -#include "../video/video.h" -#include "../video/vid_cga.h" +#include "../device.h" +#include "../devices/video/video.h" +#include "../devices/video/vid_cga.h" #include "m_at_t3100e.h" diff --git a/src/machine/m_at_wd76c10.c b/src/machines/m_at_wd76c10.c similarity index 95% rename from src/machine/m_at_wd76c10.c rename to src/machines/m_at_wd76c10.c index c09e754..04f1f9e 100644 --- a/src/machine/m_at_wd76c10.c +++ b/src/machines/m_at_wd76c10.c @@ -8,7 +8,7 @@ * * Implementation of the WD76C10 system controller. * - * Version: @(#)m_at_wd76c10.c 1.0.7 2018/04/26 + * Version: @(#)m_at_wd76c10.c 1.0.8 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -44,10 +44,10 @@ #include "../io.h" #include "../mem.h" #include "../device.h" -#include "../ports/serial.h" -#include "../input/keyboard.h" -#include "../floppy/fdd.h" -#include "../floppy/fdc.h" +#include "../devices/ports/serial.h" +#include "../devices/input/keyboard.h" +#include "../devices/floppy/fdd.h" +#include "../devices/floppy/fdc.h" #include "machine.h" diff --git a/src/machine/m_europc.c b/src/machines/m_europc.c similarity index 98% rename from src/machine/m_europc.c rename to src/machines/m_europc.c index 97672e8..8cd7b88 100644 --- a/src/machine/m_europc.c +++ b/src/machines/m_europc.c @@ -66,7 +66,7 @@ * bit 1: b8000 memory available * 0000:046a: 00 jim 250 01 jim 350 * - * Version: @(#)m_europc.c 1.0.12 2018/04/27 + * Version: @(#)m_europc.c 1.0.13 2018/05/06 * * Author: Fred N. van Kempen, * @@ -115,18 +115,18 @@ #include #include "../emu.h" #include "../io.h" -#include "../nmi.h" #include "../mem.h" #include "../rom.h" #include "../nvr.h" #include "../device.h" -#include "../ports/parallel.h" -#include "../input/keyboard.h" -#include "../input/mouse.h" -#include "../floppy/fdd.h" -#include "../floppy/fdc.h" -#include "../disk/hdc.h" -#include "../video/video.h" +#include "../devices/system/nmi.h" +#include "../devices/ports/parallel.h" +#include "../devices/input/keyboard.h" +#include "../devices/input/mouse.h" +#include "../devices/floppy/fdd.h" +#include "../devices/floppy/fdc.h" +#include "../devices/disk/hdc.h" +#include "../devices/video/video.h" #include "machine.h" diff --git a/src/machine/m_olivetti_m24.c b/src/machines/m_olivetti_m24.c similarity index 97% rename from src/machine/m_olivetti_m24.c rename to src/machines/m_olivetti_m24.c index af15e1f..48e4273 100644 --- a/src/machine/m_olivetti_m24.c +++ b/src/machines/m_olivetti_m24.c @@ -8,7 +8,7 @@ * * Emulation of the Olivetti M24. * - * Version: @(#)m_olivetti_m24.c 1.0.10 2018/04/26 + * Version: @(#)m_olivetti_m24.c 1.0.11 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -44,21 +44,21 @@ #include #include "../emu.h" #include "../io.h" -#include "../pic.h" -#include "../pit.h" -#include "../ppi.h" -#include "../nmi.h" #include "../mem.h" #include "../timer.h" #include "../device.h" #include "../nvr.h" -#include "../input/keyboard.h" -#include "../input/mouse.h" -#include "../floppy/fdd.h" -#include "../floppy/fdc.h" -#include "../sound/sound.h" -#include "../sound/snd_speaker.h" -#include "../video/video.h" +#include "../devices/system/pic.h" +#include "../devices/system/pit.h" +#include "../devices/system/ppi.h" +#include "../devices/system/nmi.h" +#include "../devices/input/keyboard.h" +#include "../devices/input/mouse.h" +#include "../devices/floppy/fdd.h" +#include "../devices/floppy/fdc.h" +#include "../devices/sound/sound.h" +#include "../devices/sound/snd_speaker.h" +#include "../devices/video/video.h" #include "machine.h" diff --git a/src/machine/m_pcjr.c b/src/machines/m_pcjr.c similarity index 97% rename from src/machine/m_pcjr.c rename to src/machines/m_pcjr.c index e802345..8696c77 100644 --- a/src/machine/m_pcjr.c +++ b/src/machines/m_pcjr.c @@ -8,7 +8,7 @@ * * Emulation of the IBM PCjr. * - * Version: @(#)m_pcjr.c 1.0.7 2018/04/26 + * Version: @(#)m_pcjr.c 1.0.8 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -44,21 +44,21 @@ #include #include "../emu.h" #include "../io.h" -#include "../nmi.h" -#include "../pic.h" -#include "../pit.h" #include "../mem.h" #include "../timer.h" #include "../device.h" -#include "../ports/serial.h" -#include "../input/keyboard.h" -#include "../floppy/fdd.h" -#include "../floppy/fdc.h" -#include "../sound/sound.h" -#include "../sound/snd_speaker.h" -#include "../sound/snd_sn76489.h" -#include "../video/video.h" -#include "../video/vid_cga_comp.h" +#include "../devices/system/nmi.h" +#include "../devices/system/pic.h" +#include "../devices/system/pit.h" +#include "../devices/ports/serial.h" +#include "../devices/input/keyboard.h" +#include "../devices/floppy/fdd.h" +#include "../devices/floppy/fdc.h" +#include "../devices/sound/sound.h" +#include "../devices/sound/snd_speaker.h" +#include "../devices/sound/snd_sn76489.h" +#include "../devices/video/video.h" +#include "../devices/video/vid_cga_comp.h" #include "../plat.h" #include "machine.h" diff --git a/src/machine/m_ps1.c b/src/machines/m_ps1.c similarity index 95% rename from src/machine/m_ps1.c rename to src/machines/m_ps1.c index 0b72fcb..5936033 100644 --- a/src/machine/m_ps1.c +++ b/src/machines/m_ps1.c @@ -22,7 +22,7 @@ * The reserved 384K is remapped to the top of extended memory. * If this is not done then you get an error on startup. * - * Version: @(#)m_ps1.c 1.0.18 2018/05/04 + * Version: @(#)m_ps1.c 1.0.19 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -58,27 +58,27 @@ #include "../emu.h" #include "../cpu/cpu.h" #include "../io.h" -#include "../dma.h" -#include "../pic.h" -#include "../pit.h" #include "../mem.h" -#include "../nmi.h" #include "../rom.h" #include "../timer.h" #include "../device.h" #include "../nvr.h" -#include "../ports/game.h" -#include "../ports/parallel.h" -#include "../ports/serial.h" -#include "../input/keyboard.h" -#include "../input/mouse.h" -#include "../floppy/fdd.h" -#include "../floppy/fdc.h" -#include "../disk/hdc.h" -#include "../disk/hdc_ide.h" -#include "../sound/sound.h" -#include "../sound/snd_sn76489.h" -#include "../video/video.h" +#include "../devices/system/dma.h" +#include "../devices/system/pic.h" +#include "../devices/system/pit.h" +#include "../devices/system/nmi.h" +#include "../devices/ports/game.h" +#include "../devices/ports/parallel.h" +#include "../devices/ports/serial.h" +#include "../devices/input/keyboard.h" +#include "../devices/input/mouse.h" +#include "../devices/floppy/fdd.h" +#include "../devices/floppy/fdc.h" +#include "../devices/disk/hdc.h" +#include "../devices/disk/hdc_ide.h" +#include "../devices/sound/sound.h" +#include "../devices/sound/snd_sn76489.h" +#include "../devices/video/video.h" #include "../plat.h" #include "machine.h" diff --git a/src/machine/m_ps1_hdc.c b/src/machines/m_ps1_hdc.c similarity index 99% rename from src/machine/m_ps1_hdc.c rename to src/machines/m_ps1_hdc.c index 7b420e4..5dbdcff 100644 --- a/src/machine/m_ps1_hdc.c +++ b/src/machines/m_ps1_hdc.c @@ -43,7 +43,7 @@ * Type table with the main code, so the user can only select * items from that list... * - * Version: @(#)m_ps1_hdc.c 1.0.6 2018/04/28 + * Version: @(#)m_ps1_hdc.c 1.0.7 2018/05/06 * * Author: Fred N. van Kempen, * @@ -92,12 +92,12 @@ #include #include "../emu.h" #include "../io.h" -#include "../dma.h" -#include "../pic.h" -#include "../device.h" #include "../timer.h" -#include "../disk/hdc.h" -#include "../disk/hdd.h" +#include "../device.h" +#include "../devices/system/dma.h" +#include "../devices/system/pic.h" +#include "../devices/disk/hdc.h" +#include "../devices/disk/hdd.h" #include "../ui/ui.h" #include "../plat.h" #include "machine.h" diff --git a/src/machine/m_ps2_isa.c b/src/machines/m_ps2_isa.c similarity index 94% rename from src/machine/m_ps2_isa.c rename to src/machines/m_ps2_isa.c index b88e587..11253cf 100644 --- a/src/machine/m_ps2_isa.c +++ b/src/machines/m_ps2_isa.c @@ -8,7 +8,7 @@ * * Implementation of ISA-based PS/2 machines. * - * Version: @(#)m_ps2_isa.c 1.0.11 2018/04/26 + * Version: @(#)m_ps2_isa.c 1.0.12 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -43,18 +43,18 @@ #include "../emu.h" #include "../cpu/cpu.h" #include "../io.h" -#include "../dma.h" -#include "../pic.h" -#include "../pit.h" #include "../mem.h" #include "../rom.h" #include "../device.h" #include "../nvr.h" -#include "../ports/parallel.h" -#include "../ports/serial.h" -#include "../input/keyboard.h" -#include "../floppy/fdd.h" -#include "../floppy/fdc.h" +#include "../devices/system/dma.h" +#include "../devices/system/pic.h" +#include "../devices/system/pit.h" +#include "../devices/ports/parallel.h" +#include "../devices/ports/serial.h" +#include "../devices/input/keyboard.h" +#include "../devices/floppy/fdd.h" +#include "../devices/floppy/fdc.h" #include "machine.h" diff --git a/src/machine/m_ps2_mca.c b/src/machines/m_ps2_mca.c similarity index 98% rename from src/machine/m_ps2_mca.c rename to src/machines/m_ps2_mca.c index 4874997..e78d1c6 100644 --- a/src/machine/m_ps2_mca.c +++ b/src/machines/m_ps2_mca.c @@ -8,7 +8,7 @@ * * Implementation of MCA-based PS/2 machines. * - * Version: @(#)m_ps2_mca.c 1.0.14 2018/05/04 + * Version: @(#)m_ps2_mca.c 1.0.15 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -44,22 +44,22 @@ #include "../cpu/cpu.h" #include "../cpu/x86.h" #include "../io.h" -#include "../dma.h" -#include "../pic.h" -#include "../pit.h" -#include "../mca.h" #include "../mem.h" -#include "../nmi.h" #include "../rom.h" #include "../device.h" #include "../nvr.h" -#include "../nvr_ps2.h" -#include "../ports/parallel.h" -#include "../ports/serial.h" -#include "../input/keyboard.h" -#include "../input/mouse.h" -#include "../floppy/fdd.h" -#include "../floppy/fdc.h" +#include "../devices/system/dma.h" +#include "../devices/system/nmi.h" +#include "../devices/system/pic.h" +#include "../devices/system/pit.h" +#include "../devices/system/mca.h" +#include "../devices/system/nvr_ps2.h" +#include "../devices/ports/parallel.h" +#include "../devices/ports/serial.h" +#include "../devices/input/keyboard.h" +#include "../devices/input/mouse.h" +#include "../devices/floppy/fdd.h" +#include "../devices/floppy/fdc.h" #include "machine.h" diff --git a/src/machine/m_tandy.c b/src/machines/m_tandy.c similarity index 99% rename from src/machine/m_tandy.c rename to src/machines/m_tandy.c index cc5f42b..bb5e05c 100644 --- a/src/machine/m_tandy.c +++ b/src/machines/m_tandy.c @@ -8,7 +8,7 @@ * * Emulation of Tandy models 1000, 1000HX and 1000SL2. * - * Version: @(#)m_tandy.c 1.0.11 2018/05/04 + * Version: @(#)m_tandy.c 1.0.12 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -44,22 +44,22 @@ #include #include "../emu.h" #include "../io.h" -#include "../dma.h" -#include "../pic.h" -#include "../pit.h" -#include "../nmi.h" #include "../mem.h" #include "../rom.h" #include "../timer.h" -#include "../device.h" #include "../nvr.h" -#include "../input/keyboard.h" -#include "../floppy/fdd.h" -#include "../floppy/fdc.h" -#include "../sound/sound.h" -#include "../sound/snd_sn76489.h" -#include "../video/video.h" -#include "../video/vid_cga_comp.h" +#include "../device.h" +#include "../devices/system/dma.h" +#include "../devices/system/pic.h" +#include "../devices/system/pit.h" +#include "../devices/system/nmi.h" +#include "../devices/input/keyboard.h" +#include "../devices/floppy/fdd.h" +#include "../devices/floppy/fdc.h" +#include "../devices/sound/sound.h" +#include "../devices/sound/snd_sn76489.h" +#include "../devices/video/video.h" +#include "../devices/video/vid_cga_comp.h" #include "../plat.h" #include "machine.h" diff --git a/src/machine/m_xt.c b/src/machines/m_xt.c similarity index 91% rename from src/machine/m_xt.c rename to src/machines/m_xt.c index 0c62301..48401c6 100644 --- a/src/machine/m_xt.c +++ b/src/machines/m_xt.c @@ -8,7 +8,7 @@ * * Implementation of standard IBM PC/XT class machine. * - * Version: @(#)m_xt.c 1.0.9 2018/04/26 + * Version: @(#)m_xt.c 1.0.10 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,13 +41,13 @@ #include #include #include "../emu.h" -#include "../nmi.h" -#include "../pit.h" #include "../mem.h" #include "../device.h" -#include "../input/keyboard.h" -#include "../floppy/fdd.h" -#include "../floppy/fdc.h" +#include "../devices/system/nmi.h" +#include "../devices/system/pit.h" +#include "../devices/input/keyboard.h" +#include "../devices/floppy/fdd.h" +#include "../devices/floppy/fdc.h" #include "machine.h" diff --git a/src/machine/m_xt_compaq.c b/src/machines/m_xt_compaq.c similarity index 87% rename from src/machine/m_xt_compaq.c rename to src/machines/m_xt_compaq.c index a72540e..18d0d8b 100644 --- a/src/machine/m_xt_compaq.c +++ b/src/machines/m_xt_compaq.c @@ -8,7 +8,7 @@ * * Emulation of various Compaq XT-class PC's. * - * Version: @(#)m_xt_compaq.c 1.0.10 2018/04/26 + * Version: @(#)m_xt_compaq.c 1.0.11 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -43,15 +43,15 @@ #include #include "../emu.h" #include "../cpu/cpu.h" -#include "../nmi.h" -#include "../pit.h" #include "../mem.h" #include "../rom.h" #include "../device.h" -#include "../ports/parallel.h" -#include "../input/keyboard.h" -#include "../floppy/fdd.h" -#include "../floppy/fdc.h" +#include "../devices/system/nmi.h" +#include "../devices/system/pit.h" +#include "../devices/ports/parallel.h" +#include "../devices/input/keyboard.h" +#include "../devices/floppy/fdd.h" +#include "../devices/floppy/fdc.h" #include "machine.h" diff --git a/src/machine/m_xt_laserxt.c b/src/machines/m_xt_laserxt.c similarity index 99% rename from src/machine/m_xt_laserxt.c rename to src/machines/m_xt_laserxt.c index a1a382d..9b1249a 100644 --- a/src/machine/m_xt_laserxt.c +++ b/src/machines/m_xt_laserxt.c @@ -8,7 +8,7 @@ * * Emulation of the Laser XT series of machines. * - * Version: @(#)m_xt_laserxt.c 1.0.5 2018/04/27 + * Version: @(#)m_xt_laserxt.c 1.0.6 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, diff --git a/src/machine/m_xt_t1000.c b/src/machines/m_xt_t1000.c similarity index 98% rename from src/machine/m_xt_t1000.c rename to src/machines/m_xt_t1000.c index 032bbe4..0e439e2 100644 --- a/src/machine/m_xt_t1000.c +++ b/src/machines/m_xt_t1000.c @@ -50,7 +50,7 @@ * * FIXME: The ROM drive should be re-done using the "option file". * - * Version: @(#)m_xt_t1000.c 1.0.12 2018/04/27 + * Version: @(#)m_xt_t1000.c 1.0.13 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -87,17 +87,17 @@ #include "../emu.h" #include "../cpu/cpu.h" #include "../io.h" -#include "../pit.h" -#include "../nmi.h" #include "../mem.h" #include "../rom.h" #include "../nvr.h" #include "../device.h" -#include "../ports/parallel.h" -#include "../input/keyboard.h" -#include "../floppy/fdd.h" -#include "../floppy/fdc.h" -#include "../video/video.h" +#include "../devices/system/nmi.h" +#include "../devices/system/pit.h" +#include "../devices/ports/parallel.h" +#include "../devices/input/keyboard.h" +#include "../devices/floppy/fdd.h" +#include "../devices/floppy/fdc.h" +#include "../devices/video/video.h" #include "../plat.h" #include "machine.h" #include "m_xt_t1000.h" diff --git a/src/machine/m_xt_t1000.h b/src/machines/m_xt_t1000.h similarity index 100% rename from src/machine/m_xt_t1000.h rename to src/machines/m_xt_t1000.h diff --git a/src/machine/m_xt_t1000_vid.c b/src/machines/m_xt_t1000_vid.c similarity index 99% rename from src/machine/m_xt_t1000_vid.c rename to src/machines/m_xt_t1000_vid.c index 9a12dee..ab7e1cb 100644 --- a/src/machine/m_xt_t1000_vid.c +++ b/src/machines/m_xt_t1000_vid.c @@ -9,7 +9,7 @@ * Implementation of the Toshiba T1000 plasma display, which * has a fixed resolution of 640x200 pixels. * - * Version: @(#)m_xt_t1000_vid.c 1.0.5 2018/03/15 + * Version: @(#)m_xt_t1000_vid.c 1.0.6 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -43,13 +43,13 @@ #include #include #include "../emu.h" -#include "../device.h" +#include "../cpu/cpu.h" #include "../io.h" #include "../mem.h" #include "../timer.h" -#include "../cpu/cpu.h" -#include "../video/video.h" -#include "../video/vid_cga.h" +#include "../device.h" +#include "../devices/video/video.h" +#include "../devices/video/vid_cga.h" #include "m_xt_t1000.h" diff --git a/src/machine/m_xt_xi8088.c b/src/machines/m_xt_xi8088.c similarity index 90% rename from src/machine/m_xt_xi8088.c rename to src/machines/m_xt_xi8088.c index 1e49aef..385030a 100644 --- a/src/machine/m_xt_xi8088.c +++ b/src/machines/m_xt_xi8088.c @@ -8,7 +8,7 @@ * * Implementation of the Xi8088 open-source machine. * - * Version: @(#)m_xt_xi8088.c 1.0.9 2018/04/26 + * Version: @(#)m_xt_xi8088.c 1.0.10 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -42,18 +42,18 @@ #include #include "../emu.h" #include "../cpu/cpu.h" -#include "../pic.h" -#include "../pit.h" -#include "../dma.h" #include "../mem.h" -#include "../nmi.h" #include "../device.h" #include "../nvr.h" -#include "../input/keyboard.h" -#include "../ports/parallel.h" -#include "../floppy/fdd.h" -#include "../floppy/fdc.h" -#include "../disk/hdc.h" +#include "../devices/system/dma.h" +#include "../devices/system/nmi.h" +#include "../devices/system/pic.h" +#include "../devices/system/pit.h" +#include "../devices/input/keyboard.h" +#include "../devices/ports/parallel.h" +#include "../devices/floppy/fdd.h" +#include "../devices/floppy/fdc.h" +#include "../devices/disk/hdc.h" #include "machine.h" #include "m_xt_xi8088.h" diff --git a/src/machine/m_xt_xi8088.h b/src/machines/m_xt_xi8088.h similarity index 100% rename from src/machine/m_xt_xi8088.h rename to src/machines/m_xt_xi8088.h diff --git a/src/machine/machine.c b/src/machines/machine.c similarity index 91% rename from src/machine/machine.c rename to src/machines/machine.c index ce61040..259d86a 100644 --- a/src/machine/machine.c +++ b/src/machines/machine.c @@ -8,7 +8,7 @@ * * Handling of the emulated machines. * - * Version: @(#)machine.c 1.0.14 2018/04/26 + * Version: @(#)machine.c 1.0.15 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,17 +41,17 @@ #include #include #include "../emu.h" -#include "../device.h" -#include "../dma.h" -#include "../pic.h" -#include "../pit.h" #include "../mem.h" #include "../rom.h" -#include "../ports/game.h" -#include "../ports/serial.h" -#include "../ports/parallel.h" -#include "../disk/hdc.h" -#include "../disk/hdc_ide.h" +#include "../device.h" +#include "../devices/system/dma.h" +#include "../devices/system/pic.h" +#include "../devices/system/pit.h" +#include "../devices/ports/game.h" +#include "../devices/ports/serial.h" +#include "../devices/ports/parallel.h" +#include "../devices/disk/hdc.h" +#include "../devices/disk/hdc_ide.h" #include "../plat.h" #include "machine.h" diff --git a/src/machine/machine.h b/src/machines/machine.h similarity index 100% rename from src/machine/machine.h rename to src/machines/machine.h diff --git a/src/machine/machine_table.c b/src/machines/machine_table.c similarity index 100% rename from src/machine/machine_table.c rename to src/machines/machine_table.c diff --git a/src/mem.c b/src/mem.c index 76e9252..493eaa1 100644 --- a/src/mem.c +++ b/src/mem.c @@ -12,7 +12,7 @@ * the DYNAMIC_TABLES=1 enables this. Will eventually go * away, either way... * - * Version: @(#)mem.c 1.0.14 2018/05/04 + * Version: @(#)mem.c 1.0.15 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -49,8 +49,8 @@ #include "cpu/cpu.h" #include "cpu/x86_ops.h" #include "cpu/x86.h" -#include "machine/machine.h" -#include "machine/m_xt_xi8088.h" +#include "machines/machine.h" +#include "machines/m_xt_xi8088.h" //FIXME: remove? #include "config.h" #include "io.h" #include "mem.h" diff --git a/src/nvr.c b/src/nvr.c index a7deb6e..5dad5df 100644 --- a/src/nvr.c +++ b/src/nvr.c @@ -8,7 +8,7 @@ * * Implement a generic NVRAM/CMOS/RTC device. * - * Version: @(#)nvr.c 1.0.8 2018/04/28 + * Version: @(#)nvr.c 1.0.10 2018/05/06 * * Author: Fred N. van Kempen, * @@ -51,9 +51,9 @@ #include #include #include "emu.h" -#include "machine/machine.h" -#include "pic.h" -#include "pit.h" +#include "machines/machine.h" +#include "devices/system/pic.h" +#include "devices/system/pit.h" #include "timer.h" #include "plat.h" #include "nvr.h" diff --git a/src/pc.c b/src/pc.c index ab648e1..2011f90 100644 --- a/src/pc.c +++ b/src/pc.c @@ -8,7 +8,7 @@ * * Main emulator module where most things are controlled. * - * Version: @(#)pc.c 1.0.35 2018/05/05 + * Version: @(#)pc.c 1.0.36 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -53,38 +53,38 @@ # include "cpu/codegen.h" #endif #include "cpu/x86_ops.h" -#include "machine/machine.h" +#include "machines/machine.h" #include "io.h" #include "mem.h" #include "rom.h" -#include "dma.h" -#include "pic.h" -#include "pit.h" +#include "devices/system/dma.h" +#include "devices/system/pic.h" +#include "devices/system/pit.h" #include "random.h" #include "timer.h" #include "device.h" #include "nvr.h" #include "bugger.h" -#include "ports/game.h" -#include "ports/serial.h" -#include "ports/parallel.h" -#include "input/keyboard.h" -#include "input/mouse.h" -#include "input/game/joystick.h" -#include "floppy/fdd.h" -#include "floppy/fdd_common.h" -#include "disk/hdd.h" -#include "disk/hdc.h" -#include "disk/hdc_ide.h" -#include "disk/zip.h" -#include "cdrom/cdrom.h" -#include "cdrom/cdrom_image.h" -#include "cdrom/cdrom_null.h" -#include "scsi/scsi.h" -#include "network/network.h" -#include "sound/sound.h" -#include "sound/snd_speaker.h" -#include "video/video.h" +#include "devices/ports/game.h" +#include "devices/ports/serial.h" +#include "devices/ports/parallel.h" +#include "devices/input/keyboard.h" +#include "devices/input/mouse.h" +#include "devices/input/game/joystick.h" +#include "devices/floppy/fdd.h" +#include "devices/floppy/fdd_common.h" +#include "devices/disk/hdd.h" +#include "devices/disk/hdc.h" +#include "devices/disk/hdc_ide.h" +#include "devices/disk/zip.h" +#include "devices/cdrom/cdrom.h" +#include "devices/cdrom/cdrom_image.h" +#include "devices/cdrom/cdrom_null.h" +#include "devices/scsi/scsi.h" +#include "devices/network/network.h" +#include "devices/sound/sound.h" +#include "devices/sound/snd_speaker.h" +#include "devices/video/video.h" #include "ui/ui.h" #include "plat.h" diff --git a/src/plat.h b/src/plat.h index 62a75d9..81e22ac 100644 --- a/src/plat.h +++ b/src/plat.h @@ -8,7 +8,7 @@ * * Define the various platform support functions. * - * Version: @(#)plat.h 1.0.11 2018/05/03 + * Version: @(#)plat.h 1.0.12 2018/05/06 * * Author: Fred N. van Kempen, * @@ -147,8 +147,8 @@ extern void dynld_close(void *); /* Emulator start/stop support functions. */ -extern void do_start(void); -extern void do_stop(void); +extern void plat_start(void); +extern void plat_stop(void); /* Platform-specific device support. */ diff --git a/src/rom_load.c b/src/rom_load.c index 9f0eed5..022bdff 100644 --- a/src/rom_load.c +++ b/src/rom_load.c @@ -17,7 +17,7 @@ * or to use a generic handler, and then pass it a pointer * to a command table. For now, we don't. * - * Version: @(#)rom_load.c 1.0.8 2018/04/25 + * Version: @(#)rom_load.c 1.0.9 2018/05/06 * * Author: Fred N. van Kempen, * @@ -60,7 +60,7 @@ #include #include #include "emu.h" -#include "machine/machine.h" +#include "machines/machine.h" #include "mem.h" #include "rom.h" #include "device.h" diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c index 30f4349..98e1a52 100644 --- a/src/ui/ui_main.c +++ b/src/ui/ui_main.c @@ -11,7 +11,7 @@ * This code is called by the UI frontend modules, and, also, * depends on those same modules for lower-level functions. * - * Version: @(#)ui_main.c 1.0.7 2018/04/30 + * Version: @(#)ui_main.c 1.0.8 2018/05/06 * * Author: Fred N. van Kempen, * @@ -54,9 +54,9 @@ #include "../emu.h" #include "../config.h" #include "../device.h" -#include "../input/keyboard.h" -#include "../video/video.h" #include "../plat.h" +#include "../devices/input/keyboard.h" +#include "../devices/video/video.h" #include "ui.h" diff --git a/src/ui/ui_new_floppy.c b/src/ui/ui_new_floppy.c index b40877d..946965c 100644 --- a/src/ui/ui_new_floppy.c +++ b/src/ui/ui_new_floppy.c @@ -12,7 +12,7 @@ * format handlers, and re-integrated with that code. This is * just the wrong place for it.. * - * Version: @(#)ui_new_floppy.c 1.0.1 2018/04/28 + * Version: @(#)ui_new_floppy.c 1.0.2 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -45,9 +45,9 @@ #include #include "../emu.h" #include "../random.h" -#include "../disk/zip.h" #include "../ui/ui.h" #include "../plat.h" +#include "../devices/disk/zip.h" typedef struct { diff --git a/src/ui/ui_stbar.c b/src/ui/ui_stbar.c index 94dba7d..75ad7c6 100644 --- a/src/ui/ui_stbar.c +++ b/src/ui/ui_stbar.c @@ -8,7 +8,7 @@ * * Common UI support functions for the Status Bar module. * - * Version: @(#)ui_stbar.c 1.0.3 2018/05/03 + * Version: @(#)ui_stbar.c 1.0.4 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -42,21 +42,21 @@ #include "../emu.h" #include "../config.h" #include "../cpu/cpu.h" +#include "../machines/machine.h" #include "../device.h" -#include "../machine/machine.h" -#include "../floppy/fdd.h" -#include "../disk/hdd.h" -#include "../disk/hdc.h" -#include "../disk/zip.h" -#include "../cdrom/cdrom.h" -#include "../cdrom/cdrom_image.h" -#include "../cdrom/cdrom_null.h" -#include "../scsi/scsi.h" -#include "../scsi/scsi_disk.h" -#include "../network/network.h" -#include "../video/video.h" -#include "../sound/sound.h" #include "../plat.h" +#include "../devices/floppy/fdd.h" +#include "../devices/disk/hdd.h" +#include "../devices/disk/hdc.h" +#include "../devices/disk/zip.h" +#include "../devices/cdrom/cdrom.h" +#include "../devices/cdrom/cdrom_image.h" +#include "../devices/cdrom/cdrom_null.h" +#include "../devices/scsi/scsi.h" +#include "../devices/scsi/scsi_disk.h" +#include "../devices/network/network.h" +#include "../devices/sound/sound.h" +#include "../devices/video/video.h" #include "ui.h" #include "ui_resource.h" diff --git a/src/vnc.c b/src/vnc.c index 6bbd848..aa2b0b0 100644 --- a/src/vnc.c +++ b/src/vnc.c @@ -8,7 +8,7 @@ * * Implement the VNC remote renderer with LibVNCServer. * - * Version: @(#)vnc.c 1.0.1 2018/02/14 + * Version: @(#)vnc.c 1.0.2 2018/05/06 * * Author: Fred N. van Kempen, * Based on raw code by RichardG, @@ -53,11 +53,11 @@ #include #include "emu.h" #include "device.h" -#include "video/video.h" -#include "keyboard.h" -#include "mouse.h" +#include "devices/video/video.h" +#include "devices/input/keyboard.h" +#include "devices/input/mouse.h" +#include "ui/ui.h" #include "plat.h" -#include "ui.h" #include "vnc.h" diff --git a/src/vnc_keymap.c b/src/vnc_keymap.c index 3d685e3..af9afc0 100644 --- a/src/vnc_keymap.c +++ b/src/vnc_keymap.c @@ -22,7 +22,7 @@ * NOTE: The values are as defined in the Microsoft document named * "Keyboard Scan Code Specification", v1.3a of 2000/03/16. * - * Version: @(#)vnc_keymap.c 1.0.2 2018/03/16 + * Version: @(#)vnc_keymap.c 1.0.3 2018/05/06 * * Author: Fred N. van Kempen, * Based on raw code by RichardG, @@ -65,7 +65,7 @@ #include #include #include "emu.h" -#include "keyboard.h" +#include "devices/input/keyboard.h" #include "plat.h" #include "vnc.h" diff --git a/src/win/mingw/Makefile.MinGW b/src/win/mingw/Makefile.MinGW index 1f5d72e..191f4d3 100644 --- a/src/win/mingw/Makefile.MinGW +++ b/src/win/mingw/Makefile.MinGW @@ -8,7 +8,7 @@ # # Makefile for Windows systems using the MinGW32 environment. # -# Version: @(#)Makefile.mingw 1.0.37 2018/05/03 +# Version: @(#)Makefile.mingw 1.0.38 2018/05/06 # # Author: Fred N. van Kempen, # @@ -202,13 +202,17 @@ endif # Nothing should need changing from here on.. # ######################################################################### VPATH := $(EXPATH) . cpu \ - machine sio ports input input/game \ - cdrom disk floppy floppy/lzf \ - sound \ - sound/munt sound/munt/c_interface sound/munt/sha1 \ - sound/munt/srchelper \ - sound/resid-fp \ - scsi video network network/slirp ui win + devices \ + devices/cdrom devices/disk devices/floppy \ + devices/floppy/lzf devices/input devices/input/game \ + devices/network devices/network/slirp devices/ports \ + devices/sio devices/system devices/scsi \ + devices/sound \ + devices/sound/munt devices/sound/munt/c_interface \ + devices/sound/munt/sha1 devices/sound/munt/srchelper \ + devices/sound/resid-fp \ + devices/video \ + machines ui win # # Select the required build environment. We have, uhm, many.. diff --git a/src/win/msvc/Makefile.VC b/src/win/msvc/Makefile.VC index 3a45bcc..1cfd7be 100644 --- a/src/win/msvc/Makefile.VC +++ b/src/win/msvc/Makefile.VC @@ -8,7 +8,7 @@ # # Makefile for Windows using Visual Studio 2015. # -# Version: @(#)Makefile.VC 1.0.24 2018/05/03 +# Version: @(#)Makefile.VC 1.0.25 2018/05/06 # # Author: Fred N. van Kempen, # @@ -206,14 +206,18 @@ endif ######################################################################### # Nothing should need changing from here on.. # ######################################################################### -VPATH := $(EXPATH) . cpu \ - machine sio ports input input/game \ - cdrom disk floppy floppy/lzf \ - sound \ - sound/munt sound/munt/c_interface sound/munt/sha1 \ - sound/munt/srchelper \ - sound/resid-fp \ - scsi video network network/slirp ui win +VPATH := $(EXPATH) . cpu \ + devices \ + devices/cdrom devices/disk devices/floppy \ + devices/floppy/lzf devices/input devices/input/game \ + devices/network devices/network/slirp devices/ports \ + devices/sio devices/system devices/scsi \ + devices/sound \ + devices/sound/munt devices/sound/munt/c_interface \ + devices/sound/munt/sha1 devices/sound/munt/srchelper \ + devices/sound/resid-fp \ + devices/video \ + machines ui win # # Select the required build environment. diff --git a/src/win/win.c b/src/win/win.c index e518f1f..5539652 100644 --- a/src/win/win.c +++ b/src/win/win.c @@ -8,7 +8,7 @@ * * Platform main support module for Windows. * - * Version: @(#)win.c 1.0.17 2018/05/05 + * Version: @(#)win.c 1.0.18 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -53,8 +53,6 @@ #include "../version.h" #include "../config.h" #include "../device.h" -#include "../input/mouse.h" -#include "../video/video.h" #include "../ui/ui.h" #define GLOBAL #include "../plat.h" @@ -64,6 +62,8 @@ #ifdef USE_RDP # include "../rdp.h" #endif +#include "../devices/input/mouse.h" +#include "../devices/video/video.h" #ifdef USE_WX # include "../wx/wx_ui.h" #else diff --git a/src/win/win.h b/src/win/win.h index ffac08c..6bb7c87 100644 --- a/src/win/win.h +++ b/src/win/win.h @@ -8,7 +8,7 @@ * * Platform support defintions for Win32. * - * Version: @(#)win.h 1.0.10 2018/05/03 + * Version: @(#)win.h 1.0.11 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -105,10 +105,6 @@ extern void plat_set_language(int id); extern int get_vidpause(void); extern int fdd_type_icon(int type); -/* Emulator start/stop support functions. */ -extern void plat_start(void); -extern void plat_stop(void); - /* Platform UI support functions. */ extern int ui_init(int nCmdShow); extern void ui_menu_update(void); diff --git a/src/win/win_cdrom.c b/src/win/win_cdrom.c index c65a001..451de39 100644 --- a/src/win/win_cdrom.c +++ b/src/win/win_cdrom.c @@ -8,7 +8,7 @@ * * Handle the platform-side of CDROM drives. * - * Version: @(#)win_cdrom.c 1.0.7 2018/04/28 + * Version: @(#)win_cdrom.c 1.0.8 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -42,16 +42,17 @@ #include #include #include +#include "../emu.h" #include "../config.h" -#include "../disk/hdd.h" -#include "../disk/zip.h" -#include "../cdrom/cdrom.h" -#include "../cdrom/cdrom_image.h" -#include "../cdrom/cdrom_null.h" -#include "../scsi/scsi.h" -#include "../scsi/scsi_disk.h" #include "../ui/ui.h" #include "../plat.h" +#include "../devices/disk/hdd.h" +#include "../devices/disk/zip.h" +#include "../devices/cdrom/cdrom.h" +#include "../devices/cdrom/cdrom_image.h" +#include "../devices/cdrom/cdrom_null.h" +#include "../devices/scsi/scsi.h" +#include "../devices/scsi/scsi_disk.h" #include "win.h" diff --git a/src/win/win_cdrom_ioctl.c b/src/win/win_cdrom_ioctl.c index c2149eb..65981f2 100644 --- a/src/win/win_cdrom_ioctl.c +++ b/src/win/win_cdrom_ioctl.c @@ -9,7 +9,7 @@ * Implementation of the CD-ROM host drive IOCTL interface for * Windows using SCSI Passthrough Direct. * - * Version: @(#)cdrom_ioctl.c 1.0.8 2018/03/21 + * Version: @(#)cdrom_ioctl.c 1.0.9 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -50,9 +50,9 @@ #define HAVE_STDARG_H #include "../emu.h" #include "../device.h" -#include "../scsi/scsi.h" -#include "../cdrom/cdrom.h" #include "../plat.h" +#include "../devices/scsi/scsi.h" +#include "../devices/cdrom/cdrom.h" #define MSFtoLBA(m,s,f) ((((m*60)+s)*75)+f) diff --git a/src/win/win_d3d.cpp b/src/win/win_d3d.cpp index bf4df4e..8e3c3e6 100644 --- a/src/win/win_d3d.cpp +++ b/src/win/win_d3d.cpp @@ -8,7 +8,7 @@ * * Rendering module for Microsoft Direct3D 9. * - * Version: @(#)win_d3d.cpp 1.0.9 2018/05/02 + * Version: @(#)win_d3d.cpp 1.0.10 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -45,11 +45,11 @@ #include "../emu.h" #include "../version.h" #include "../device.h" +#include "../plat.h" #ifdef _MSC_VER # pragma warning(disable: 4200) #endif -#include "../video/video.h" -#include "../plat.h" +#include "../devices/video/video.h" #include "win.h" #include "win_d3d.h" diff --git a/src/win/win_ddraw.cpp b/src/win/win_ddraw.cpp index 06b8e0c..773f134 100644 --- a/src/win/win_ddraw.cpp +++ b/src/win/win_ddraw.cpp @@ -11,7 +11,7 @@ * NOTES: This code should be re-merged into a single init() with a * 'fullscreen' argument, indicating FS mode is requested. * - * Version: @(#)win_ddraw.cpp 1.0.6 2018/04/27 + * Version: @(#)win_ddraw.cpp 1.0.7 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -50,12 +50,12 @@ #endif #include "../emu.h" #include "../device.h" +#include "../ui/ui.h" +#include "../plat.h" #ifdef _MSC_VER # pragma warning(disable: 4200) #endif -#include "../video/video.h" -#include "../ui/ui.h" -#include "../plat.h" +#include "../devices/video/video.h" #include "win.h" #include "win_ddraw.h" diff --git a/src/win/win_joystick.cpp b/src/win/win_joystick.cpp index 2f6acc7..b314c26 100644 --- a/src/win/win_joystick.cpp +++ b/src/win/win_joystick.cpp @@ -13,7 +13,7 @@ * NOTE: Hacks currently needed to compile with MSVC; DX needs to * be updated to 11 or 12 or so. --FvK * - * Version: @(#)win_joystick.cpp 1.0.13 2018/05/05 + * Version: @(#)win_joystick.cpp 1.0.14 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -60,9 +60,9 @@ #include "../emu.h" #include "../config.h" #include "../device.h" -#include "../ports/game_dev.h" -#include "../input/game/joystick.h" #include "../plat.h" +#include "../devices/ports/game_dev.h" +#include "../devices/input/game/joystick.h" #include "win.h" diff --git a/src/win/win_keyboard.c b/src/win/win_keyboard.c index d260885..29cef70 100644 --- a/src/win/win_keyboard.c +++ b/src/win/win_keyboard.c @@ -8,7 +8,7 @@ * * Windows raw keyboard input handler. * - * Version: @(#)win_keyboard.c 1.0.5 2018/05/04 + * Version: @(#)win_keyboard.c 1.0.6 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -44,8 +44,8 @@ #include #include "../emu.h" #include "../device.h" -#include "../input/keyboard.h" #include "../plat.h" +#include "../devices/input/keyboard.h" #include "win.h" diff --git a/src/win/win_midi.c b/src/win/win_midi.c index ca3c278..88074a8 100644 --- a/src/win/win_midi.c +++ b/src/win/win_midi.c @@ -8,7 +8,7 @@ * * Implementation of the System MIDI interface. * - * Version: @(#)win_midi.c 1.0.3 2018/03/10 + * Version: @(#)win_midi.c 1.0.4 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -45,13 +45,15 @@ #include #include "../emu.h" #include "../config.h" -#include "../sound/midi.h" #include "../plat.h" +#include "../devices/sound/midi.h" #include "win.h" -int midi_id = 0; -HANDLE m_event; +int midi_id = 0; +HANDLE m_event; +MIDIHDR m_hdr; + static HMIDIOUT midi_out_device = NULL; static uint8_t midi_rt_buf[1024]; @@ -62,108 +64,117 @@ static uint8_t midi_status = 0; static unsigned int midi_sysex_start = 0; static unsigned int midi_sysex_delay = 0; -void plat_midi_init() + +void +plat_midi_init(void) { - /* This is for compatibility with old configuration files. */ - midi_id = config_get_int("Sound", "midi_host_device", -1); - if (midi_id == -1) - { - midi_id = config_get_int(SYSTEM_MIDI_NAME, "midi", 0); - } - else - { - config_delete_var("Sound", "midi_host_device"); - config_set_int(SYSTEM_MIDI_NAME, "midi", midi_id); - } + MMRESULT hr = MMSYSERR_NOERROR; - MMRESULT hr = MMSYSERR_NOERROR; + /* This is for compatibility with old configuration files. */ + midi_id = config_get_int("Sound", "midi_host_device", -1); + if (midi_id == -1) { + midi_id = config_get_int(SYSTEM_MIDI_NAME, "midi", 0); + } else { + config_delete_var("Sound", "midi_host_device"); + config_set_int(SYSTEM_MIDI_NAME, "midi", midi_id); + } - memset(midi_rt_buf, 0, sizeof(midi_rt_buf)); - memset(midi_cmd_buf, 0, sizeof(midi_cmd_buf)); + memset(midi_rt_buf, 0, sizeof(midi_rt_buf)); + memset(midi_cmd_buf, 0, sizeof(midi_cmd_buf)); - midi_cmd_pos = midi_cmd_len = 0; - midi_status = 0; + midi_cmd_pos = midi_cmd_len = 0; + midi_status = 0; - midi_sysex_start = midi_sysex_delay = 0; + midi_sysex_start = midi_sysex_delay = 0; - m_event = CreateEvent(NULL, TRUE, TRUE, NULL); + m_event = CreateEvent(NULL, TRUE, TRUE, NULL); - hr = midiOutOpen(&midi_out_device, midi_id, (uintptr_t) m_event, - 0, CALLBACK_EVENT); - if (hr != MMSYSERR_NOERROR) { - printf("midiOutOpen error - %08X\n",hr); - midi_id = 0; - hr = midiOutOpen(&midi_out_device, midi_id, (uintptr_t) m_event, - 0, CALLBACK_EVENT); - if (hr != MMSYSERR_NOERROR) { - printf("midiOutOpen error - %08X\n",hr); - return; - } - } - - midiOutReset(midi_out_device); -} - -void plat_midi_close() -{ - if (midi_out_device != NULL) - { - midiOutReset(midi_out_device); - midiOutClose(midi_out_device); - /* midi_out_device = NULL; */ - CloseHandle(m_event); - } -} - -int plat_midi_get_num_devs() -{ - return midiOutGetNumDevs(); -} -void plat_midi_get_dev_name(int num, char *s) -{ - MIDIOUTCAPS caps; - - midiOutGetDevCaps(num, &caps, sizeof(caps)); - strcpy(s, caps.szPname); -} - -void plat_midi_play_msg(uint8_t *msg) -{ - midiOutShortMsg(midi_out_device, *(uint32_t *) msg); -} - -MIDIHDR m_hdr; - -void plat_midi_play_sysex(uint8_t *sysex, unsigned int len) -{ - MMRESULT result; - - if (WaitForSingleObject(m_event, 2000) == WAIT_TIMEOUT) - { - pclog("Can't send MIDI message\n"); + hr = midiOutOpen(&midi_out_device, midi_id, (uintptr_t) m_event, + 0, CALLBACK_EVENT); + if (hr != MMSYSERR_NOERROR) { + pclog("midiOutOpen error - %08X\n",hr); + midi_id = 0; + hr = midiOutOpen(&midi_out_device, midi_id, (uintptr_t) m_event, + 0, CALLBACK_EVENT); + if (hr != MMSYSERR_NOERROR) { + pclog("midiOutOpen error - %08X\n",hr); return; } + } - midiOutUnprepareHeader(midi_out_device, &m_hdr, sizeof(m_hdr)); - - m_hdr.lpData = (char *) sysex; - m_hdr.dwBufferLength = len; - m_hdr.dwBytesRecorded = len; - m_hdr.dwUser = 0; - - result = midiOutPrepareHeader(midi_out_device, &m_hdr, sizeof(m_hdr)); - - if (result != MMSYSERR_NOERROR) return; - ResetEvent(m_event); - result = midiOutLongMsg(midi_out_device, &m_hdr, sizeof(m_hdr)); - if (result != MMSYSERR_NOERROR) - { - SetEvent(m_event); - return; - } + midiOutReset(midi_out_device); } -int plat_midi_write(uint8_t val) + +void +plat_midi_close(void) { - return 0; + if (midi_out_device != NULL) { + midiOutReset(midi_out_device); + midiOutClose(midi_out_device); +#if 0 + midi_out_device = NULL; +#endif + + CloseHandle(m_event); + } +} + + +int +plat_midi_get_num_devs(void) +{ + return midiOutGetNumDevs(); +} + + +void +plat_midi_get_dev_name(int num, char *s) +{ + MIDIOUTCAPS caps; + + midiOutGetDevCaps(num, &caps, sizeof(caps)); + strcpy(s, caps.szPname); +} + + +void +plat_midi_play_msg(uint8_t *msg) +{ + midiOutShortMsg(midi_out_device, *(uint32_t *) msg); +} + + +void +plat_midi_play_sysex(uint8_t *sysex, unsigned int len) +{ + MMRESULT result; + + if (WaitForSingleObject(m_event, 2000) == WAIT_TIMEOUT) { + pclog("Can't send MIDI message\n"); + return; + } + + midiOutUnprepareHeader(midi_out_device, &m_hdr, sizeof(m_hdr)); + + m_hdr.lpData = (char *) sysex; + m_hdr.dwBufferLength = len; + m_hdr.dwBytesRecorded = len; + m_hdr.dwUser = 0; + + result = midiOutPrepareHeader(midi_out_device, &m_hdr, sizeof(m_hdr)); + if (result != MMSYSERR_NOERROR) return; + + ResetEvent(m_event); + + result = midiOutLongMsg(midi_out_device, &m_hdr, sizeof(m_hdr)); + if (result != MMSYSERR_NOERROR) + SetEvent(m_event); +} + + +int +plat_midi_write(uint8_t val) +{ + return 0; } diff --git a/src/win/win_mouse.cpp b/src/win/win_mouse.cpp index 709e574..a2809d7 100644 --- a/src/win/win_mouse.cpp +++ b/src/win/win_mouse.cpp @@ -8,7 +8,7 @@ * * Mouse interface to host device. * - * Version: @(#)win_mouse.cpp 1.0.5 2018/05/02 + * Version: @(#)win_mouse.cpp 1.0.6 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -42,8 +42,8 @@ #include #include #include "../emu.h" -#include "../input/mouse.h" #include "../plat.h" +#include "../devices/input/mouse.h" #include "win.h" diff --git a/src/win/win_new_floppy.c b/src/win/win_new_floppy.c index f569c7b..c15c18f 100644 --- a/src/win/win_new_floppy.c +++ b/src/win/win_new_floppy.c @@ -8,7 +8,7 @@ * * Implementation of the New Floppy Image dialog. * - * Version: @(#)win_new_floppy.c 1.0.12 2018/05/02 + * Version: @(#)win_new_floppy.c 1.0.13 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -44,9 +44,9 @@ #include #include #include "../emu.h" -#include "../disk/zip.h" #include "../ui/ui.h" #include "../plat.h" +#include "../devices/disk/zip.h" #include "win.h" diff --git a/src/win/win_opendir.c b/src/win/win_opendir.c index 8c1a6d1..a0a7bda 100644 --- a/src/win/win_opendir.c +++ b/src/win/win_opendir.c @@ -10,7 +10,7 @@ * * Based on old original code @(#)dir_win32.c 1.2.0 2007/04/19 * - * Version: @(#)win_opendir.c 1.0.2 2018/03/07 + * Version: @(#)win_opendir.c 1.0.3 2018/05/06 * * Author: Fred N. van Kempen, * @@ -55,31 +55,20 @@ #include #include #include -#include "../emu.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../plat.h" #include "plat_dir.h" -#ifdef UNICODE -# define SUFFIX L"\\*" -# define FINDATA struct _wfinddata_t -# define FINDFIRST _wfindfirst -# define FINDNEXT _wfindnext -#else -# define SUFFIX "\\*" -# define FINDATA struct _finddata_t -# define FINDFIRST _findfirst -# define FINDNEXT _findnext -#endif +#define SUFFIX L"\\*" +#define FINDATA struct _wfinddata_t +#define FINDFIRST _wfindfirst +#define FINDNEXT _wfindnext /* Open a directory. */ DIR * -#ifdef UNICODE opendirw(const wchar_t *name) -#else -opendir(const char *name) -#endif { DIR *p; @@ -101,20 +90,11 @@ opendir(const char *name) memset(p->dta, 0x00, sizeof(struct _finddata_t)); /* Add search filespec. */ -#ifdef UNICODE wcscpy(p->dir, name); wcscat(p->dir, SUFFIX); -#else - strcpy(p->dir, name); - strcat(p->dir, SUFFIX); -#endif /* Special case: flag if we are in the root directory. */ -#ifdef UNICODE if (wcslen(p->dir) == 3) -#else - if (strlen(p->dir) == 3) -#endif p->flags |= DIR_F_ISROOT; /* Start the searching by doing a FindFirst. */ @@ -168,29 +148,17 @@ readdir(DIR *p) p->dent.d_off = p->offset++; switch(p->offset) { case 1: /* . */ -#ifdef UNICODE wcsncpy(p->dent.d_name, L".", MAXNAMLEN+1); -#else - strncpy(p->dent.d_name, ".", MAXNAMLEN+1); -#endif p->dent.d_reclen = 1; break; case 2: /* .. */ -#ifdef UNICODE wcsncpy(p->dent.d_name, L"..", MAXNAMLEN+1); -#else - strncpy(p->dent.d_name, "..", MAXNAMLEN+1); -#endif p->dent.d_reclen = 2; break; default: /* regular entry. */ -#ifdef UNICODE wcsncpy(p->dent.d_name, ffp->name, MAXNAMLEN+1); -#else - strncpy(p->dent.d_name, ffp->name, MAXNAMLEN+1); -#endif p->dent.d_reclen = (char) wcslen(p->dent.d_name); } diff --git a/src/win/win_serial.c b/src/win/win_serial.c index ebd28ef..9785f0e 100644 --- a/src/win/win_serial.c +++ b/src/win/win_serial.c @@ -12,7 +12,7 @@ * Windows and UNIX systems, with support for FTDI and Prolific * USB ports. Support for these has been removed. * - * Version: @(#)win_serial.c 1.0.2 2018/03/07 + * Version: @(#)win_serial.c 1.0.3 2018/05/06 * * Author: Fred N. van Kempen, * @@ -54,9 +54,9 @@ #include #include #define PLAT_SERIAL_C -#include "../emu.h" -#include "../serial.h" -#include "../plat.h" +#include "../../emu.h" +#include "../../plat.h" +#include "../devices/ports/serial.h" /* Handle the receiving of data from the host port. */ diff --git a/src/win/win_settings.c b/src/win/win_settings.c index 5bc9e41..f876eb7 100644 --- a/src/win/win_settings.c +++ b/src/win/win_settings.c @@ -8,7 +8,7 @@ * * Implementation of the Settings dialog. * - * Version: @(#)win_settings.c 1.0.27 2018/05/02 + * Version: @(#)win_settings.c 1.0.28 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -50,28 +50,28 @@ #include "../mem.h" #include "../rom.h" #include "../device.h" +#include "../machines/machine.h" #include "../nvr.h" -#include "../machine/machine.h" -#include "../ports/game_dev.h" -#include "../ports/parallel.h" -#include "../ports/parallel_dev.h" -#include "../ports/serial.h" -#include "../input/mouse.h" -#include "../input/game/joystick.h" -#include "../floppy/fdd.h" -#include "../disk/hdd.h" -#include "../disk/hdc.h" -#include "../disk/hdc_ide.h" -#include "../disk/zip.h" -#include "../cdrom/cdrom.h" -#include "../scsi/scsi.h" -#include "../network/network.h" -#include "../sound/sound.h" -#include "../sound/midi.h" -#include "../sound/snd_mpu401.h" -#include "../video/video.h" #include "../ui/ui.h" #include "../plat.h" +#include "../devices/ports/game_dev.h" +#include "../devices/ports/parallel.h" +#include "../devices/ports/parallel_dev.h" +#include "../devices/ports/serial.h" +#include "../devices/input/mouse.h" +#include "../devices/input/game/joystick.h" +#include "../devices/floppy/fdd.h" +#include "../devices/disk/hdd.h" +#include "../devices/disk/hdc.h" +#include "../devices/disk/hdc_ide.h" +#include "../devices/disk/zip.h" +#include "../devices/cdrom/cdrom.h" +#include "../devices/scsi/scsi.h" +#include "../devices/network/network.h" +#include "../devices/sound/sound.h" +#include "../devices/sound/midi.h" +#include "../devices/sound/snd_mpu401.h" +#include "../devices/video/video.h" #include "win.h" diff --git a/src/win/win_snd_gain.c b/src/win/win_snd_gain.c index 32a2055..69c2e26 100644 --- a/src/win/win_snd_gain.c +++ b/src/win/win_snd_gain.c @@ -8,7 +8,7 @@ * * Implementation of the Sound Gain dialog. * - * Version: @(#)win_snd_gain.c 1.0.5 2018/05/01 + * Version: @(#)win_snd_gain.c 1.0.6 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -43,11 +43,11 @@ #include #include #include -#include "../emu.h" -#include "../config.h" -#include "../sound/sound.h" +#include "..//emu.h" +#include "..//config.h" #include "../ui/ui.h" #include "../plat.h" +#include "../devices/sound/sound.h" #include "win.h" diff --git a/src/win/win_status.c b/src/win/win_status.c index 6a9fa29..e946087 100644 --- a/src/win/win_status.c +++ b/src/win/win_status.c @@ -8,7 +8,7 @@ * * Implementation of the Status Window dialog. * - * Version: @(#)win_status.c 1.0.5 2018/05/02 + * Version: @(#)win_status.c 1.0.6 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -43,7 +43,6 @@ #include #include #include "../emu.h" -#include "../pit.h" #include "../mem.h" #include "../cpu/cpu.h" #include "../cpu/x86_ops.h" @@ -53,6 +52,7 @@ #include "../device.h" #include "../ui/ui.h" #include "../plat.h" +#include "../devices/system/pit.h" #include "win.h" diff --git a/src/win/win_thread.c b/src/win/win_thread.c index c93cee3..a1af567 100644 --- a/src/win/win_thread.c +++ b/src/win/win_thread.c @@ -8,7 +8,7 @@ * * Implement threads and mutexes for the Win32 platform. * - * Version: @(#)win_thread.c 1.0.4 2018/04/10 + * Version: @(#)win_thread.c 1.0.5 2018/05/06 * * Authors: Fred N. van Kempen, * Sarah Walker, diff --git a/src/win/win_ui.c b/src/win/win_ui.c index a399fc1..77b1096 100644 --- a/src/win/win_ui.c +++ b/src/win/win_ui.c @@ -8,7 +8,7 @@ * * Implement the user Interface module. * - * Version: @(#)win_ui.c 1.0.19 2018/05/05 + * Version: @(#)win_ui.c 1.0.20 2018/05/06 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -51,11 +51,11 @@ #include "../version.h" #include "../config.h" #include "../device.h" -#include "../input/keyboard.h" -#include "../input/mouse.h" -#include "../video/video.h" #include "../ui/ui.h" #include "../plat.h" +#include "../devices/input/keyboard.h" +#include "../devices/input/mouse.h" +#include "../devices/video/video.h" #include "win.h" #include "win_d3d.h"