Merge branch 'master' of https://github.com/86Box/86Box into feature/968_new

src/include/86box/clock.h

@@ -21,8 +21,8 @@
 enum {
     ICS9xxx_xx,
     ICS9150_08,
-#if 0
     ICS9248_39,
+#if 0
     ICS9248_81,
     ICS9248_95,
     ICS9248_98,

src/include/86box/machine.h

@@ -376,6 +376,12 @@ extern int	machine_at_vectra54_init(const machine_t *);
 extern int	machine_at_powermate_v_init(const machine_t *);
 extern int	machine_at_acerv30_init(const machine_t *);
 
+#if defined(DEV_BRANCH) && defined(USE_SIS_85C50X)
+extern int	machine_at_p5sp4_init(const machine_t *);
+extern int	machine_at_p54sp4_init(const machine_t *);
+extern int	machine_at_sq588_init(const machine_t *);
+#endif
+
 #ifdef EMU_DEVICE_H
 extern const device_t	*at_endeavor_get_device(void);
 #define at_vectra54_get_device at_endeavor_get_device
@@ -469,6 +475,7 @@ extern int	machine_at_p6sba_init(const machine_t *);
 extern int	machine_at_ergox365_init(const machine_t *);
 #endif
 extern int	machine_at_ficka6130_init(const machine_t *);
+extern int	machine_at_p3v133_init(const machine_t *);
 extern int	machine_at_p3v4x_init(const machine_t *);
 
 #ifdef EMU_DEVICE_H
@@ -578,6 +585,7 @@ extern int	machine_xt_dtk_init(const machine_t *);
 extern int	machine_xt_jukopc_init(const machine_t *);
 extern int	machine_xt_open_xt_init(const machine_t *);
 extern int	machine_xt_pxxt_init(const machine_t *);
+extern int	machine_xt_ncrpc4i_init(const machine_t *);
 
 extern int	machine_xt_iskra3104_init(const machine_t *);
 

src/include/86box/sio.h

@@ -23,6 +23,7 @@ extern const device_t	f82c710_device;
 extern const device_t	fdc37c661_device;
 extern const device_t	fdc37c663_device;
 extern const device_t	fdc37c665_device;
+extern const device_t	fdc37c665_ide_device;
 extern const device_t	fdc37c666_device;
 extern const device_t	fdc37c669_device;
 extern const device_t	fdc37c669_370_device;

src/include/86box/vid_nga.h

@@ -0,0 +1,48 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		Emulation of the Olivetti OGC 8-bit ISA (GO708) and 
+ *      M21/M24/M28 16-bit bus (GO317/318/380/709) video cards.
+ *
+ *
+ *
+ * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
+ *		Miran Grca, <mgrca8@gmail.com>
+ *		Fred N. van Kempen, <decwiz@yahoo.com>
+ *		EngiNerd, <webmaster.crrc@yahoo.it>
+ *
+ *		Copyright 2008-2019 Sarah Walker.
+ *		Copyright 2016-2019 Miran Grca.
+ *		Copyright 2017-2019 Fred N. van Kempen.
+ *		Copyright 2020 EngiNerd.
+ */
+
+typedef struct nga_t {
+    cga_t cga;
+	/* unused in OGC, required for M19 video card structure idiom */
+    uint32_t	base;
+    int		lineff;
+	int		page;
+    uint8_t *vram_64k;
+    mem_mapping_t mapping_64k;
+} nga_t;
+
+void    nga_recalctimings(nga_t *ogc);
+void    nga_out(uint16_t addr, uint8_t val, void *priv);
+uint8_t nga_in(uint16_t addr, void *priv);
+void    nga_write(uint32_t addr, uint8_t val, void *priv);
+uint8_t nga_read(uint32_t addr, void *priv);
+void    nga_poll(void *priv);
+void    nga_close(void *priv);
+void    nga_mdaattr_rebuild();
+
+
+#ifdef EMU_DEVICE_H
+extern const device_config_t nga_config[];
+extern const device_t nga_device;
+#endif

src/include/86box/vid_voodoo_codegen_x86-64.h

@@ -9,13 +9,17 @@
 #include <sys/mman.h>
 #include <unistd.h>
 #endif
-#if WIN64
+#if _WIN64
 #define BITMAP windows_BITMAP
 #include <windows.h>
 #undef BITMAP
 #endif
 
+#ifdef _MSC_VER
+#include <intrin.h>
+#else
 #include <xmmintrin.h>
+#endif
 
 #define BLOCK_NUM 8
 #define BLOCK_MASK (BLOCK_NUM-1)
@@ -752,7 +756,7 @@ static inline void voodoo_generate(uint8_t *code_block, voodoo_t *voodoo, voodoo
         addbyte(0x6f);
         addbyte(0x07 | (3 << 3));
 
-#if WIN64
+#if _WIN64
         addbyte(0x48); /*MOV RDI, RCX (voodoo_state)*/
         addbyte(0x89);
         addbyte(0xcf);
@@ -3428,7 +3432,7 @@ void voodoo_codegen_init(voodoo_t *voodoo)
 {
         int c;
 
-#if WIN64
+#if _WIN64
         voodoo->codegen_data = VirtualAlloc(NULL, sizeof(voodoo_x86_data_t) * BLOCK_NUM * 4, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
 #else
         voodoo->codegen_data = mmap(0, sizeof(voodoo_x86_data_t) * BLOCK_NUM*4, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_ANON|MAP_PRIVATE, 0, 0);
@@ -3458,7 +3462,7 @@ void voodoo_codegen_init(voodoo_t *voodoo)
 
 void voodoo_codegen_close(voodoo_t *voodoo)
 {
-#if WIN64
+#if _WIN64
         VirtualFree(voodoo->codegen_data, 0, MEM_RELEASE);
 #else
         munmap(voodoo->codegen_data, sizeof(voodoo_x86_data_t) * BLOCK_NUM*4);

src/include/86box/vid_voodoo_codegen_x86.h

@@ -15,7 +15,11 @@
 #undef BITMAP
 #endif
 
+#ifdef _MSC_VER
+#include <intrin.h>
+#else
 #include <xmmintrin.h>
+#endif
 
 #define BLOCK_NUM 8
 #define BLOCK_MASK (BLOCK_NUM-1)

src/include/86box/vid_voodoo_render.h

@@ -1,4 +1,4 @@
-#if !(defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined WIN32 || defined _WIN32 || defined _WIN32) && !(defined __amd64__)
+#if !(defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined _M_IX86 || defined __amd64__ || defined _M_X64)
 #define NO_CODEGEN
 #endif
 

src/include/86box/video.h

@@ -173,6 +173,7 @@ extern uint8_t	video_force_resize_get(void);
 extern void	video_force_resize_set(uint8_t res);
 extern void	video_update_timing(void);
 
+extern void	loadfont_ex(wchar_t *s, int format, int offset);
 extern void	loadfont(wchar_t *s, int format);
 
 extern int	get_actual_size_x(void);
@@ -245,6 +246,9 @@ extern const device_t compaq_cga_2_device;
 extern const device_t ogc_device;
 extern const device_t ogc_m24_device;
 
+/* NCR NGA */
+extern const device_t nga_device;
+
 /* Tseng ET4000AX */
 extern const device_t et4000_isa_device;
 extern const device_t et4000k_isa_device;

src/include/slirp/libslirp.h

@@ -16,6 +16,17 @@
 
 #include "libslirp-version.h"
 
+/* Windows does not define ssize_t, so we need to define it here. */
+#ifndef _SSIZE_T_DEFINED
+# define _SSIZE_T_DEFINED
+# undef ssize_t
+# ifdef _WIN64
+#  define ssize_t int64_t
+# else
+#  define ssize_t int32_t
+# endif
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif

src/include/tinyglib.h

@@ -77,6 +77,17 @@
 
 /* Types */
 
+/* Windows does not define ssize_t, so we need to define it here. */
+#ifndef _SSIZE_T_DEFINED
+# define _SSIZE_T_DEFINED
+# undef ssize_t
+# ifdef _WIN64
+#  define ssize_t int64_t
+# else
+#  define ssize_t int32_t
+# endif
+#endif
+
 #define gboolean int
 #define gchar char
 #define gint int