From 722dd16c716117517269d0d5bb7d3a675f07c840 Mon Sep 17 00:00:00 2001
From: tiseno100 <58827426+tiseno100@users.noreply.github.com>
Date: Sat, 2 May 2020 21:27:05 +0300
Subject: [PATCH] Replaced the Bora Pro with the Tyan Tsunami

It's a more functional and more stable board than the previous one. Works as intended. Might help to revive the abandoned PC87309 code from PCem-X
---
 src/include/86box/machine.h |  4 +++-
 src/machine/m_at_slot1.c    | 23 ++++++++++++-----------
 src/machine/machine_table.c |  6 +++---
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index f37531cec..6d3e5991f 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -344,7 +344,9 @@ extern int	machine_at_6bxc_init(const machine_t *);
 extern int	machine_at_p2bls_init(const machine_t *);
 extern int	machine_at_p3bf_init(const machine_t *);
 extern int	machine_at_bf6_init(const machine_t *);
-extern int	machine_at_borapro_init(const machine_t *);
+#if defined(DEV_BRANCH) && defined(NO_SIO)
+extern int	machine_at_tsunamiatx_init(const machine_t *);
+#endif
 
 /* m_at_socket370.c */
 extern int	machine_at_cubx_init(const machine_t *);
diff --git a/src/machine/m_at_slot1.c b/src/machine/m_at_slot1.c
index 37c8868e6..83de82447 100644
--- a/src/machine/m_at_slot1.c
+++ b/src/machine/m_at_slot1.c
@@ -274,17 +274,16 @@ machine_at_bf6_init(const machine_t *model)
     return ret;
 }
 
+#if defined(DEV_BRANCH) && defined(NO_SIO)
 int
-machine_at_borapro_init(const machine_t *model)
+machine_at_tsunamiatx_init(const machine_t *model)
 {
-	//AMI 440ZX Board. Packard Bell OEM of the MSI-6168
-	//MIGHT REQUIRE MORE EXCESSIVE TESTING!
-	//Reports emmersive amounts of RAM like few Intel OEM boards
-	//we have.
+	//AMI 440BX Board. Requires the PC87309 and
+	//doesn't like the i686 CPU's
 	
     int ret;
 
-    ret = bios_load_linear(L"roms/machines/borapro/MS6168V2.50",
+    ret = bios_load_linear(L"roms/machines/tsunamiatx/bx46200f.rom",
 			   0x000c0000, 262144, 0);
 
     if (bios_only || !ret)
@@ -294,18 +293,20 @@ machine_at_borapro_init(const machine_t *model)
 
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-	pci_register_slot(0x0E, PCI_CARD_NORMAL,	  1, 2, 3, 4);
-	pci_register_slot(0x10, PCI_CARD_NORMAL,      2, 3, 4, 1);	
+	pci_register_slot(0x10, PCI_CARD_NORMAL,	  1, 2, 3, 4);
+	pci_register_slot(0x11, PCI_CARD_NORMAL,      2, 3, 4, 1);	
 	pci_register_slot(0x12, PCI_CARD_NORMAL,      3, 4, 1, 2);
-	pci_register_slot(0x14, PCI_CARD_NORMAL,      4, 1, 2, 3);
+	pci_register_slot(0x13, PCI_CARD_NORMAL,      4, 1, 2, 3);
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
+	pci_register_slot(0x0F, PCI_CARD_NORMAL,      1, 2, 3, 4);
     pci_register_slot(0x01, PCI_CARD_NORMAL, 	  1, 2, 3, 4);
-    device_add(&i440zx_device);
+    device_add(&i440bx_device);
     device_add(&piix4e_device);
-    device_add(&w83977ef_device);
+    device_add(&pc87306_device); //PC87309
     device_add(&keyboard_ps2_ami_pci_device);
     device_add(&intel_flash_bxt_device);
     spd_register(SPD_TYPE_SDRAM, 0x3, 256);
 
     return ret;
 }
+#endif
\ No newline at end of file
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index 2ce007f51..03fff0985 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -304,9 +304,9 @@ const machine_t machines[] = {
     { "[Slot 1 BX] ASUS P2B-LS",		"p2bls",		{{"Intel", cpus_PentiumII},   {"Intel/PGA370", cpus_Celeron},{"VIA", cpus_Cyrix3},{"",      NULL},{"",      NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC,			 		  8, 1024,   8, 255,		machine_at_p2bls_init, NULL			},
     { "[Slot 1 BX] ASUS P3B-F",			"p3bf",			{{"Intel", cpus_PentiumII},   {"Intel/PGA370", cpus_Celeron},{"VIA", cpus_Cyrix3},{"",      NULL},{"",      NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC,			 		  8, 1024,   8, 255,		 machine_at_p3bf_init, NULL			},
     { "[Slot 1 BX] ABit BF6",			"bf6",			{{"Intel", cpus_PentiumII},   {"Intel/PGA370", cpus_Celeron},{"VIA", cpus_Cyrix3},{"",      NULL},{"",      NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC,			  		  8,  768,   8, 255,		  machine_at_bf6_init, NULL			},
-
-    /* 440ZX */
-    { "[Slot 1 ZX] Packard Bell Bora Pro",	"borapro",		{{"Intel", cpus_PentiumII},   {"Intel/PGA370", cpus_Celeron},{"VIA", cpus_Cyrix3},{"",      NULL},{"",      NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC,			 		  8,  512,   8, 255,	      machine_at_borapro_init, NULL			},
+#if defined(DEV_BRANCH) && defined(NO_SIO)
+    { "[Slot 1 BX] Tyan Tsunami ATX",	"tsunamiatx",	{{"Intel", cpus_PentiumII},   {"Intel/PGA370", cpus_Celeron},{"VIA", cpus_Cyrix3},{"",      NULL},{"",      NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC,			 		  8, 1024,   8, 255,		 machine_at_tsunamiatx_init, NULL	},
+#endif
 
     /* PGA370 machines */
     /* 440BX */