Final move of files into the new structure.

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, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -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 "devices/ports/game_dev.h"
-#include "ports/serial.h"
+#include "devices/ports/serial.h"
-#include "ports/parallel.h"
+#include "devices/ports/parallel.h"
-#include "ports/parallel_dev.h"
+#include "devices/ports/parallel_dev.h"
-#include "input/mouse.h"
+#include "devices/input/mouse.h"
-#include "input/game/joystick.h"
+#include "devices/input/game/joystick.h"
-#include "floppy/fdd.h"
+#include "devices/floppy/fdd.h"
-#include "floppy/fdc.h"
+#include "devices/floppy/fdc.h"
-#include "disk/hdd.h"
+#include "devices/disk/hdd.h"
-#include "disk/hdc.h"
+#include "devices/disk/hdc.h"
-#include "disk/hdc_ide.h"
+#include "devices/disk/hdc_ide.h"
-#include "disk/zip.h"
+#include "devices/disk/zip.h"
-#include "cdrom/cdrom.h"
+#include "devices/cdrom/cdrom.h"
-#include "scsi/scsi.h"
+#include "devices/scsi/scsi.h"
-#include "network/network.h"
+#include "devices/network/network.h"
-#include "sound/sound.h"
+#include "devices/sound/sound.h"
-#include "sound/midi.h"
+#include "devices/sound/midi.h"
-#include "sound/sound.h"
+#include "devices/sound/sound.h"
-#include "video/video.h"
+#include "devices/video/video.h"
 #include "ui/ui.h"
 #include "plat.h"
 

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, <tommowalker@tommowalker.co.uk>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -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 "../devices/system/pic.h"
-#include "../pit.h"
+#include "../devices/system/pit.h"
 #include "../timer.h"
-#include "../floppy/fdd.h"
+#include "../devices/floppy/fdd.h"
-#include "../floppy/fdc.h"
+#include "../devices/floppy/fdc.h"
 #include "386_common.h"
 
 

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, <tommowalker@tommowalker.co.uk>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -50,11 +50,11 @@
 #include "x87.h"
 #include "../io.h"
 #include "../mem.h"
-#include "../nmi.h"
+#include "../devices/system/nmi.h"
-#include "../pic.h"
+#include "../devices/system/pic.h"
 #include "../timer.h"
-#include "../floppy/fdd.h"
+//#include "../devices/floppy/fdd.h"
-#include "../floppy/fdc.h"
+//#include "../devices/floppy/fdc.h"
 #ifdef USE_DYNAREC
 #include "codegen.h"
 #endif

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, <tommowalker@tommowalker.co.uk>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -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
 

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, <tommowalker@tommowalker.co.uk>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -51,16 +51,16 @@
 #include "../emu.h"
 #include "cpu.h"
 #include "x86.h"
-#include "../machine/machine.h"
 #include "../io.h"
-#include "../pic.h"
+#include "../machines/machine.h"
-#include "../nmi.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 "../devices/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/scsi/scsi.h"	/* its WRONG to have this in here!! --FvK */
 #include "../plat.h"
 
 

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, <tommowalker@tommowalker.co.uk>
  *		Miran Grca, <mgrca8@gmail.com>

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, <decwiz@yahoo.com>
  *		Sarah Walker, <tommowalker@tommowalker.co.uk>
@@ -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

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, <tommowalker@tommowalker.co.uk>
  *		leilei,
@@ -65,7 +65,7 @@
 #include <wchar.h>
 #include "../emu.h"
 #include "cpu.h"
-#include "../machine/machine.h"
+#include "../machines/machine.h"
 
 
 CPU cpus_8088[] = {

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, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -42,7 +42,7 @@
 #include <wchar.h>
 #include "../emu.h"
 #include "cpu.h"
-#include "../machine/machine.h"
+#include "../machines/machine.h"
 #include "../mem.h"
 #include "../nvr.h"
 #include "x86.h"

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, <tommowalker@tommowalker.co.uk>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -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"

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, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -43,11 +43,11 @@
 #include <stdlib.h>
 #include <wchar.h>
 #include "emu.h"
-#include "cpu/cpu.h"
 #include "config.h"
+#include "cpu/cpu.h"
 #include "device.h"
-#include "machine/machine.h"
+#include "machines/machine.h"
-#include "sound/sound.h"
+#include "devices/sound/sound.h"
 #include "ui/ui.h"
 #include "plat.h"
 

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, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -45,18 +45,17 @@
 #include <stdarg.h>
 #include <wchar.h>
 #define HAVE_STDARG_H
-#include "../emu.h"
+#include "../../emu.h"
-#include "../version.h"
+#include "../../version.h"
-#include "../config.h"
+#include "../../timer.h"
-#include "../timer.h"
+#include "../../device.h"
-#include "../device.h"
+#include "../../nvr.h"
-#include "../nvr.h"
+#include "../../ui/ui.h"
-#include "../intel_piix.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"

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, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -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 <stdio.h>
 #include <stdint.h>
-
+#include <sys/stat.h>
 #include <cctype>
 #include <cmath>
 #include <cstdio>
 #include <fstream>
 #include <iostream>
 #include <limits>
-#include <limits.h> //GCC 2.95
 #include <sstream>
 #include <vector>
-#include <sys/stat.h>
+#include "../../plat.h"
-#include "../plat.h"
 #include "cdrom_dosbox.h"
 
 #ifndef _WIN32

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, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -44,8 +44,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "../config.h"
+#include "../../emu.h"
-#include "../plat.h"
+#include "../../plat.h"
 #include "cdrom_dosbox.h"
 #include "cdrom.h"
 #include "cdrom_image.h"

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, <mgrca8@gmail.com>
  *		Sarah Walker, <tommowalker@tommowalker.co.uk>
@@ -39,7 +39,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
-#include "../emu.h"
+#include "../../emu.h"
 #include "cdrom.h"
 
 

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, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -40,9 +40,9 @@
 #include <stdarg.h>
 #include <wchar.h>
 #define HAVE_STDARG_H
-#include "../emu.h"
+#include "../../emu.h"
-#include "../machine/machine.h"
+#include "../../machines/machine.h"
-#include "../device.h"
+#include "../../device.h"
 #include "hdc.h"
 #include "hdc_ide.h"
 

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, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -44,17 +44,17 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "../emu.h"
+#include "../../emu.h"
-#include "../cpu/cpu.h"
+#include "../../cpu/cpu.h"
-#include "../machine/machine.h"
+#include "../../machines/machine.h"
-#include "../io.h"
+#include "../../io.h"
-#include "../pic.h"
+#include "../../mem.h"
-#include "../mem.h"
+#include "../../rom.h"
-#include "../rom.h"
+#include "../../device.h"
-#include "../device.h"
+#include "../../timer.h"
-#include "../timer.h"
+#include "../../ui/ui.h"
-#include "../ui/ui.h"
+#include "../../plat.h"
-#include "../plat.h"
+#include "../system/pic.h"
 #include "hdc.h"
 #include "hdd.h"
 

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, <decwiz@yahoo.com>
  *		Sarah Walker, <tommowalker@tommowalker.co.uk>
@@ -83,16 +83,16 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "../emu.h"
+#include "../../emu.h"
-#include "../device.h"
+#include "../../io.h"
-#include "../io.h"
+#include "../../mem.h"
-#include "../dma.h"
+#include "../../rom.h"
-#include "../pic.h"
+#include "../../timer.h"
-#include "../mca.h"
+#include "../../device.h"
-#include "../mem.h"
+#include "../../ui/ui.h"
-#include "../rom.h"
+#include "../system/dma.h"
-#include "../timer.h"
+#include "../system/pic.h"
-#include "../ui/ui.h"
+#include "../system/mca.h"
 #include "hdc.h"
 #include "hdd.h"
 

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, <mgrca8@gmail.com>
  *		Sarah Walker, <tommowalker@tommowalker.co.uk>
@@ -50,19 +50,19 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <wchar.h>
-#include "../emu.h"
+#include "../../emu.h"
-#include "../version.h"
+#include "../../version.h"
-#include "../cpu/cpu.h"
+#include "../../cpu/cpu.h"
-#include "../machine/machine.h"
+#include "../../machines/machine.h"
-#include "../io.h"
+#include "../../io.h"
-#include "../pic.h"
+#include "../../timer.h"
-#include "../pci.h"
+#include "../../device.h"
-#include "../timer.h"
+#include "../../ui/ui.h"
-#include "../device.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"

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, <decwiz@yahoo.com>
  *
@@ -92,16 +92,16 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "../emu.h"
+#include "../../emu.h"
-#include "../io.h"
+#include "../../io.h"
-#include "../dma.h"
+#include "../../mem.h"
-#include "../pic.h"
+#include "../../rom.h"
-#include "../mem.h"
+#include "../../timer.h"
-#include "../rom.h"
+#include "../../device.h"
-#include "../device.h"
+#include "../../ui/ui.h"
-#include "../timer.h"
+#include "../../plat.h"
-#include "../ui/ui.h"
+#include "../system/dma.h"
-#include "../plat.h"
+#include "../system/pic.h"
 #include "hdc.h"
 #include "hdd.h"
 

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, <decwiz@yahoo.com>
  *		Sarah Walker, <tommowalker@tommowalker.co.uk>
@@ -46,15 +46,15 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "../emu.h"
+#include "../../emu.h"
-#include "../cpu/cpu.h"
+#include "../../cpu/cpu.h"
-#include "../machine/machine.h"
+#include "../../machines/machine.h"
-#include "../io.h"
+#include "../../io.h"
-#include "../pic.h"
+#include "../../timer.h"
-#include "../device.h"
+#include "../../device.h"
-#include "../timer.h"
+#include "../../ui/ui.h"
-#include "../ui/ui.h"
+#include "../../plat.h"
-#include "../plat.h"
+#include "../system/pic.h"
 #include "hdc.h"
 #include "hdd.h"
 

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, <decwiz@yahoo.com>
  *		Sarah Walker, <tommowalker@tommowalker.co.uk>
@@ -75,16 +75,16 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "../emu.h"
+#include "../../emu.h"
-#include "../device.h"
+#include "../../io.h"
-#include "../dma.h"
+#include "../../mem.h"
-#include "../io.h"
+#include "../../rom.h"
-#include "../mem.h"
+#include "../../timer.h"
-#include "../pic.h"
+#include "../../device.h"
-#include "../rom.h"
+#include "../../ui/ui.h"
-#include "../timer.h"
+#include "../../plat.h"
-#include "../ui/ui.h"
+#include "../system/dma.h"
-#include "../plat.h"
+#include "../system/pic.h"
 #include "hdc.h"
 #include "hdd.h"
 

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, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -52,11 +52,11 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "../emu.h"
+#include "../../emu.h"
-#include "../io.h"
+#include "../../io.h"
-#include "../mem.h"
+#include "../../mem.h"
-#include "../rom.h"
+#include "../../rom.h"
-#include "../device.h"
+#include "../../device.h"
 #include "hdc.h"
 #include "hdc_ide.h"
 

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, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -40,9 +40,9 @@
 #include <stdarg.h>
 #include <wchar.h>
 #define HAVE_STDARG_H
-#include "../emu.h"
+#include "../../emu.h"
-#include "../ui/ui.h"
+#include "../../ui/ui.h"
-#include "../plat.h"
+#include "../../plat.h"
 #include "hdd.h"
 
 

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, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -43,8 +43,8 @@
 #include <stdlib.h>
 #include <wchar.h>
 #include <errno.h>
-#include "../emu.h"
+#include "../../emu.h"
-#include "../plat.h"
+#include "../../plat.h"
 #include "hdd.h"
 
 

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, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -39,7 +39,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <wchar.h>
-#include "../emu.h"
+#include "../../emu.h"
 #include "hdd.h"
 
 

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, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -41,17 +41,17 @@
 #include <stdarg.h>
 #include <wchar.h>
 #define HAVE_STDARG_H
-#include "../emu.h"
+#include "../../emu.h"
-#include "../config.h"
+#include "../../config.h"
-#include "../timer.h"
+#include "../../timer.h"
-#include "../device.h"
+#include "../../device.h"
-#include "../intel_piix.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"
 
 

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, <mgrca8@gmail.com>
  *		Sarah Walker, <tommowalker@tommowalker.co.uk>
@@ -42,17 +42,17 @@
 #include <stdarg.h>
 #include <wchar.h>
 #define HAVE_STDARG_H
-#include "../emu.h"
+#include "../../emu.h"
-#include "../device.h"
+#include "../../cpu/cpu.h"
-#include "../cpu/cpu.h"
+#include "../../machines/machine.h"
-#include "../machine/machine.h"
+#include "../../io.h"
-#include "../io.h"
+#include "../../mem.h"
-#include "../mem.h"
+#include "../../rom.h"
-#include "../rom.h"
+#include "../../timer.h"
-#include "../dma.h"
+#include "../../device.h"
-#include "../pic.h"
+#include "../../ui/ui.h"
-#include "../timer.h"
+#include "../system/dma.h"
-#include "../ui/ui.h"
+#include "../system/pic.h"
 #include "fdd.h"
 #include "fdc.h"
 

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, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -42,14 +42,14 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
-#include "../emu.h"
+#include "../../emu.h"
-#include "../machine/machine.h"
+#include "../../machines/machine.h"
-#include "../mem.h"
+#include "../../mem.h"
-#include "../rom.h"
+#include "../../rom.h"
-#include "../config.h"
+#include "../../config.h"
-#include "../timer.h"
+#include "../../timer.h"
-#include "../ui/ui.h"
+#include "../../ui/ui.h"
-#include "../plat.h"
+#include "../../plat.h"
 #include "fdd.h"
 #include "fdd_86f.h"
 #include "fdd_fdi.h"

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, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -44,13 +44,12 @@
 #include <assert.h>
 #include <wchar.h>
 #define HAVE_STDARG_H
-#include "../emu.h"
+#include "../../emu.h"
-#include "../config.h"
+#include "../../nvr.h"
-#include "../dma.h"
+#include "../../random.h"
-#include "../nvr.h"
+#include "../../ui/ui.h"
-#include "../random.h"
+#include "../../plat.h"
-#include "../ui/ui.h"
+#include "../system/dma.h"
-#include "../plat.h"
 #include "fdd.h"
 #include "fdc.h"
 #include "fdd_86f.h"

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, <decwiz@yahoo.com>
  *
@@ -37,7 +37,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "../emu.h"
+#include "../../emu.h"
 #include "fdd.h"
 #include "fdd_common.h"
 

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, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -42,8 +42,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "../emu.h"
+#include "../../emu.h"
-#include "../plat.h"
+#include "../../plat.h"
 #include "fdd.h"
 #include "fdd_86f.h"
 #include "fdd_img.h"

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, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -39,8 +39,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "../emu.h"
+#include "../../emu.h"
-#include "../plat.h"
+#include "../../plat.h"
 #include "fdd.h"
 #include "fdd_imd.h"
 #include "fdc.h"

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, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -46,9 +46,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "../emu.h"
+#include "../../emu.h"
-#include "../config.h"
+#include "../../plat.h"
-#include "../plat.h"
 #include "fdd.h"
 #include "fdd_img.h"
 #include "fdc.h"

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, <decwiz@yahoo.com>
  *
@@ -49,8 +49,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "../emu.h"
+#include "../../emu.h"
-#include "../plat.h"
+#include "../../plat.h"
 #include "fdd.h"
 #include "fdc.h"
 #include "fdd_common.h"

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, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -51,8 +51,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "../emu.h"
+#include "../../emu.h"
-#include "../plat.h"
+#include "../../plat.h"
 #include "fdd.h"
 #include "fdd_td0.h"
 #include "fdc.h"

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, <twilen@arabuusimiehet.com>
  *		and Vincent Joguin,
@@ -46,23 +46,14 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-
+#include "../../emu.h"
-/* IF UAE */
-/*#include "sysconfig.h"
-#include "sysdeps.h"
-#include "zfile.h"*/
-/* ELSE */
-#define xmalloc malloc
-#include "../emu.h"
 #include "fdi2raw.h"
 
 
-#undef DEBUG
+#undef _DEBUG
-#define VERBOSE
-#undef VERBOSE
 
 
-#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

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, <decwiz@yahoo.com>
  *		Sarah Walker, <tommowalker@tommowalker.co.uk>
@@ -39,8 +39,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "../../emu.h"
+#include "../../../emu.h"
-#include "../../timer.h"
+#include "../../../timer.h"
 #include "joystick.h"
 
 

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, <mgrca8@gmail.com>
  *		Sarah Walker, <tommowalker@tommowalker.co.uk>
@@ -39,8 +39,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "../../emu.h"
+#include "../../../emu.h"
-#include "../../timer.h"
+#include "../../../timer.h"
 #include "../../ports/game_dev.h"
 #include "joystick.h"
 

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, <decwiz@yahoo.com>
  *		Sarah Walker, <tommowalker@tommowalker.co.uk>
@@ -39,8 +39,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "../../emu.h"
+#include "../../../emu.h"
-#include "../../timer.h"
+#include "../../../timer.h"
 #include "../../ports/game_dev.h"
 #include "joystick.h"
 

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, <decwiz@yahoo.com>
  *		Sarah Walker, <tommowalker@tommowalker.co.uk>
@@ -60,8 +60,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "../../emu.h"
+#include "../../../emu.h"
-#include "../../timer.h"
+#include "../../../timer.h"
 #include "../../ports/game_dev.h"
 #include "joystick.h"
 

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, <decwiz@yahoo.com>
  *		Sarah Walker, <tommowalker@tommowalker.co.uk>
@@ -39,8 +39,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "../../emu.h"
+#include "../../../emu.h"
-#include "../../timer.h"
+#include "../../../timer.h"
 #include "../../ports/game_dev.h"
 #include "joystick.h"
 

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, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -42,8 +42,8 @@
 #include <stdarg.h>
 #include <wchar.h>
 #define HAVE_STDARG_H
-#include "../emu.h"
+#include "../../emu.h"
-#include "../machine/machine.h"
+#include "../../machines/machine.h"
 #include "keyboard.h"
 
 

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, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -41,16 +41,16 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include "../emu.h"
+#include "../../emu.h"
-#include "../cpu/cpu.h"
+#include "../../cpu/cpu.h"
-#include "../machine/machine.h"
+#include "../../machines/machine.h"
-#include "../io.h"
+#include "../../io.h"
-#include "../pic.h"
+#include "../../mem.h"
-#include "../pit.h"
+#include "../../timer.h"
-#include "../ppi.h"
+#include "../../device.h"
-#include "../mem.h"
+#include "../system/pic.h"
-#include "../timer.h"
+#include "../system/pit.h"
-#include "../device.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 "../../machines/m_at_t3100e.h"
-#include "../machine/m_xt_xi8088.h"
+#include "../../machines/m_xt_xi8088.h"
 
 
 #define STAT_PARITY     0x80

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, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -41,14 +41,14 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include "../emu.h"
+#include "../../emu.h"
-#include "../machine/machine.h"
+#include "../../machines/machine.h"
-#include "../io.h"
+#include "../../io.h"
-#include "../pic.h"
+#include "../../timer.h"
-#include "../pit.h"
+#include "../../device.h"
-#include "../ppi.h"
+#include "../system/pic.h"
-#include "../timer.h"
+#include "../system/pit.h"
-#include "../device.h"
+#include "../system/ppi.h"
 #include "../sound/sound.h"
 #include "../sound/snd_speaker.h"
 #include "../video/video.h"

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, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -52,8 +52,8 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
-#include "../emu.h"
+#include "../../emu.h"
-#include "../device.h"
+#include "../../device.h"
 #include "mouse.h"
 
 

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, <decwiz@yahoo.com>
  *
@@ -90,12 +90,12 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "../emu.h"
+#include "../../emu.h"
-#include "../config.h"
+#include "../../config.h"
-#include "../io.h"
+#include "../../io.h"
-#include "../pic.h"
+#include "../../timer.h"
-#include "../timer.h"
+#include "../../device.h"
-#include "../device.h"
+#include "../system/pic.h"
 #include "mouse.h"
 
 

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, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -41,9 +41,9 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "../emu.h"
+#include "../../emu.h"
-#include "../config.h"
+#include "../../config.h"
-#include "../device.h"
+#include "../../device.h"
 #include "keyboard.h"
 #include "mouse.h"
 

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, <decwiz@yahoo.com>
  *
@@ -51,10 +51,10 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include "../emu.h"
+#include "../../emu.h"
-#include "../config.h"
+#include "../../config.h"
-#include "../device.h"
+#include "../../device.h"
-#include "../timer.h"
+#include "../../timer.h"
 #include "../ports/serial.h"
 #include "mouse.h"
 

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 <wchar.h>
 #include <time.h>
 #define HAVE_STDARG_H
-#include "../emu.h"
+#include "../../emu.h"
-#include "../config.h"
+#include "../../config.h"
-#include "../machine/machine.h"
+#include "../../machines/machine.h"
-#include "../io.h"
+#include "../../io.h"
-#include "../mem.h"
+#include "../../mem.h"
-#include "../rom.h"
+#include "../../rom.h"
-#include "../pci.h"
+#include "../../random.h"
-#include "../pic.h"
+#include "../../device.h"
-#include "../random.h"
+#include "../../ui/ui.h"
-#include "../device.h"
+#include "../../plat.h"
-#include "../ui/ui.h"
+#include "../system/pci.h"
-#include "../plat.h"
+#include "../system/pic.h"
 #include "network.h"
 #include "net_ne2000.h"
 #include "bswap.h"

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, <decwiz@yahoo.com>
  *
@@ -53,10 +53,10 @@
 # define WIN32
 #endif
 #include <pcap/pcap.h>
-#include "../emu.h"
+#include "../../emu.h"
-#include "../config.h"
+#include "../../config.h"
-#include "../device.h"
+#include "../../device.h"
-#include "../plat.h"
+#include "../../plat.h"
 #include "network.h"
 
 

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, <decwiz@yahoo.com>
  *
@@ -51,10 +51,10 @@
 #include <wchar.h>
 #include "slirp/slirp.h"
 #include "slirp/queue.h"
-#include "../emu.h"
+#include "../../emu.h"
-#include "../config.h"
+#include "../../config.h"
-#include "../device.h"
+#include "../../device.h"
-#include "../plat.h"
+#include "../../plat.h"
 #include "network.h"
 
 

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, <decwiz@yahoo.com>
  *
@@ -58,10 +58,10 @@
 # include <ctype.h>
 #endif
 #define HAVE_STDARG_H
-#include "../emu.h"
+#include "../../emu.h"
-#include "../device.h"
+#include "../../device.h"
-#include "../ui/ui.h"
+#include "../../ui/ui.h"
-#include "../plat.h"
+#include "../../plat.h"
 #include "network.h"
 #include "net_ne2000.h"
 

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, <decwiz@yahoo.com>
  *
@@ -57,8 +57,8 @@
 #endif
 #include <pcap/pcap.h>
 #include <time.h>
-#include "../emu.h"
+#include "../../emu.h"
-#include "../plat.h"
+#include "../../plat.h"
 
 
 static void	*pcap_handle;		/* handle to WinPcap DLL */