Another cleanup run.

src/86box.h

@@ -8,7 +8,7 @@
  *
  *		Main emulator include file.
  *
- * Version:	@(#)86box.h	1.0.3	2017/10/09
+ * Version:	@(#)86box.h	1.0.4	2017/10/16
  *
  * Authors:	Miran Grca, <mgrca8@gmail.com>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
@@ -20,6 +20,11 @@
 # define EMU_86BOX_H
 
 
+/* Configuration values. */
+#define SERIAL_MAX	2
+#define PARALLEL_MAX	1
+
+
 #if defined(ENABLE_BUSLOGIC_LOG) || \
     defined(ENABLE_CDROM_LOG) || \
     defined(ENABLE_D86F_LOG) || \
@@ -45,4 +50,58 @@
 #define SCREENSHOT_PATH L"screenshots"
 
 
+/* Global variables. */
+#ifdef ENABLE_LOG_TOGGLES
+extern int buslogic_do_log;
+extern int cdrom_do_log;
+extern int d86f_do_log;
+extern int fdc_do_log;
+extern int ide_do_log;
+extern int serial_do_log;
+extern int nic_do_log;
+#endif
+
+extern int suppress_overscan;
+extern int invert_display;
+extern int scale;
+extern int vid_api;
+extern int vid_resize;
+extern int winsizex,winsizey;
+
+extern wchar_t exe_path[1024];
+extern wchar_t cfg_path[1024];
+
+extern uint64_t timer_freq;		/* plat.h */
+extern int infocus;			/* plat.h */
+
+extern int dump_on_exit;
+extern int start_in_fullscreen;
+extern int window_w, window_h, window_x, window_y, window_remember;
+
+
+/* Function prototypes. */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void	pclog(const char *format, ...);
+extern void	fatal(const char *format, ...);
+extern int	pc_init_modules(void);
+extern int	pc_init(int argc, wchar_t *argv[]);
+extern void	pc_close(void);
+extern void	pc_reset_hard_close(void);
+extern void	pc_reset_hard_init(void);
+extern void	pc_reset_hard(void);
+extern void	pc_reset(int hard);
+extern void	pc_full_speed(void);
+extern void	pc_speed_changed(void);
+extern void	pc_send_cad(void);
+extern void	pc_send_cae(void);
+extern void	pc_run(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif	/*EMU_86BOX_H*/

src/bugger.c

@@ -44,7 +44,7 @@
  *		configuration register (CTRL_SPCFG bit set) but have to
  *		remember that stuff first...
  *
- * Version:	@(#)bugger.c	1.0.7	2017/10/09
+ * Version:	@(#)bugger.c	1.0.8	2017/10/16
  *
  * Author:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Copyright 1989-2017 Fred N. van Kempen.
@@ -53,6 +53,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "86box.h"
 #include "ibm.h"
 #include "io.h"
 #include "ui.h"

src/cdrom/cdrom_dosbox.cpp

@@ -100,6 +100,7 @@ void CDROM_Interface_Image::InitNewMedia()
 
 bool CDROM_Interface_Image::SetDevice(char* path, int forceCD)
 {
+	(void)forceCD;
 	if (LoadCueSheet(path)) return true;
 	if (LoadIsoFile(path)) return true;
 	
@@ -174,6 +175,7 @@ bool CDROM_Interface_Image::ReadSectors(PhysPt buffer, bool raw, unsigned long s
 
 bool CDROM_Interface_Image::LoadUnloadMedia(bool unload)
 {
+	(void)unload;
 	return true;
 }
 

src/cdrom/cdrom_image.cc

@@ -57,6 +57,8 @@ void cdrom_image_log(const char *format, ...)
 		va_end(ap);
 		fflush(stdout);
    }
+#else
+   (void)format;
 #endif
 }
 
@@ -211,7 +213,7 @@ static int image_ready(uint8_t id)
         return 1;
 }
 
-static int image_get_last_block(uint8_t id, uint8_t starttrack, int msf, int maxlen, int single)
+static int image_get_last_block(uint8_t id, UNUSED(uint8_t starttrack), UNUSED(int msf), UNUSED(int maxlen), UNUSED(int single))
 {
         int c;
         uint32_t lb=0;
@@ -321,12 +323,12 @@ static uint8_t image_getcurrentsubchannel(uint8_t id, uint8_t *b, int msf)
         return ret;
 }
 
-static void image_eject(uint8_t id)
+static void image_eject(UNUSED(uint8_t id))
 {
     return;
 }
 
-static void image_load(uint8_t id)
+static void image_load(UNUSED(uint8_t id))
 {
     return;
 }
@@ -965,7 +967,7 @@ static int image_status(uint8_t id)
         return CD_STATUS_DATA_ONLY;
 }
 
-void image_reset(uint8_t id)
+void image_reset(UNUSED(uint8_t id))
 {
 	return;
 }
@@ -998,7 +1000,7 @@ int image_open(uint8_t id, wchar_t *fn)
 		swprintf(cdrom_image[id].image_path, sizeof(cdrom_image[id].image_path)/sizeof(wchar_t), L"%ls", fn);
 	}
 
-	if (! wcscasecmp(get_extension_w(fn), L"ISO"))
+	if (! wcscasecmp(plat_get_extension(fn), L"ISO"))
 	{
 		cdrom_image[id].image_is_iso = 1;
 	}

src/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.4	2017/10/09
+ * Version:	@(#)cdrom_null.c	1.0.5	2017/10/16
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -21,6 +21,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "cdrom.h"
 

src/config.c

@@ -8,7 +8,7 @@
  *
  *		Configuration file handler.
  *
- * Version:	@(#)config.c	1.0.21	2017/10/13
+ * Version:	@(#)config.c	1.0.22	2017/10/16
  *
  * Authors:	Sarah Walker,
  *		Miran Grca, <mgrca8@gmail.com>
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <wchar.h>
 #include <inttypes.h>
+#include "86box.h"
 #include "ibm.h"
 #include "cpu/cpu.h"
 #include "nvr.h"
@@ -1988,58 +1989,3 @@ config_set_wstring(char *head, char *name, wchar_t *val)
     memcpy(ent->wdata, val, sizeof_w(ent->wdata));
     wcstombs(ent->data, ent->wdata, sizeof(ent->data));
 }
-
-
-/* FIXME: should be moved elsewhere. --FvK */
-wchar_t *
-get_filename_w(wchar_t *s)
-{
-    int c = wcslen(s) - 1;
-
-    while (c > 0) {
-	if (s[c] == L'/' || s[c] == L'\\')
-	   return(&s[c+1]);
-       c--;
-    }
-
-    return(s);
-}
-
-
-/* FIXME: should be moved elsewhere. --FvK */
-void
-append_filename_w(wchar_t *dest, wchar_t *s1, wchar_t *s2, int size)
-{
-    wcscat(dest, s1);
-    wcscat(dest, s2);
-}
-
-
-/* FIXME: should be moved elsewhere. --FvK */
-void
-put_backslash_w(wchar_t *s)
-{
-    int c = wcslen(s) - 1;
-
-    if (s[c] != L'/' && s[c] != L'\\')
-	   s[c] = L'/';
-}
-
-
-/* FIXME: should be moved elsewhere. --FvK */
-wchar_t
-*get_extension_w(wchar_t *s)
-{
-    int c = wcslen(s) - 1;
-
-    if (c <= 0)
-	return(s);
-
-    while (c && s[c] != L'.')
-		c--;
-
-    if (!c)
-	return(&s[wcslen(s)]);
-
-    return(&s[c+1]);
-}

src/config.h

@@ -8,7 +8,7 @@
  *
  *		Configuration file handler header.
  *
- * Version:	@(#)config.h	1.0.3	2017/10/13
+ * Version:	@(#)config.h	1.0.4	2017/10/16
  *
  * Authors:	Sarah Walker,
  *		Miran Grca, <mgrca8@gmail.com>
@@ -49,12 +49,6 @@ extern void	config_set_mac(char *head, char *name, int val);
 extern void	config_set_string(char *head, char *name, char *val);
 extern void	config_set_wstring(char *head, char *name, wchar_t *val);
 
-extern wchar_t	*get_filename_w(wchar_t *s);
-extern void	append_filename_w(wchar_t *dest, wchar_t *s1, wchar_t *s2, int size);
-extern void	put_backslash_w(wchar_t *s);
-extern wchar_t	*get_extension_w(wchar_t *s);
-
-
 #ifdef __cplusplus
 }
 #endif

src/cpu/386.c

@@ -7,6 +7,7 @@
 #ifndef INFINITY
 # define INFINITY   (__builtin_inff())
 #endif
+#include "../86box.h"
 #include "../ibm.h"
 #include "cpu.h"
 #include "x86.h"

src/cpu/386_dynarec.c

@@ -7,6 +7,7 @@
 #ifndef INFINITY
 # define INFINITY   (__builtin_inff())
 #endif
+#include "../86box.h"
 #include "../ibm.h"
 #include "cpu.h"
 #include "x86.h"

src/cpu/386_dynarec_ops.c

@@ -6,6 +6,7 @@
 #ifndef INFINITY
 # define INFINITY   (__builtin_inff())
 #endif
+#include "../86box.h"
 #include "../ibm.h"
 #include "cpu.h"
 #include "x86.h"

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	2017/10/12
+ * Version:	@(#)808x.c	1.0.5	2017/10/16
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -30,6 +30,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "cpu.h"
 #include "x86.h"

src/cpu/codegen.c

@@ -2,6 +2,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../mem.h"
 #include "x86_ops.h"

src/cpu/codegen_ops.c

@@ -2,6 +2,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../mem.h"
 #include "x86.h"

src/cpu/codegen_timing_486.c

@@ -2,6 +2,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../mem.h"
 #include "cpu.h"

src/cpu/codegen_timing_686.c

@@ -12,6 +12,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../mem.h"
 #include "cpu.h"

src/cpu/codegen_timing_common.c

@@ -2,6 +2,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "codegen_timing_common.h"
 

src/cpu/codegen_timing_pentium.c

@@ -13,6 +13,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../mem.h"
 #include "cpu.h"

src/cpu/codegen_timing_winchip.c

@@ -2,6 +2,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "cpu.h"
 #include "x86.h"

src/cpu/codegen_x86-64.c

@@ -5,6 +5,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../mem.h"
 #include "cpu.h"

src/cpu/codegen_x86.c

@@ -5,6 +5,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../mem.h"
 #include "cpu.h"

src/cpu/cpu.c

@@ -8,7 +8,7 @@
  *
  *		CPU type handler.
  *
- * Version:	@(#)cpu.c	1.0.4	2017/10/14
+ * Version:	@(#)cpu.c	1.0.5	2017/10/16
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		leilei,
@@ -22,6 +22,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "cpu.h"
 #include "../device.h"

src/cpu/x86_ops.h

@@ -5,7 +5,7 @@
 #define _X86_OPS_H
 
 
-#define UNUSED(x)	(void)(x)
+#define UN_USED(x)	(void)(x)
 
 
 typedef int (*OpFn)(uint32_t fetchdat);

src/cpu/x86_ops_call.h

@@ -61,7 +61,7 @@ static int opCALL_far_w(uint32_t fetchdat)
 {
         uint32_t old_cs, old_pc;
         uint16_t new_cs, new_pc;
-        int cycles_old = cycles; UNUSED(cycles_old);
+        int cycles_old = cycles; UN_USED(cycles_old);
         
         new_pc = getwordf();
         new_cs = getword();                             if (cpu_state.abrt) return 1;
@@ -77,7 +77,7 @@ static int opCALL_far_l(uint32_t fetchdat)
 {
         uint32_t old_cs, old_pc;
         uint32_t new_cs, new_pc;
-        int cycles_old = cycles; UNUSED(cycles_old);
+        int cycles_old = cycles; UN_USED(cycles_old);
                 
         new_pc = getlong();
         new_cs = getword();                             if (cpu_state.abrt) return 1;
@@ -95,7 +95,7 @@ static int opFF_w_a16(uint32_t fetchdat)
 {
         uint16_t old_cs, new_cs;
         uint32_t old_pc, new_pc;
-        int cycles_old = cycles; UNUSED(cycles_old);
+        int cycles_old = cycles; UN_USED(cycles_old);
         
         uint16_t temp;
         
@@ -172,7 +172,7 @@ static int opFF_w_a32(uint32_t fetchdat)
 {
         uint16_t old_cs, new_cs;
         uint32_t old_pc, new_pc;
-        int cycles_old = cycles; UNUSED(cycles_old);
+        int cycles_old = cycles; UN_USED(cycles_old);
         
         uint16_t temp;
         
@@ -250,7 +250,7 @@ static int opFF_l_a16(uint32_t fetchdat)
 {
         uint16_t old_cs, new_cs;
         uint32_t old_pc, new_pc;
-        int cycles_old = cycles; UNUSED(cycles_old);
+        int cycles_old = cycles; UN_USED(cycles_old);
                 
         uint32_t temp;
         
@@ -327,7 +327,7 @@ static int opFF_l_a32(uint32_t fetchdat)
 {
         uint16_t old_cs, new_cs;
         uint32_t old_pc, new_pc;
-        int cycles_old = cycles; UNUSED(cycles_old);
+        int cycles_old = cycles; UN_USED(cycles_old);
                 
         uint32_t temp;
         

src/cpu/x86_ops_int.h

@@ -1,6 +1,6 @@
 static int opINT3(uint32_t fetchdat)
 {
-        int cycles_old = cycles; UNUSED(cycles_old);
+        int cycles_old = cycles; UN_USED(cycles_old);
         if ((cr0 & 1) && (eflags & VM_FLAG) && (IOPL != 3))
         {
                 x86gpf(NULL,0);
@@ -14,7 +14,7 @@ static int opINT3(uint32_t fetchdat)
 
 static int opINT1(uint32_t fetchdat)
 {
-        int cycles_old = cycles; UNUSED(cycles_old);
+        int cycles_old = cycles; UN_USED(cycles_old);
         if ((cr0 & 1) && (eflags & VM_FLAG) && (IOPL != 3))
         {
                 x86gpf(NULL,0);
@@ -28,7 +28,7 @@ static int opINT1(uint32_t fetchdat)
 
 static int opINT(uint32_t fetchdat)
 {
-        int cycles_old = cycles; UNUSED(cycles_old);
+        int cycles_old = cycles; UN_USED(cycles_old);
         uint8_t temp = getbytef();
 
         if ((cr0 & 1) && (eflags & VM_FLAG) && (IOPL != 3))
@@ -70,7 +70,7 @@ static int opINT(uint32_t fetchdat)
 
 static int opINTO(uint32_t fetchdat)
 {
-        int cycles_old = cycles; UNUSED(cycles_old);
+        int cycles_old = cycles; UN_USED(cycles_old);
         
         if ((cr0 & 1) && (eflags & VM_FLAG) && (IOPL != 3))
         {

src/cpu/x86_ops_ret.h

@@ -44,7 +44,7 @@
 
 static int opRETF_a16(uint32_t fetchdat)
 {
-        int cycles_old = cycles; UNUSED(cycles_old);
+        int cycles_old = cycles; UN_USED(cycles_old);
         
         CPU_BLOCK_END();
         RETF_a16(0);
@@ -55,7 +55,7 @@ static int opRETF_a16(uint32_t fetchdat)
 }
 static int opRETF_a32(uint32_t fetchdat)
 {
-        int cycles_old = cycles; UNUSED(cycles_old);
+        int cycles_old = cycles; UN_USED(cycles_old);
         
         CPU_BLOCK_END();
         RETF_a32(0);
@@ -68,7 +68,7 @@ static int opRETF_a32(uint32_t fetchdat)
 static int opRETF_a16_imm(uint32_t fetchdat)
 {
         uint16_t offset = getwordf();
-        int cycles_old = cycles; UNUSED(cycles_old);
+        int cycles_old = cycles; UN_USED(cycles_old);
 
         CPU_BLOCK_END();
         RETF_a16(offset);
@@ -80,7 +80,7 @@ static int opRETF_a16_imm(uint32_t fetchdat)
 static int opRETF_a32_imm(uint32_t fetchdat)
 {
         uint16_t offset = getwordf();
-        int cycles_old = cycles; UNUSED(cycles_old);
+        int cycles_old = cycles; UN_USED(cycles_old);
 
         CPU_BLOCK_END();
         RETF_a32(offset);
@@ -92,7 +92,7 @@ static int opRETF_a32_imm(uint32_t fetchdat)
 
 static int opIRET_286(uint32_t fetchdat)
 {
-        int cycles_old = cycles; UNUSED(cycles_old);
+        int cycles_old = cycles; UN_USED(cycles_old);
         
         if ((cr0 & 1) && (eflags & VM_FLAG) && (IOPL != 3))
         {
@@ -137,7 +137,7 @@ static int opIRET_286(uint32_t fetchdat)
 
 static int opIRET(uint32_t fetchdat)
 {
-        int cycles_old = cycles; UNUSED(cycles_old);
+        int cycles_old = cycles; UN_USED(cycles_old);
         
         if ((cr0 & 1) && (eflags & VM_FLAG) && (IOPL != 3))
         {
@@ -214,7 +214,7 @@ static int opIRET(uint32_t fetchdat)
 
 static int opIRETD(uint32_t fetchdat)
 {
-        int cycles_old = cycles; UNUSED(cycles_old);
+        int cycles_old = cycles; UN_USED(cycles_old);
         
         if ((cr0 & 1) && (eflags & VM_FLAG) && (IOPL != 3))
         {

src/cpu/x86seg.c

@@ -8,7 +8,7 @@
  *
  *		x86 CPU segment emulation.
  *
- * Version:	@(#)x86seg.c	1.0.3	2017/10/12
+ * Version:	@(#)x86seg.c	1.0.4	2017/10/16
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../mem.h"
 #include "../nvr.h"

src/cpu/x87.c

@@ -4,6 +4,7 @@
 #include <wchar.h>
 #define fplog 0
 #include <math.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../pic.h"
 #include "x86.h"

src/device.c

@@ -9,10 +9,11 @@
  *		Implementation of the generic device interface to handle
  *		all devices attached to the emulator.
  *
- * Version:	@(#)device.c	1.0.4	2017/10/04
+ * Version:	@(#)device.c	1.0.5	2017/10/16
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
+ *
  *		Copyright 2008-2016 Sarah Walker.
  *		Copyright 2016,2017 Miran Grca.
  */
@@ -20,6 +21,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "86box.h"
 #include "ibm.h"
 #include "cpu/cpu.h"
 #include "config.h"

src/disk/hdc.c

@@ -8,10 +8,11 @@
  *
  *		Common code to handle all sorts of disk controllers.
  *
- * Version:	@(#)hdc.c	1.0.3	2017/10/04
+ * Version:	@(#)hdc.c	1.0.4	2017/10/16
  *
  * Authors:	Miran Grca, <mgrca8@gmail.com>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
+ *
  *		Copyright 2016,2017 Miran Grca.
  *		Copyright 2017 Fred N. van Kempen.
  */
@@ -19,6 +20,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../cpu/cpu.h"
 #include "../device.h"

src/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.4	2017/10/09
+ * Version:	@(#)hdc_esdi_at.c	1.0.5	2017/10/16
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -26,6 +26,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../device.h"
 #include "../io.h"

src/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.6	2017/10/09
+ * Version:	@(#)hdc_esdi_mca.c	1.0.7	2017/10/16
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
@@ -65,6 +65,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../device.h"
 #include "../dma.h"

src/disk/hdc_mfm_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:	@(#)hdd_mfm_at.c	1.0.8	2017/10/14
+ * Version:	@(#)hdd_mfm_at.c	1.0.9	2017/10/16
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
@@ -28,6 +28,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../device.h"
 #include "../io.h"

src/disk/hdc_mfm_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:	@(#)hdd_mfm_xt.c	1.0.9	2017/10/11
+ * Version:	@(#)hdd_mfm_xt.c	1.0.10	2017/10/16
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
@@ -57,6 +57,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../device.h"
 #include "../dma.h"

src/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.8	2017/10/09
+ * Version:	@(#)hdc_xtide.c	1.0.9	2017/10/16
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -36,6 +36,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../io.h"
 #include "../mem.h"

src/disk/hdd.c

@@ -8,7 +8,7 @@
  *
  *		Common code to handle all sorts of hard disk images.
  *
- * Version:	@(#)hdd.c	1.0.4	2017/10/09
+ * Version:	@(#)hdd.c	1.0.5	2017/10/16
  *
  * Authors:	Miran Grca, <mgrca8@gmail.com>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
@@ -20,6 +20,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../ui.h"
 #include "hdd.h"

src/disk/hdd_image.c

@@ -8,7 +8,7 @@
  *
  *		Handling of hard disk image files.
  *
- * Version:	@(#)hdd_image.c	1.0.5	2017/11/13
+ * Version:	@(#)hdd_image.c	1.0.5	2017/10/16
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -28,6 +28,7 @@
 #include <stdarg.h>
 #include <wchar.h>
 #include <errno.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../plat.h"
 #include "hdd.h"

src/disk/hdd_table.c

@@ -9,7 +9,7 @@
  *		Implementation of the IDE emulation for hard disks and ATAPI
  *		CD-ROM devices.
  *
- * Version:	@(#)hdd_table.c	1.0.3	2017/09/30
+ * Version:	@(#)hdd_table.c	1.0.4	2017/10/16
  *
  * Authors:	Miran Grca, <mgrca8@gmail.com>
  *		Fred N. van Kempen, <decwiz@yahoo.com>

src/dma.c

@@ -8,10 +8,11 @@
  *
  *		Implementation of the Intel DMA controllers.
  *
- * Version:	@(#)dma.c	1.0.3	2017/09/24
+ * Version:	@(#)dma.c	1.0.4	2017/10/16
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
+ *
  *		Copyright 2008-2017 Sarah Walker.
  *		Copyright 2016,2017 Miran Grca.
  */
@@ -19,6 +20,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "86box.h"
 #include "ibm.h"
 #include "cpu/x86.h"
 #include "mem.h"

src/floppy/fdc.c

@@ -9,10 +9,11 @@
  *		Implementation of the NEC uPD-765 and compatible floppy disk
  *		controller.
  *
- * Version:	@(#)fdc.c	1.0.5	2017/10/09
+ * Version:	@(#)fdc.c	1.0.6	2017/10/16
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
+ *
  *		Copyright 2008-2017 Sarah Walker.
  *		Copyright 2016,2017 Miran Grca.
  */
@@ -21,6 +22,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../io.h"
 #include "../mem.h"

src/floppy/fdd.c

@@ -8,10 +8,11 @@
  *
  *		Implementation of the floppy drive emulation.
  *
- * Version:	@(#)fdd.c	1.0.3	2017/09/24
+ * Version:	@(#)fdd.c	1.0.4	2017/10/16
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
+ *
  *		Copyright 2008-2017 Sarah Walker.
  *		Copyright 2016,2017 Miran Grca.
  */
@@ -19,6 +20,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "floppy.h"
 #include "fdc.h"

src/floppy/fdi2raw.c

@@ -30,6 +30,7 @@
 #include "zfile.h"*/
 /* ELSE */
 #define xmalloc malloc
+#include "../86box.h"
 #include "../ibm.h"
 #include "fdi2raw.h"
 

src/floppy/floppy.c

@@ -9,7 +9,7 @@
  *		Generic floppy disk interface that communicates with the
  *		other handlers.
  *
- * Version:	@(#)floppy.c	1.0.8	2017/10/12
+ * Version:	@(#)floppy.c	1.0.10	2017/10/16
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -21,6 +21,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../mem.h"
 #include "../rom.h"
@@ -135,7 +136,7 @@ void floppy_load(int drive, wchar_t *fn)
         wchar_t *p;
         FILE *f;
         if (!fn) return;
-        p = get_extension_w(fn);
+        p = plat_get_extension(fn);
         if (!p) return;
         f = plat_fopen(fn, L"rb");
         if (!f) return;

src/floppy/floppy_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:	@(#)floppy_86f.c	1.0.7	2017/10/12
+ * Version:	@(#)floppy_86f.c	1.0.8	2017/10/16
  *
  * Author:	Miran Grca, <mgrca8@gmail.com>
  *		Copyright 2016,2017 Miran Grca.
@@ -23,6 +23,7 @@
 #include <assert.h>
 #include <wchar.h>
 #include "../lzf/lzf.h"
+#include "../86box.h"
 #include "../ibm.h"
 #include "../config.h"
 #include "../dma.h"

src/floppy/floppy_common.c

@@ -8,7 +8,7 @@
  *
  *		Shared code for all the floppy modules.
  *
- * Version:	@(#)floppy_common.c	1.0.2	2017/09/24
+ * Version:	@(#)floppy_common.c	1.0.3	2017/10/16
  *
  * Author:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Copyright 2017 Fred N. van Kempen.
@@ -18,6 +18,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../floppy/floppy.h"
 #include "floppy_common.h"

src/floppy/floppy_fdi.c

@@ -9,7 +9,7 @@
  *		Implementation of the FDI floppy stream image format
  *		interface to the FDI2RAW module.
  *
- * Version:	@(#)floppy_fdi.c	1.0.3	2017/10/12
+ * Version:	@(#)floppy_fdi.c	1.0.4	2017/10/16
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -21,6 +21,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../plat.h"
 #include "floppy.h"

src/floppy/floppy_imd.c

@@ -8,7 +8,7 @@
  *
  *		Implementation of the IMD floppy image format.
  *
- * Version:	@(#)floppy_imd.c	1.0.3	2017/10/12
+ * Version:	@(#)floppy_imd.c	1.0.4	2017/10/16
  *
  * Author:	Miran Grca, <mgrca8@gmail.com>
  *		Copyright 2016,2017 Miran Grca.
@@ -18,6 +18,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../plat.h"
 #include "floppy.h"

src/floppy/floppy_img.c

@@ -9,7 +9,7 @@
  *		Implementation of the raw sector-based floppy image format,
  *		as well as the Japanese FDI, CopyQM, and FDF formats.
  *
- * Version:	@(#)floppy_img.c	1.0.3	2017/10/12
+ * Version:	@(#)floppy_img.c	1.0.5	2017/10/16
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -22,6 +22,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../config.h"
 #include "../plat.h"
@@ -346,7 +347,7 @@ void img_load(int drive, wchar_t *fn)
 	uint8_t *literal;
 	int guess = 0;
 
-	ext = get_extension_w(fn);
+	ext = plat_get_extension(fn);
 
 	d86f_unregister(drive);
 

src/floppy/floppy_json.c

@@ -8,7 +8,7 @@
  *
  *		Implementation of the PCjs JSON floppy image format.
  *
- * Version:	@(#)floppy_json.c	1.0.7	2017/10/14
+ * Version:	@(#)floppy_json.c	1.0.8	2017/10/16
  *
  * Author:	Fred N. van Kempen, <decwiz@yahoo.com>
  *
@@ -19,6 +19,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../plat.h"
 #include "floppy.h"

src/floppy/floppy_td0.c

@@ -8,7 +8,7 @@
  *
  *		Implementation of the Teledisk floppy image format.
  *
- * Version:	@(#)floppy_td0.c	1.0.4	2017/10/12
+ * Version:	@(#)floppy_td0.c	1.0.5	2017/10/16
  *
  * Authors:	Milodrag Milanovic,
  *		Haruhiko OKUMURA,
@@ -42,6 +42,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../plat.h"
 #include "floppy.h"

src/game/gameport.c

@@ -6,6 +6,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../cpu/cpu.h"
 #include "../device.h"

src/game/joystick_ch_flightstick_pro.c

@@ -3,6 +3,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../device.h"
 #include "../timer.h"

src/game/joystick_standard.c

@@ -3,6 +3,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../device.h"
 #include "../timer.h"

src/game/joystick_sw_pad.c

@@ -24,6 +24,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../device.h"
 #include "../timer.h"

src/game/joystick_tm_fcs.c

@@ -3,6 +3,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../device.h"
 #include "../timer.h"

src/ibm.h

@@ -10,7 +10,7 @@
  *
  * !!!NOTE!!!	The goal is to GET RID of this file.  Do NOT add stuff !!
  *
- * Version:	@(#)ibm.h	1.0.9	2017/10/15
+ * Version:	@(#)ibm.h	1.0.10	2017/10/16
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -285,6 +285,7 @@ extern int CPUID;
 
 extern int cpl_override;
 
+
 /*Timer*/
 typedef struct PIT_nr
 {
@@ -382,9 +383,8 @@ extern int driveempty[4];
 #define MDA ((gfxcard==GFX_MDA || gfxcard==GFX_HERCULES || gfxcard==GFX_HERCULESPLUS || gfxcard==GFX_INCOLOR || gfxcard==GFX_GENIUS) && (romset<ROM_TANDY || romset>=ROM_IBMAT))
 #define VGA ((gfxcard>=GFX_TVGA) && gfxcard!=GFX_COLORPLUS && gfxcard!=GFX_INCOLOR && gfxcard!=GFX_WY700 && gfxcard!=GFX_GENIUS && gfxcard!=GFX_COMPAQ_EGA && gfxcard!=GFX_SUPER_EGA && gfxcard!=GFX_HERCULESPLUS && romset!=ROM_PC1640 && romset!=ROM_PC1512 && romset!=ROM_TANDY && romset!=ROM_PC200)
 
-int GAMEBLASTER, GUS, SSI2001, voodoo_enabled, buslogic_enabled;
+int GAMEBLASTER, GUS, SSI2001, voodoo_enabled;
 extern int AMSTRAD, AT, is286, is386, PCI, TANDY;
-
 extern int hasfpu;
 
 enum
@@ -462,9 +462,6 @@ int cpuspeed;
 
 /*Video*/
 extern int egareads,egawrites;
-extern int vid_resize;
-extern int vid_api;
-extern int winsizex,winsizey;
 extern int changeframecount;
 
 
@@ -491,9 +488,6 @@ extern int gated,speakval,speakon;
 #define SND_WSS   9     /*Windows Sound System*/
 #define SND_PAS16 10    /*Pro Audio Spectrum 16*/
 
-extern wchar_t exe_path[1024];
-extern wchar_t cfg_path[1024];
-
 
 /*Keyboard*/
 extern int64_t keybsenddelay;
@@ -531,18 +525,6 @@ extern int nmi_auto_clear;
 
 extern float isa_timing, bus_timing;
 
-
-extern uint64_t timer_read(void);
-extern uint64_t timer_freq;
-
-
-extern int infocus;
-
-
-extern int dump_on_exit;
-extern int start_in_fullscreen;
-extern int window_w, window_h, window_x, window_y, window_remember;
-
 extern uint64_t pmc[2];
 
 extern uint16_t temp_seg_data[4];
@@ -560,18 +542,6 @@ extern uint64_t star;
 extern int mem_a20_state;
 
 
-#ifdef ENABLE_LOG_TOGGLES
-extern int buslogic_do_log;
-extern int cdrom_do_log;
-extern int d86f_do_log;
-extern int fdc_do_log;
-extern int ide_do_log;
-extern int serial_do_log;
-extern int nic_do_log;
-#endif
-
-extern int suppress_overscan;
-
 typedef struct PCI_RESET
 {
 	void (*pci_master_reset)(void);
@@ -589,35 +559,16 @@ extern int serial_enabled[2];
 extern int lpt_enabled, bugger_enabled;
 extern int romset;
 
-extern int invert_display;
-
 uint32_t svga_color_transform(uint32_t color);
 
-extern int scale;
-
 
 /* Function prototypes. */
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-extern void	pclog(const char *format, ...);
-extern void	fatal(const char *format, ...);
-extern wchar_t	*pc_concat(wchar_t *str);
-extern int	pc_init_modules(void);
-extern int	pc_init(int argc, wchar_t *argv[]);
-extern void	pc_close(void);
-extern void	pc_reset_hard_close(void);
-extern void	pc_reset_hard_init(void);
-extern void	pc_reset_hard(void);
-extern void	pc_full_speed(void);
-extern void	pc_speed_changed(void);
-extern void	pc_send_cad(void);
-extern void	pc_send_cae(void);
-extern void	pc_run(void);
 extern void	onesec(void);
 
-
 extern int	checkio(int port);
 extern void	codegen_block_end(void);
 extern void	codegen_reset(void);

src/intel_flash.c

@@ -8,7 +8,7 @@
  *
  *		Implementation of the Intel 2 Mbit 8-bit flash devices.
  *
- * Version:	@(#)intel_flash.c	1.0.8	2017/10/14
+ * Version:	@(#)intel_flash.c	1.0.9	2017/10/16
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -21,6 +21,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
+#include "86box.h"
 #include "ibm.h"
 #include "cpu/cpu.h"
 #include "device.h"

src/io.c

@@ -5,6 +5,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "86box.h"
 #include "ibm.h"
 #include "io.h"
 

src/keyboard.c

@@ -8,7 +8,7 @@
  *
  *		Host to guest keyboard interface and keyboard scan code sets.
  *
- * Version:	@(#)keyboard.c	1.0.4	2017/10/10
+ * Version:	@(#)keyboard.c	1.0.5	2017/10/16
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -20,6 +20,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "86box.h"
 #include "ibm.h"
 #include "plat_keyboard.h"
 #include "keyboard.h"

src/keyboard_amstrad.c

@@ -5,6 +5,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "86box.h"
 #include "ibm.h"
 #include "io.h"
 #include "mem.h"

src/keyboard_at.c

@@ -8,10 +8,11 @@
  *
  *		Intel 8042 (AT keyboard controller) emulation.
  *
- * Version:	@(#)keyboard_at.c	1.0.3	2017/09/24
+ * Version:	@(#)keyboard_at.c	1.0.4	2017/10/16
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
+ *
  *		Copyright 2008-2017 Sarah Walker.
  *		Copyright 2016,2017 Miran Grca.
  */
@@ -19,6 +20,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "86box.h"
 #include "ibm.h"
 #include "io.h"
 #include "pic.h"

src/keyboard_olim24.c

@@ -3,6 +3,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
+#include "86box.h"
 #include "ibm.h"
 #include "io.h"
 #include "mem.h"

src/keyboard_pcjr.c

@@ -5,6 +5,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "86box.h"
 #include "ibm.h"
 #include "io.h"
 #include "mem.h"

src/keyboard_xt.c

@@ -5,6 +5,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "86box.h"
 #include "ibm.h"
 #include "io.h"
 #include "mem.h"

src/machine/machine.c

@@ -8,7 +8,7 @@
  *
  *		Handling of the emulated machines.
  *
- * Version:	@(#)machine.c	1.0.19	2017/10/12
+ * Version:	@(#)machine.c	1.0.20	2017/10/16
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -22,6 +22,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../cpu/cpu.h"
 #include "../mem.h"

src/machine/machine_amstrad.c

@@ -3,6 +3,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../io.h"
 #include "../nmi.h"

src/machine/machine_at.c

@@ -2,6 +2,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../pic.h"
 #include "../pit.h"

src/machine/machine_at_430fx.c

@@ -8,7 +8,7 @@
  *
  *		Implementation of the Intel 430FX PCISet chip.
  *
- * Version:	@(#)machine_at_430fx.c	1.0.6	2017/10/07
+ * Version:	@(#)machine_at_430fx.c	1.0.7	2017/10/16
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -20,6 +20,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../mem.h"
 #include "../memregs.h"

src/machine/machine_at_430hx.c

@@ -8,7 +8,7 @@
  *
  *		Implementation of the Intel 430HX PCISet chip.
  *
- * Version:	@(#)machine_at_430hx.c	1.0.6	2017/10/07
+ * Version:	@(#)machine_at_430hx.c	1.0.7	2017/10/16
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -20,6 +20,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../io.h"
 #include "../mem.h"

src/machine/machine_at_430lx_nx.c

@@ -8,7 +8,7 @@
  *
  *		Implementation of the Intel 430LX and 430NX PCISet chips.
  *
- * Version:	@(#)machine_at_430lx_nx.c	1.0.6	2017/10/07
+ * Version:	@(#)machine_at_430lx_nx.c	1.0.7	2017/10/16
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -20,6 +20,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../mem.h"
 #include "../memregs.h"

src/machine/machine_at_430vx.c

@@ -8,7 +8,7 @@
  *
  *		Implementation of the Intel 430VX PCISet chip.
  *
- * Version:	@(#)machine_at_430vx.c	1.0.7	2017/10/07
+ * Version:	@(#)machine_at_430vx.c	1.0.8	2017/10/16
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -20,6 +20,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../io.h"
 #include "../pci.h"

src/machine/machine_at_440fx.c

@@ -8,7 +8,7 @@
  *
  *		Implementation of the Intel 440FX PCISet chip.
  *
- * Version:	@(#)machine_at_440fx.c	1.0.6	2017/10/07
+ * Version:	@(#)machine_at_440fx.c	1.0.7	2017/10/16
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -20,6 +20,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../io.h"
 #include "../pci.h"

src/machine/machine_at_ali1429.c

@@ -5,6 +5,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../cpu/cpu.h"
 #include "../io.h"

src/machine/machine_at_commodore.c

@@ -2,6 +2,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../io.h"
 #include "../lpt.h"

src/machine/machine_at_compaq.c

@@ -5,6 +5,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../cpu/cpu.h"
 #include "../mem.h"

src/machine/machine_at_headland.c

@@ -5,6 +5,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../cpu/cpu.h"
 #include "../io.h"

src/machine/machine_at_neat.c

@@ -6,6 +6,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../io.h"
 #include "machine.h"

src/machine/machine_at_opti495.c

@@ -255,6 +255,7 @@ SeeAlso: #P0178,#P0187
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../cpu/cpu.h"
 #include "../io.h"

src/machine/machine_at_scat.c

@@ -10,7 +10,7 @@
  *
  *		Re-worked version based on the 82C235 datasheet and errata.
  *
- * Version:	@(#)at_scat.c	1.0.2	2017/10/07
+ * Version:	@(#)at_scat.c	1.0.3	2017/10/16
  *
  * Authors:	Original by GreatPsycho for PCem.
  *		Fred N. van Kempen, <decwiz@yahoo.com>
@@ -21,6 +21,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../cpu/cpu.h"
 #include "../cpu/x86.h"

src/machine/machine_at_sis_85c471.c

@@ -9,7 +9,7 @@
  *		SiS sis85c471 Super I/O Chip
  *		Used by DTK PKM-0038S E-2
  *
- * Version:	@(#)sis85c471.c	1.0.6	2017/10/07
+ * Version:	@(#)sis85c471.c	1.0.7	2017/10/16
  *
  * Author:	Miran Grca, <mgrca8@gmail.com>
  *
@@ -19,6 +19,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../io.h"
 #include "../memregs.h"

src/machine/machine_at_sis_85c496.c

@@ -6,6 +6,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../cpu/cpu.h"
 #include "../io.h"

src/machine/machine_at_sis_85c50x.c

@@ -6,7 +6,7 @@
  *
  *		Emulation of the SiS 50x PCI chips.
  *
- * Version:	@(#)machine_at_sis_85c50x.c	1.0.3	2017/10/07
+ * Version:	@(#)machine_at_sis_85c50x.c	1.0.4	2017/10/16
  *
  * Author:	Miran Grca, <mgrca8@gmail.com>
  *
@@ -17,6 +17,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../io.h"
 #include "../pci.h"

src/machine/machine_at_wd76c10.c

@@ -5,6 +5,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../io.h"
 #include "../mem.h"

src/machine/machine_common.c

@@ -2,6 +2,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../dma.h"
 #include "../pic.h"

src/machine/machine_europc.c

@@ -5,6 +5,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../io.h"
 #include "../nmi.h"

src/machine/machine_olivetti_m24.c

@@ -5,6 +5,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../io.h"
 #include "../nmi.h"

src/machine/machine_pcjr.c

@@ -2,6 +2,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../nmi.h"
 #include "../pic.h"

src/machine/machine_ps1.c

@@ -5,6 +5,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../cpu/cpu.h"
 #include "../io.h"

src/machine/machine_ps2_isa.c

@@ -2,6 +2,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../cpu/cpu.h"
 #include "../io.h"

src/machine/machine_ps2_mca.c

@@ -2,6 +2,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../cpu/cpu.h"
 #include "../cpu/x86.h"

src/machine/machine_tandy.c

@@ -2,6 +2,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../nmi.h"
 #include "../mem.h"

src/machine/machine_xt.c

@@ -2,6 +2,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../nmi.h"
 #include "../pit.h"

src/machine/machine_xt_laserxt.c

@@ -3,6 +3,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../cpu/cpu.h"
 #include "../io.h"

src/mcr.c

@@ -5,6 +5,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "86box.h"
 #include "ibm.h"
 
 

src/mem.c

@@ -6,6 +6,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
+#include "86box.h"
 #include "ibm.h"
 #include "cpu/cpu.h"
 #include "cpu/x86_ops.h"

src/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.2	2017/09/24
+ * Version:	@(#)memregs.c	1.0.3	2017/10/16
  *
  * Author:	Miran Grca, <mgrca8@gmail.com>
  *		Copyright 2016-2017 Miran Grca.
@@ -18,6 +18,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <wchar.h>
+#include "86box.h"
 #include "ibm.h"
 #include "io.h"
 #include "memregs.h"

src/mouse_bus.c

@@ -32,10 +32,11 @@
  *		Based on an early driver for MINIX 1.5.
  *		Based on the 86Box PS/2 mouse driver as a framework.
  *
- * Version:	@(#)mouse_bus.c	1.0.9	2017/09/24
+ * Version:	@(#)mouse_bus.c	1.0.10	2017/10/16
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		TheCollector1995
+ *
  *		Copyright 1989-2017 Fred N. van Kempen.
  */
 #include <stdio.h>
@@ -43,6 +44,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
+#include "86box.h"
 #include "ibm.h"
 #include "io.h"
 #include "pic.h"

src/network/net_ne2000.c

@@ -10,7 +10,7 @@
  *
  * NOTE:	The file will also implement an NE1000 for 8-bit ISA systems.
  *
- * Version:	@(#)net_ne2000.c	1.0.18	2017/10/09
+ * Version:	@(#)net_ne2000.c	1.0.19	2017/10/16
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Peter Grehan, grehan@iprg.nokia.com>
@@ -27,6 +27,7 @@
 #include <stdarg.h>
 #include <wchar.h>
 #include <time.h>
+#include "../86box.h"
 #include "../config.h"
 #include "../ibm.h"
 #include "../io.h"

src/network/net_pcap.c

@@ -8,7 +8,7 @@
  *
  *		Handle WinPcap library processing.
  *
- * Version:	@(#)net_pcap.c	1.0.9	2017/10/11
+ * Version:	@(#)net_pcap.c	1.0.10	2017/10/16
  *
  * Author:	Fred N. van Kempen, <decwiz@yahoo.com>
  *
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <wchar.h>
 #include <pcap.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../config.h"
 #include "../device.h"

src/network/net_slirp.c

@@ -8,7 +8,7 @@
  *
  *		Handle SLiRP library processing.
  *
- * Version:	@(#)net_slirp.c	1.0.9	2017/10/14
+ * Version:	@(#)net_slirp.c	1.0.10	2017/10/16
  *
  * Author:	Fred N. van Kempen, <decwiz@yahoo.com>
  *
@@ -21,6 +21,7 @@
 #include <wchar.h>
 #include "slirp/slirp.h"
 #include "slirp/queue.h"
+#include "../86box.h"
 #include "../ibm.h"
 #include "../config.h"
 #include "../device.h"

src/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.14	2017/10/15
+ * Version:	@(#)network.c	1.0.15	2017/10/16
  *
  * Author:	Fred N. van Kempen, <decwiz@yahoo.com>
  *
@@ -23,6 +23,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <wchar.h>
+#include "../86box.h"
 #include "../ibm.h"
 #include "../device.h"
 #include "../plat.h"