diff --git a/src/intel_420ex.c b/src/chipset/intel_420ex.c
similarity index 99%
rename from src/intel_420ex.c
rename to src/chipset/intel_420ex.c
index 1a74ad6c8..bf8d84dd5 100644
--- a/src/intel_420ex.c
+++ b/src/chipset/intel_420ex.c
@@ -31,7 +31,7 @@
#include <86box/hdc_ide.h>
#include <86box/hdc.h>
#include <86box/machine.h>
-#include <86box/intel_420ex.h>
+#include <86box/chipset.h>
#define MEM_STATE_SHADOW_R 0x01
diff --git a/src/chipset/intel_4x0.c b/src/chipset/intel_4x0.c
index 0685e0346..3ef03eb08 100644
--- a/src/chipset/intel_4x0.c
+++ b/src/chipset/intel_4x0.c
@@ -10,8 +10,7 @@
*
*
*
- * Authors: Sarah Walker,
- * Miran Grca,
+ * Authors: Miran Grca,
*
* Copyright 2019,2020 Miran Grca.
*/
@@ -1659,9 +1658,9 @@ const device_t i430fx_device =
};
-const device_t i430fx_pb640_device =
+const device_t i430fx_rev02_device =
{
- "Intel SB82437FX-66 (PB640)",
+ "Intel SB82437FX-66 (Rev. 02)",
DEVICE_PCI,
0x0200 | INTEL_430FX,
i4x0_init,
diff --git a/src/intel_piix.c b/src/chipset/intel_piix.c
similarity index 99%
rename from src/intel_piix.c
rename to src/chipset/intel_piix.c
index bc2558c12..db1e8e1c2 100644
--- a/src/intel_piix.c
+++ b/src/chipset/intel_piix.c
@@ -13,10 +13,8 @@
*
*
*
- * Authors: Sarah Walker,
- * Miran Grca,
+ * Authors: Miran Grca,
*
- * Copyright 2008-2020 Sarah Walker.
* Copyright 2016-2020 Miran Grca.
*/
#include
@@ -53,7 +51,7 @@
#include <86box/zip.h>
#include <86box/machine.h>
#include <86box/smbus_piix4.h>
-#include <86box/piix.h>
+#include <86box/chipset.h>
typedef struct
diff --git a/src/intel_sio.c b/src/chipset/intel_sio.c
similarity index 98%
rename from src/intel_sio.c
rename to src/chipset/intel_sio.c
index 07146548d..158179a18 100644
--- a/src/intel_sio.c
+++ b/src/chipset/intel_sio.c
@@ -8,10 +8,8 @@
*
*
*
- * Authors: Sarah Walker,
- * Miran Grca,
+ * Authors: Miran Grca,
*
- * Copyright 2008-2018 Sarah Walker.
* Copyright 2016-2018 Miran Grca.
*/
#include
@@ -30,7 +28,7 @@
#include <86box/pit.h>
#include <86box/port_92.h>
#include <86box/machine.h>
-#include <86box/intel_sio.h>
+#include <86box/chipset.h>
typedef struct
diff --git a/src/via_vt82c586b.c b/src/chipset/via_vt82c586b.c
similarity index 99%
rename from src/via_vt82c586b.c
rename to src/chipset/via_vt82c586b.c
index b2721c5d4..3524ed30b 100644
--- a/src/via_vt82c586b.c
+++ b/src/chipset/via_vt82c586b.c
@@ -45,7 +45,7 @@
#include <86box/hdc_ide_sff8038i.h>
#include <86box/zip.h>
#include <86box/machine.h>
-#include <86box/via_vt82c586b.h>
+#include <86box/chipset.h>
#define ACPI_TIMER_FREQ 3579545
diff --git a/src/via_vt82c596b.c b/src/chipset/via_vt82c596b.c
similarity index 99%
rename from src/via_vt82c596b.c
rename to src/chipset/via_vt82c596b.c
index e982e4e05..5cc9a2e4e 100644
--- a/src/via_vt82c596b.c
+++ b/src/chipset/via_vt82c596b.c
@@ -49,7 +49,7 @@
#include <86box/hdc_ide_sff8038i.h>
#include <86box/zip.h>
#include <86box/machine.h>
-#include <86box/via_vt82c586b.h>
+#include <86box/chipset.h>
// As of now
#include <86box/smbus_piix4.h>
diff --git a/src/disk/mo.c b/src/disk/mo.c
index 1687d37f3..4e1d134b7 100644
--- a/src/disk/mo.c
+++ b/src/disk/mo.c
@@ -12,8 +12,8 @@
*
*
* Authors: Natalia Portillo
- * Fred N. van Kempen,
- * Miran Grca,
+ * Miran Grca,
+ * Fred N. van Kempen,
*
* Copyright 2020 Miran Grca.
*/
@@ -29,7 +29,6 @@
#include <86box/config.h>
#include <86box/timer.h>
#include <86box/device.h>
-#include <86box/piix.h>
#include <86box/scsi_device.h>
#include <86box/nvr.h>
#include <86box/plat.h>
@@ -1298,7 +1297,6 @@ mo_command(scsi_common_t *sc, uint8_t *cdb)
int ret;
int32_t len, max_len;
int32_t alloc_length;
- uint32_t i = 0;
int size_idx, idx = 0;
unsigned preamble_len;
int32_t blen = 0;
@@ -1864,9 +1862,6 @@ mo_phase_data_out(scsi_common_t *sc)
uint8_t hdr_len, val, old_val, ch;
- uint32_t last_to_write = 0;
- uint32_t c, h, s;
-
int len = 0;
switch(dev->current_cdb[0]) {
diff --git a/src/disk/zip.c b/src/disk/zip.c
index 8a6253100..b47b31833 100644
--- a/src/disk/zip.c
+++ b/src/disk/zip.c
@@ -27,7 +27,6 @@
#include <86box/config.h>
#include <86box/timer.h>
#include <86box/device.h>
-#include <86box/piix.h>
#include <86box/scsi_device.h>
#include <86box/nvr.h>
#include <86box/plat.h>
diff --git a/src/ibm_5161.c b/src/ibm_5161.c
index f7658a7f5..3e7d4845f 100644
--- a/src/ibm_5161.c
+++ b/src/ibm_5161.c
@@ -28,7 +28,6 @@
#include <86box/pit.h>
#include <86box/port_92.h>
#include <86box/machine.h>
-#include <86box/intel_sio.h>
typedef struct
diff --git a/src/include/86box/chipset.h b/src/include/86box/chipset.h
index 24dc107ef..a94564e68 100644
--- a/src/include/86box/chipset.h
+++ b/src/include/86box/chipset.h
@@ -32,22 +32,33 @@ extern const device_t headland_device;
extern const device_t headland_386_device;
/* Intel 4x0xX */
+extern const device_t i420ex_device;
extern const device_t i420tx_device;
extern const device_t i420zx_device;
extern const device_t i430lx_device;
extern const device_t i430nx_device;
extern const device_t i430fx_device;
-extern const device_t i430fx_pb640_device;
+extern const device_t i430fx_rev02_device;
extern const device_t i430hx_device;
extern const device_t i430vx_device;
extern const device_t i430tx_device;
extern const device_t i440fx_device;
-extern const device_t i440lx_device;
-extern const device_t i440ex_device;
+extern const device_t i440lx_device;
+extern const device_t i440ex_device;
extern const device_t i440bx_device;
extern const device_t i440gx_device;
extern const device_t i440zx_device;
+extern const device_t sio_device;
+extern const device_t sio_zb_device;
+
+extern const device_t piix_device;
+extern const device_t piix_rev02_device;
+extern const device_t piix3_device;
+extern const device_t piix4_device;
+extern const device_t piix4e_device;
+extern const device_t slc90e66_device;
+
extern const device_t ioapic_device;
/* OPTi */
@@ -71,9 +82,12 @@ extern const device_t sis_85c50x_device;
/* VIA */
extern const device_t via_vpx_device;
-extern const device_t via_vp3_device;
-extern const device_t via_mvp3_device;
-extern const device_t via_apro_device;
+extern const device_t via_vp3_device;
+extern const device_t via_mvp3_device;
+extern const device_t via_apro_device;
+
+extern const device_t via_vt82c586b_device;
+extern const device_t via_vt82c596b_device;
/* VLSI */
extern const device_t vlsi_scamp_device;
diff --git a/src/include/86box/intel_420ex.h b/src/include/86box/intel_420ex.h
deleted file mode 100644
index a052c277d..000000000
--- a/src/include/86box/intel_420ex.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * 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.
- *
- * Emulation of Intel 420EX PCI chip.
- *
- *
- *
- * Author: Miran Grca,
- * Copyright 2020 Miran Grca.
- */
-
-extern const device_t i420ex_device;
diff --git a/src/include/86box/intel_sio.h b/src/include/86box/intel_sio.h
deleted file mode 100644
index 924de555c..000000000
--- a/src/include/86box/intel_sio.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * 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.
- *
- * Emulation of Intel System I/O PCI chip.
- *
- *
- *
- * Author: Sarah Walker,
- * Miran Grca,
- * Copyright 2008-2018 Sarah Walker.
- * Copyright 2016-2018 Miran Grca.
- */
-
-extern const device_t sio_device;
-extern const device_t sio_zb_device;
diff --git a/src/include/86box/piix.h b/src/include/86box/piix.h
deleted file mode 100644
index 025410b1a..000000000
--- a/src/include/86box/piix.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.
- *
- * Emulation of the Intel PIIX, PIIX3, PIIX4, PIIX4E, and SMSC
- * SLC90E66 (Victory66) Xcelerators.
- *
- * Emulation core dispatcher.
- *
- *
- *
- * Authors: Sarah Walker,
- * Miran Grca,
- * Copyright 2008-2020 Sarah Walker.
- * Copyright 2016-2020 Miran Grca.
- */
-
-extern const device_t piix_device;
-extern const device_t piix_rev02_device;
-extern const device_t piix3_device;
-extern const device_t piix4_device;
-extern const device_t piix4e_device;
-extern const device_t slc90e66_device;
diff --git a/src/include/86box/via_vt82c586b.h b/src/include/86box/via_vt82c586b.h
deleted file mode 100644
index 0dade9705..000000000
--- a/src/include/86box/via_vt82c586b.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * 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.
- *
- * Emulation of the VIA Apollo MVP3 southbridge
- *
- *
- *
- * Authors: Sarah Walker,
- * Miran Grca,
- * Melissa Goad,
- *
- * Copyright 2008-2020 Sarah Walker.
- * Copyright 2016-2020 Miran Grca.
- * Copyright 2020 Melissa Goad.
- */
-
-extern const device_t via_vt82c586b_device;
-extern const device_t via_vt82c596b_device;
\ No newline at end of file
diff --git a/src/machine/m_at_386dx_486.c b/src/machine/m_at_386dx_486.c
index fb43d7b1c..e34b58fda 100644
--- a/src/machine/m_at_386dx_486.c
+++ b/src/machine/m_at_386dx_486.c
@@ -40,8 +40,6 @@
#include <86box/video.h>
#include <86box/intel_flash.h>
#include <86box/sst_flash.h>
-#include <86box/intel_420ex.h>
-#include <86box/intel_sio.h>
#include <86box/scsi_ncr53c8xx.h>
#include <86box/machine.h>
diff --git a/src/machine/m_at_slot1.c b/src/machine/m_at_slot1.c
index dc2a551bb..bac1b81a0 100644
--- a/src/machine/m_at_slot1.c
+++ b/src/machine/m_at_slot1.c
@@ -30,10 +30,7 @@
#include <86box/hdc_ide.h>
#include <86box/keyboard.h>
#include <86box/intel_flash.h>
-#include <86box/intel_sio.h>
-#include <86box/piix.h>
#include <86box/sio.h>
-#include <86box/intel_sio.h>
#include <86box/sst_flash.h>
#include <86box/hwm.h>
#include <86box/spd.h>
diff --git a/src/machine/m_at_slot2.c b/src/machine/m_at_slot2.c
index 9b7478afc..b7d35de44 100644
--- a/src/machine/m_at_slot2.c
+++ b/src/machine/m_at_slot2.c
@@ -32,10 +32,7 @@
#include <86box/keyboard.h>
#include <86box/intel_flash.h>
#include <86box/sst_flash.h>
-#include <86box/intel_sio.h>
-#include <86box/piix.h>
#include <86box/sio.h>
-#include <86box/intel_sio.h>
#include <86box/hwm.h>
#include <86box/spd.h>
#include <86box/video.h>
diff --git a/src/machine/m_at_socket370.c b/src/machine/m_at_socket370.c
index c730a1af6..5642cc74f 100644
--- a/src/machine/m_at_socket370.c
+++ b/src/machine/m_at_socket370.c
@@ -30,9 +30,6 @@
#include <86box/hdc_ide.h>
#include <86box/keyboard.h>
#include <86box/intel_flash.h>
-#include <86box/via_vt82c586b.h>
-#include <86box/intel_sio.h>
-#include <86box/piix.h>
#include <86box/sio.h>
#include <86box/sst_flash.h>
#include <86box/hwm.h>
diff --git a/src/machine/m_at_socket4_5.c b/src/machine/m_at_socket4_5.c
index 2cf67a6d6..0ba647aca 100644
--- a/src/machine/m_at_socket4_5.c
+++ b/src/machine/m_at_socket4_5.c
@@ -35,9 +35,7 @@
#include <86box/fdc.h>
#include <86box/keyboard.h>
#include <86box/intel_flash.h>
-#include <86box/intel_sio.h>
#include <86box/nvr.h>
-#include <86box/piix.h>
#include <86box/sio.h>
#include <86box/video.h>
#include <86box/machine.h>
diff --git a/src/machine/m_at_socket7_s7.c b/src/machine/m_at_socket7_s7.c
index 6f40dbf42..762219a98 100644
--- a/src/machine/m_at_socket7_s7.c
+++ b/src/machine/m_at_socket7_s7.c
@@ -34,11 +34,8 @@
#include <86box/hdc_ide.h>
#include <86box/keyboard.h>
#include <86box/intel_flash.h>
-#include <86box/intel_sio.h>
-#include <86box/piix.h>
#include <86box/sio.h>
#include <86box/sst_flash.h>
-#include <86box/via_vt82c586b.h>
#include <86box/hwm.h>
#include <86box/video.h>
#include <86box/spd.h>
@@ -180,7 +177,7 @@ machine_at_pb640_init(const machine_t *model)
pci_register_slot(0x13, PCI_CARD_NORMAL, 2, 1, 3, 4);
pci_register_slot(0x0B, PCI_CARD_NORMAL, 3, 2, 1, 4);
pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
- device_add(&i430fx_pb640_device);
+ device_add(&i430fx_rev02_device);
device_add(&piix_rev02_device);
if (gfxcard == VID_INTERNAL)
diff --git a/src/machine/m_at_socket8.c b/src/machine/m_at_socket8.c
index 86f04b4aa..dcd4e8060 100644
--- a/src/machine/m_at_socket8.c
+++ b/src/machine/m_at_socket8.c
@@ -31,8 +31,6 @@
#include <86box/keyboard.h>
#include <86box/intel_flash.h>
#include <86box/sst_flash.h>
-#include <86box/intel_sio.h>
-#include <86box/piix.h>
#include <86box/sio.h>
#include <86box/sst_flash.h>
#include <86box/hwm.h>
diff --git a/src/machine/m_at_super7_ss7.c b/src/machine/m_at_sockets7.c
similarity index 97%
rename from src/machine/m_at_super7_ss7.c
rename to src/machine/m_at_sockets7.c
index bc876a206..ebaaa49ee 100644
--- a/src/machine/m_at_super7_ss7.c
+++ b/src/machine/m_at_sockets7.c
@@ -34,11 +34,8 @@
#include <86box/hdc_ide.h>
#include <86box/keyboard.h>
#include <86box/intel_flash.h>
-#include <86box/intel_sio.h>
-#include <86box/piix.h>
#include <86box/sio.h>
#include <86box/sst_flash.h>
-#include <86box/via_vt82c586b.h>
#include <86box/spd.h>
#include <86box/hwm.h>
#include <86box/video.h>
diff --git a/src/scsi/scsi_cdrom.c b/src/scsi/scsi_cdrom.c
index 0c4748505..e1c5248fb 100644
--- a/src/scsi/scsi_cdrom.c
+++ b/src/scsi/scsi_cdrom.c
@@ -27,7 +27,6 @@
#include <86box/config.h>
#include <86box/timer.h>
#include <86box/device.h>
-#include <86box/piix.h>
#include <86box/scsi_device.h>
#include <86box/nvr.h>
#include <86box/hdc.h>
diff --git a/src/scsi/scsi_disk.c b/src/scsi/scsi_disk.c
index da65d517b..b4b7f6601 100644
--- a/src/scsi/scsi_disk.c
+++ b/src/scsi/scsi_disk.c
@@ -23,7 +23,6 @@
#include <86box/timer.h>
#include <86box/device.h>
#include <86box/nvr.h>
-#include <86box/piix.h>
#include <86box/hdd.h>
#include <86box/hdc.h>
#include <86box/scsi_device.h>
diff --git a/src/sio_acc3221.c b/src/sio/sio_acc3221.c
similarity index 100%
rename from src/sio_acc3221.c
rename to src/sio/sio_acc3221.c
diff --git a/src/sio_detect.c b/src/sio/sio_detect.c
similarity index 100%
rename from src/sio_detect.c
rename to src/sio/sio_detect.c
diff --git a/src/sio_f82c710.c b/src/sio/sio_f82c710.c
similarity index 100%
rename from src/sio_f82c710.c
rename to src/sio/sio_f82c710.c
diff --git a/src/sio_fdc37c669.c b/src/sio/sio_fdc37c669.c
similarity index 100%
rename from src/sio_fdc37c669.c
rename to src/sio/sio_fdc37c669.c
diff --git a/src/sio_fdc37c66x.c b/src/sio/sio_fdc37c66x.c
similarity index 100%
rename from src/sio_fdc37c66x.c
rename to src/sio/sio_fdc37c66x.c
diff --git a/src/sio_fdc37c93x.c b/src/sio/sio_fdc37c93x.c
similarity index 100%
rename from src/sio_fdc37c93x.c
rename to src/sio/sio_fdc37c93x.c
diff --git a/src/sio_pc87306.c b/src/sio/sio_pc87306.c
similarity index 100%
rename from src/sio_pc87306.c
rename to src/sio/sio_pc87306.c
diff --git a/src/sio_um8669f.c b/src/sio/sio_um8669f.c
similarity index 100%
rename from src/sio_um8669f.c
rename to src/sio/sio_um8669f.c
diff --git a/src/sio_w83787f.c b/src/sio/sio_w83787f.c
similarity index 100%
rename from src/sio_w83787f.c
rename to src/sio/sio_w83787f.c
diff --git a/src/sio_w83877f.c b/src/sio/sio_w83877f.c
similarity index 100%
rename from src/sio_w83877f.c
rename to src/sio/sio_w83877f.c
diff --git a/src/sio_w83977f.c b/src/sio/sio_w83977f.c
similarity index 100%
rename from src/sio_w83977f.c
rename to src/sio/sio_w83977f.c
diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw
index 75c63d0b3..83e4f74e7 100644
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -175,7 +175,7 @@ ifndef USB
USB := n
endif
ifndef DINPUT
- DINPUT := y
+ DINPUT := n
endif
ifndef OPENAL
OPENAL := y
@@ -248,7 +248,7 @@ endif
VPATH := $(EXPATH) . cpu cpu_common \
cdrom chipset disk floppy game machine \
printer \
- sound \
+ sio sound \
sound/munt sound/munt/c_interface sound/munt/sha1 \
sound/munt/srchelper sound/munt/srchelper/srctools/src \
sound/resid-fp \
@@ -544,8 +544,8 @@ MCHOBJ := machine.o machine_table.o \
m_ps2_isa.o m_ps2_mca.o \
m_at_compaq.o \
m_at_286_386sx.o m_at_386dx_486.o \
- m_at_socket4_5.o m_at_socket7_s7.o m_at_super7_ss7.o \
- m_at_socket8.o m_at_slot1.o m_at_slot2.o m_at_socket370.o
+ m_at_socket4_5.o m_at_socket7_s7.o m_at_sockets7.o \
+ m_at_socket8.o m_at_slot1.o m_at_slot2.o m_at_socket370.o
DEVOBJ := bugger.o hwm.o hwm_lm75.o hwm_lm78.o ibm_5161.o isamem.o isartc.o lpt.o postcard.o $(SERIAL) \
sio_detect.o sio_acc3221.o \
diff --git a/src/win/Makefile_ndr.mingw b/src/win/Makefile_ndr.mingw
index 7b83f37be..63a9c3c60 100644
--- a/src/win/Makefile_ndr.mingw
+++ b/src/win/Makefile_ndr.mingw
@@ -245,7 +245,7 @@ endif
VPATH := $(EXPATH) . cpu_new cpu_common \
cdrom chipset disk floppy game machine \
printer \
- sound \
+ sio sound \
sound/munt sound/munt/c_interface sound/munt/sha1 \
sound/munt/srchelper sound/munt/srchelper/srctools/src \
sound/resid-fp \
@@ -548,8 +548,8 @@ MCHOBJ := machine.o machine_table.o \
m_ps2_isa.o m_ps2_mca.o \
m_at_compaq.o \
m_at_286_386sx.o m_at_386dx_486.o \
- m_at_socket4_5.o m_at_socket7_s7.o m_at_super7_ss7.o \
- m_at_socket8.o m_at_slot1.o m_at_slot2.o m_at_socket370.o
+ m_at_socket4_5.o m_at_socket7_s7.o m_at_sockets7.o \
+ m_at_socket8.o m_at_slot1.o m_at_slot2.o m_at_socket370.o
DEVOBJ := bugger.o hwm.o hwm_lm75.o hwm_lm78.o ibm_5161.o isamem.o isartc.o lpt.o postcard.o $(SERIAL) \
sio_acc3221.o \