Merge branch 'master' of https://github.com/86Box/86Box

src/include/86box/acpi.h

@@ -44,6 +44,7 @@ extern "C" {
 
 #define VEN_ALI		0x010b9
 #define VEN_INTEL	0x08086
+#define VEN_SIS		0x01039
 #define VEN_SMC		0x01055
 #define VEN_VIA		0x01106
 #define VEN_VIA_596B	0x11106
@@ -51,23 +52,23 @@ extern "C" {
 
 typedef struct
 {
-    uint8_t		plvl2, plvl3,
+    uint8_t		acpitst, auxen, auxsts, plvl2, plvl3,
 			smicmd, gpio_dir,
-			gpio_val, pad,
-			timer32,
+			gpio_val, muxcntrl, pad,
+			timer32, smireg,
 			gpireg[3], gporeg[4];
     uint16_t		pmsts, pmen,
 			pmcntrl, gpsts, gpsts1,
 			gpen, gpen1, gpscien,
-			gpcntrl,
-			gpsmien, pscntrl,
+			gpcntrl, gplvl, gpmux,
+			gpsel, gpsmien, pscntrl,
 			gpscists;
     int			smi_lock, smi_active;
-    uint32_t		pcntrl, glbsts,
+    uint32_t		pcntrl, p2cntrl, glbsts,
 			devsts, glben,
 			glbctl, devctl,
 			padsts, paden,
-			gptren, timer_val,
+			gptren, gptimer, timer_val,
 			gpo_val, gpi_val,
 			extsmi_val, pad0;
     uint64_t		tmr_overflow_time;
@@ -95,6 +96,7 @@ extern int		acpi_rtc_status;
 
 extern const device_t	acpi_ali_device;
 extern const device_t	acpi_intel_device;
+extern const device_t	acpi_sis_device;
 extern const device_t	acpi_smc_device;
 extern const device_t	acpi_via_device;
 extern const device_t	acpi_via_596b_device;

src/include/86box/chipset.h

@@ -112,6 +112,7 @@ extern const device_t	sis_85c50x_device;
 #if defined(DEV_BRANCH) && defined(USE_SIS_5571)
 extern const device_t	sis_5571_device;
 #endif
+extern const device_t	sis_5598_device;
 
 /* ST */
 extern const device_t	stpc_client_device;

src/include/86box/machine.h

@@ -344,7 +344,9 @@ extern int	machine_at_486sp3_init(const machine_t *);
 extern int	machine_at_486sp3c_init(const machine_t *);
 extern int	machine_at_486sp3g_init(const machine_t *);
 extern int	machine_at_486ap4_init(const machine_t *);
+#if defined(DEV_BRANCH) && defined(NO_SIO)
 extern int	machine_at_486vipio2_init(const machine_t *);
+#endif
 extern int	machine_at_abpb4_init(const machine_t *);
 extern int	machine_at_win486pci_init(const machine_t *);
 
@@ -473,6 +475,9 @@ extern int	machine_at_ficva502_init(const machine_t *);
 
 extern int	machine_at_ficpa2012_init(const machine_t *);
 
+extern int	machine_at_sp97xv_init(const machine_t *);
+extern int	machine_at_m571_init(const machine_t *);
+
 #ifdef EMU_DEVICE_H
 extern const device_t 	*at_thor_get_device(void);
 extern const device_t	*at_pb640_get_device(void);

src/include/86box/nvr.h

@@ -81,6 +81,7 @@ typedef struct _nvr_ {
     void	(*ven_save)(void);
 
     uint8_t	regs[NVR_MAXSIZE];	/* these are the registers */
+    uint8_t apc_regs[4];	/* AND THIS! IS THE APC MADAFAKA :b */
 } nvr_t;
 
 

src/include/86box/sio.h

@@ -35,6 +35,7 @@ extern const device_t	fdc37c932qf_device;
 extern const device_t	fdc37c935_device;
 extern const device_t   fdc37m60x_device;
 extern const device_t   fdc37m60x_370_device;
+extern const device_t	it8661f_device;
 extern const device_t	i82091aa_device;
 extern const device_t	i82091aa_398_device;
 extern const device_t	i82091aa_ide_device;