From 570034cb0924c306e09ecfad223c179022c574e0 Mon Sep 17 00:00:00 2001
From: tiseno100 <58827426+tiseno100@users.noreply.github.com>
Date: Wed, 29 Apr 2020 10:50:53 +0300
Subject: [PATCH 01/23] Improved the VIA VPX code
Moved host bridge write code via_vpx_write.
Default registers are now on via_vpx_init.
Read only registers are hardcoded.
---
src/chipset/via_vpx.c | 148 +++++++++++++++++++-----------------------
1 file changed, 68 insertions(+), 80 deletions(-)
diff --git a/src/chipset/via_vpx.c b/src/chipset/via_vpx.c
index 5985f8493..0df0d23e5 100644
--- a/src/chipset/via_vpx.c
+++ b/src/chipset/via_vpx.c
@@ -12,6 +12,9 @@ VIA Apollo VPX North Bridge emulation
VT82C585VPX used in the Zida Tomato TX100 board
based on the model of VIA MVP3 by mooch & Sarah
+There's also a SOYO board using the ETEQ chipset which is a rebranded
+VPX + 586B but fails to save on CMOS properly.
+
Authors: Sarah Walker,
Copyright(C) 2020 Tiseno100
Copyright(C) 2020 Melissa Goad
@@ -35,7 +38,7 @@ Copyright(C) 2020 Miran Grca
typedef struct via_vpx_t
{
- uint8_t pci_conf[2][256];
+ uint8_t pci_conf[256];
} via_vpx_t;
static void
@@ -60,109 +63,63 @@ vpx_map(uint32_t addr, uint32_t size, int state)
}
static void
-via_vpx_pci_regs(via_vpx_t *dev)
-{
- memset(dev, 0, sizeof(via_vpx_t));
-
-// Host Bridge registers
-
- dev->pci_conf[0][0x00] = 0x06; // VIA
- dev->pci_conf[0][0x01] = 0x11;
-
- dev->pci_conf[0][0x02] = 0x85; // VT82C585VPX
- dev->pci_conf[0][0x03] = 0x05;
-
- dev->pci_conf[0][0x04] = 7; // Command
- dev->pci_conf[0][0x05] = 0;
-
- dev->pci_conf[0][0x06] = 0xa0; // Status
- dev->pci_conf[0][0x07] = 2;
-
- dev->pci_conf[0][0x09] = 0; // Program Interface
-
- dev->pci_conf[0][0x0a] = 0; // Sub Class Code
-
- dev->pci_conf[0][0x0b] = 6; // Base Class Code
-
- dev->pci_conf[0][0x0c] = 0; // reserved
-
- dev->pci_conf[0][0x0d] = 0; // Latency Timer
-
- dev->pci_conf[0][0x0e] = 0; // Header Type
-
- dev->pci_conf[0][0x0f] = 0; // Built-in Self test
-
- dev->pci_conf[0][0x58] = 0x40; // DRAM Configuration 1
- dev->pci_conf[0][0x59] = 5; // DRAM Configuration 2
-
- dev->pci_conf[0][0x5a] = 1; // Bank 0 Ending
- dev->pci_conf[0][0x5b] = 1; // Bank 1 Ending
- dev->pci_conf[0][0x5c] = 1; // Bank 2 Ending
- dev->pci_conf[0][0x5d] = 1; // Bank 3 Ending
- dev->pci_conf[0][0x5e] = 1; // Bank 4 Ending
- dev->pci_conf[0][0x5f] = 1; // Bank 5 Ending
-
- dev->pci_conf[0][0x64] = 0xab; // DRAM reference timing
-
-}
-
-static void
-host_bridge_write(int func, int addr, uint8_t val, void *priv)
+via_vpx_write(int func, int addr, uint8_t val, void *priv)
{
via_vpx_t *dev = (via_vpx_t *) priv;
- // Read-Only registers. Exact same as MVP3
- if ((addr < 4) || ((addr >= 5) && (addr < 7)) || ((addr >= 8) && (addr < 0xd)) || ((addr >= 0xe) && (addr < 0x12)) ||
- ((addr >= 0x14) && (addr < 0x50)) || ((addr >= 0x79) && (addr < 0x7e)) || ((addr >= 0x85) && (addr < 0x88)) ||
- ((addr >= 0x8c) && (addr < 0xa8)) || ((addr >= 0xad) && (addr < 0xfd)))
- return;
+ // Read-Only registers
+ switch(addr){
+ case 0x00: case 0x01: case 0x02: case 0x03:
+ case 0x08: case 0x09: case 0x0a: case 0x0b:
+ case 0x0e: case 0x0f:
+ return;
+ }
switch(addr){
- case 0x04: // Command
- dev->pci_conf[0][0x04] = (dev->pci_conf[0][0x04] & ~0x40) | (val & 0x40);
+ case 0x04: // Command. On Bitfield 6 RW
+ dev->pci_conf[0x04] = (dev->pci_conf[0x04] & ~0x40) | (val & 0x40);
case 0x07: // Status
- dev->pci_conf[0][0x07] &= ~(val & 0xb0);
+ dev->pci_conf[0x07] &= ~(val & 0xb0);
break;
case 0x61: // Shadow RAM control 1
- if ((dev->pci_conf[0][0x61] ^ val) & 0x03)
+ if ((dev->pci_conf[0x61] ^ val) & 0x03)
vpx_map(0xc0000, 0x04000, val & 0x03);
- if ((dev->pci_conf[0][0x61] ^ val) & 0x0c)
+ if ((dev->pci_conf[0x61] ^ val) & 0x0c)
vpx_map(0xc4000, 0x04000, (val & 0x0c) >> 2);
- if ((dev->pci_conf[0][0x61] ^ val) & 0x30)
+ if ((dev->pci_conf[0x61] ^ val) & 0x30)
vpx_map(0xc8000, 0x04000, (val & 0x30) >> 4);
- if ((dev->pci_conf[0][0x61] ^ val) & 0xc0)
+ if ((dev->pci_conf[0x61] ^ val) & 0xc0)
vpx_map(0xcc000, 0x04000, (val & 0xc0) >> 6);
- dev->pci_conf[0][0x61] = val;
+ dev->pci_conf[0x61] = val;
return;
case 0x62: // Shadow RAM Control 2
- if ((dev->pci_conf[0][0x62] ^ val) & 0x03)
+ if ((dev->pci_conf[0x62] ^ val) & 0x03)
vpx_map(0xd0000, 0x04000, val & 0x03);
- if ((dev->pci_conf[0][0x62] ^ val) & 0x0c)
+ if ((dev->pci_conf[0x62] ^ val) & 0x0c)
vpx_map(0xd4000, 0x04000, (val & 0x0c) >> 2);
- if ((dev->pci_conf[0][0x62] ^ val) & 0x30)
+ if ((dev->pci_conf[0x62] ^ val) & 0x30)
vpx_map(0xd8000, 0x04000, (val & 0x30) >> 4);
- if ((dev->pci_conf[0][0x62] ^ val) & 0xc0)
+ if ((dev->pci_conf[0x62] ^ val) & 0xc0)
vpx_map(0xdc000, 0x04000, (val & 0xc0) >> 6);
- dev->pci_conf[0][0x62] = val;
+ dev->pci_conf[0x62] = val;
return;
case 0x63: // Shadow RAM Control 3
- if ((dev->pci_conf[0][0x63] ^ val) & 0x30) {
+ if ((dev->pci_conf[0x63] ^ val) & 0x30) {
vpx_map(0xf0000, 0x10000, (val & 0x30) >> 4);
shadowbios = (((val & 0x30) >> 4) & 0x02);
}
- if ((dev->pci_conf[0][0x63] ^ val) & 0xc0)
+ if ((dev->pci_conf[0x63] ^ val) & 0xc0)
vpx_map(0xe0000, 0x10000, (val & 0xc0) >> 6);
- dev->pci_conf[0][0x63] = val;
+ dev->pci_conf[0x63] = val;
return;
- //In case we throw somewhere
default:
- dev->pci_conf[0][addr] = val;
+ dev->pci_conf[addr] = val;
break;
}
}
@@ -175,19 +132,13 @@ via_vpx_read(int func, int addr, void *priv)
switch(func) {
case 0:
- ret = dev->pci_conf[0][addr];
+ ret = dev->pci_conf[addr];
break;
}
return ret;
}
-static void
-via_vpx_write(int func, int addr, uint8_t val, void *priv)
-{
- host_bridge_write(func, addr, val, priv);
-}
-
static void
via_vpx_reset(void *priv)
{
@@ -198,10 +149,47 @@ static void *
via_vpx_init(const device_t *info)
{
via_vpx_t *dev = (via_vpx_t *) malloc(sizeof(via_vpx_t));
+ memset(dev, 0, sizeof(via_vpx_t));
pci_add_card(PCI_ADD_NORTHBRIDGE, via_vpx_read, via_vpx_write, dev);
- via_vpx_pci_regs(dev);
+ dev->pci_conf[0x00] = 0x06; // VIA
+ dev->pci_conf[0x01] = 0x11;
+
+ dev->pci_conf[0x02] = 0x85; // VT82C585VPX
+ dev->pci_conf[0x03] = 0x05;
+
+ dev->pci_conf[0x04] = 7; // Command
+ dev->pci_conf[0x05] = 0;
+
+ dev->pci_conf[0x06] = 0xa0; // Status
+ dev->pci_conf[0x07] = 2;
+
+ dev->pci_conf[0x09] = 0; // Program Interface
+
+ dev->pci_conf[0x0a] = 0; // Sub Class Code
+
+ dev->pci_conf[0x0b] = 6; // Base Class Code
+
+ dev->pci_conf[0x0c] = 0; // reserved
+
+ dev->pci_conf[0x0d] = 0; // Latency Timer
+
+ dev->pci_conf[0x0e] = 0; // Header Type
+
+ dev->pci_conf[0x0f] = 0; // Built-in Self test
+
+ dev->pci_conf[0x58] = 0x40; // DRAM Configuration 1
+ dev->pci_conf[0x59] = 0x05; // DRAM Configuration 2
+
+ dev->pci_conf[0x5a] = 1; // Bank 0 Ending
+ dev->pci_conf[0x5b] = 1; // Bank 1 Ending
+ dev->pci_conf[0x5c] = 1; // Bank 2 Ending
+ dev->pci_conf[0x5d] = 1; // Bank 3 Ending
+ dev->pci_conf[0x5e] = 1; // Bank 4 Ending
+ dev->pci_conf[0x5f] = 1; // Bank 5 Ending
+
+ dev->pci_conf[0x64] = 0xab; // DRAM reference timing
return dev;
}
From ff29e0449082522079a87c1f0c6fba198e820cb3 Mon Sep 17 00:00:00 2001
From: tiseno100 <58827426+tiseno100@users.noreply.github.com>
Date: Wed, 29 Apr 2020 11:39:25 +0300
Subject: [PATCH 02/23] Added the missing 2 RW bitfields on command.
---
src/chipset/via_vpx.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/chipset/via_vpx.c b/src/chipset/via_vpx.c
index 0df0d23e5..f19d682e1 100644
--- a/src/chipset/via_vpx.c
+++ b/src/chipset/via_vpx.c
@@ -77,9 +77,17 @@ via_vpx_t *dev = (via_vpx_t *) priv;
}
switch(addr){
- case 0x04: // Command. On Bitfield 6 RW
+ case 0x04:
+ // Bitfield 6: Parity Error Response
+ // Bitfield 8: SERR# Enable
+ // Bitfield 9: Fast Back-to-Back Cycle Enable
+ if(dev->pci_conf[0x04] && 0x40){ //Bitfield 6
dev->pci_conf[0x04] = (dev->pci_conf[0x04] & ~0x40) | (val & 0x40);
-
+ } else if(dev->pci_conf[0x04] && 0x100){ //Bitfield 8
+ dev->pci_conf[0x04] = (dev->pci_conf[0x04] & ~0x100) | (val & 0x100);
+ } else if(dev->pci_conf[0x04] && 0x200){ //Bitfield 9
+ dev->pci_conf[0x04] = (dev->pci_conf[0x04] & ~0x200) | (val & 0x200);
+ }
case 0x07: // Status
dev->pci_conf[0x07] &= ~(val & 0xb0);
break;
@@ -165,6 +173,8 @@ via_vpx_init(const device_t *info)
dev->pci_conf[0x06] = 0xa0; // Status
dev->pci_conf[0x07] = 2;
+ dev->pci_conf[0x08] = 0; // Silicon Rev.
+
dev->pci_conf[0x09] = 0; // Program Interface
dev->pci_conf[0x0a] = 0; // Sub Class Code
From c854b7805f4858469c934d92da0b37ac6b2e8db1 Mon Sep 17 00:00:00 2001
From: tiseno100 <58827426+tiseno100@users.noreply.github.com>
Date: Wed, 29 Apr 2020 14:14:49 +0300
Subject: [PATCH 03/23] Dev Branch machines with missing SIO on machine.h
---
src/include/86box/machine.h | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index 5cf520dbf..f37531cec 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -297,15 +297,21 @@ extern int machine_at_i430vx_init(const machine_t *);
extern int machine_at_brio80xx_init(const machine_t *);
extern int machine_at_pb680_init(const machine_t *);
+#if defined(DEV_BRANCH) && defined(NO_SIO)
extern int machine_at_p55xb2_init(const machine_t *);
+#endif
extern int machine_at_tx97_init(const machine_t *);
extern int machine_at_ym430tx_init(const machine_t *);
+#if defined(DEV_BRANCH) && defined(NO_SIO)
extern int machine_at_586t2_init(const machine_t *);
extern int machine_at_807ds_init(const machine_t *);
+#endif
extern int machine_at_p5mms98_init(const machine_t *);
+#if defined(DEV_BRANCH) && defined(NO_SIO)
extern int machine_at_tx100_init(const machine_t *);
extern int machine_at_advanceii_init(const machine_t *);
+#endif
#ifdef EMU_DEVICE_H
extern const device_t *at_pb640_get_device(void);
@@ -320,7 +326,9 @@ extern int machine_at_686nx_init(const machine_t *);
extern int machine_at_mb600n_init(const machine_t *);
extern int machine_at_8500ttc_init(const machine_t *);
extern int machine_at_m6mi_init(const machine_t *);
+#if defined(DEV_BRANCH) && defined(NO_SIO)
extern int machine_at_vs440fx_init(const machine_t *);
+#endif
#ifdef EMU_DEVICE_H
extern void machine_at_p65up5_common_init(const machine_t *, const device_t *northbridge);
#endif
@@ -330,7 +338,9 @@ extern int machine_at_p65up5_cp6nd_init(const machine_t *);
extern int machine_at_p65up5_cpknd_init(const machine_t *);
extern int machine_at_p6kfx_init(const machine_t *);
+#if defined(DEV_BRANCH) && defined(NO_SIO)
extern int machine_at_6bxc_init(const machine_t *);
+#endif
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 *);
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 04/23] 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 */
From 2d4cbcfd77280d3ea3083ebfcb5b1ae9e05f2a81 Mon Sep 17 00:00:00 2001
From: tiseno100 <58827426+tiseno100@users.noreply.github.com>
Date: Sun, 3 May 2020 16:38:05 +0300
Subject: [PATCH 05/23] Added the generic MR 286 clone
---
src/include/86box/machine.h | 1 +
src/machine/m_at_286_386sx.c | 19 +++++++++++++++++++
src/machine/machine_table.c | 1 +
3 files changed, 21 insertions(+)
diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index 6d3e5991f..eb5ea86c4 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -185,6 +185,7 @@ extern int machine_at_tg286m_init(const machine_t *);
extern int machine_at_ama932j_init(const machine_t *);
extern int machine_at_px286_init(const machine_t *);
extern int machine_at_quadt286_init(const machine_t *);
+extern int machine_at_mr286_init(const machine_t *);
extern int machine_at_neat_init(const machine_t *);
extern int machine_at_neat_ami_init(const machine_t *);
diff --git a/src/machine/m_at_286_386sx.c b/src/machine/m_at_286_386sx.c
index c1ccd5d39..fc4615a1a 100644
--- a/src/machine/m_at_286_386sx.c
+++ b/src/machine/m_at_286_386sx.c
@@ -38,6 +38,25 @@
#include <86box/video.h>
#include <86box/machine.h>
+int
+machine_at_mr286_init(const machine_t *model)
+{
+ int ret;
+
+ ret = bios_load_interleaved(L"roms/machines/mr286/V000B200-1",
+ L"roms/machines/mr286/V000B200-2",
+ 0x000f0000, 65536, 0);
+
+ if (bios_only || !ret)
+ return ret;
+
+ machine_at_common_ide_init(model);
+ device_add(&keyboard_at_device);
+ device_add(&fdc_at_device);
+ device_add(&headland_device);
+
+ return ret;
+}
static void
machine_at_headland_common_init(int ht386)
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index 03fff0985..c5de151c1 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -106,6 +106,7 @@ const machine_t machines[] = {
{ "[286 ISA] Award 286 clone", "award286", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512,16384, 128, 127, machine_at_award286_init, NULL },
{ "[286 ISA] Phoenix 286 clone", "px286", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512,16384, 128, 127, machine_at_px286_init, NULL },
{ "[286 ISA] Quadtel 286 clone", "quadt286", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512,16384, 128, 127, machine_at_quadt286_init, NULL },
+ { "[286 ISA] MR 286 clone", "mr286", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512, 8192, 128, 127, machine_at_mr286_init, NULL },
{ "[286 ISA] Commodore PC 30 III", "cmdpc30", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 640,16384, 128, 127, machine_at_cmdpc_init, NULL },
{ "[286 ISA] Compaq Portable II", "portableii", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 640,16384, 128, 127, machine_at_portableii_init, NULL },
{ "[286 ISA] Compaq Portable III", "portableiii", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_VIDEO, 640,16384, 128, 127, machine_at_portableiii_init, at_cpqiii_get_device },
From e0e14498af6484969ef643eda112f2f360b5ae24 Mon Sep 17 00:00:00 2001
From: tiseno100 <58827426+tiseno100@users.noreply.github.com>
Date: Sun, 3 May 2020 16:43:43 +0300
Subject: [PATCH 06/23] Adjusted the RAM size of the MR 286 to 16MB
---
src/machine/machine_table.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index c5de151c1..f71d2edd9 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -106,7 +106,7 @@ const machine_t machines[] = {
{ "[286 ISA] Award 286 clone", "award286", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512,16384, 128, 127, machine_at_award286_init, NULL },
{ "[286 ISA] Phoenix 286 clone", "px286", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512,16384, 128, 127, machine_at_px286_init, NULL },
{ "[286 ISA] Quadtel 286 clone", "quadt286", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512,16384, 128, 127, machine_at_quadt286_init, NULL },
- { "[286 ISA] MR 286 clone", "mr286", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512, 8192, 128, 127, machine_at_mr286_init, NULL },
+ { "[286 ISA] MR 286 clone", "mr286", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512, 16384, 128, 127, machine_at_mr286_init, NULL },
{ "[286 ISA] Commodore PC 30 III", "cmdpc30", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 640,16384, 128, 127, machine_at_cmdpc_init, NULL },
{ "[286 ISA] Compaq Portable II", "portableii", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 640,16384, 128, 127, machine_at_portableii_init, NULL },
{ "[286 ISA] Compaq Portable III", "portableiii", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_VIDEO, 640,16384, 128, 127, machine_at_portableiii_init, at_cpqiii_get_device },
From 721c64a0455662183abc3e81ef427cf60121a2ee Mon Sep 17 00:00:00 2001
From: tiseno100 <58827426+tiseno100@users.noreply.github.com>
Date: Sun, 3 May 2020 20:08:32 +0300
Subject: [PATCH 07/23] Added an ACC 386DX AMI clone
Just a non-OEM AMI board
---
src/include/86box/machine.h | 4 ++--
src/machine/m_at_386dx_486.c | 19 +++++++++++++++++++
src/machine/machine_table.c | 3 ++-
3 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index eb5ea86c4..a6b5a9f0d 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -191,8 +191,6 @@ extern int machine_at_neat_init(const machine_t *);
extern int machine_at_neat_ami_init(const machine_t *);
extern int machine_at_goldstar386_init(const machine_t *);
-extern int machine_at_micronics386_init(const machine_t *);
-
extern int machine_at_award286_init(const machine_t *);
extern int machine_at_gw286ct_init(const machine_t *);
@@ -212,7 +210,9 @@ extern const device_t *at_commodore_sl386sx_get_device(void);
/* m_at_386dx_486.c */
+extern int machine_at_acc386_init(const machine_t *);
extern int machine_at_ecs386_init(const machine_t *);
+extern int machine_at_micronics386_init(const machine_t *);
extern int machine_at_pb410a_init(const machine_t *);
diff --git a/src/machine/m_at_386dx_486.c b/src/machine/m_at_386dx_486.c
index 3832ddc21..e67f95c30 100644
--- a/src/machine/m_at_386dx_486.c
+++ b/src/machine/m_at_386dx_486.c
@@ -42,6 +42,25 @@
#include <86box/intel_sio.h>
#include <86box/machine.h>
+int
+machine_at_acc386_init(const machine_t *model)
+{
+ int ret;
+
+ ret = bios_load_linear(L"roms/machines/acc386/acc386.BIN",
+ 0x000f0000, 65536, 0);
+
+ if (bios_only || !ret)
+ return ret;
+
+ machine_at_common_init(model);
+ device_add(&acc2168_device);
+ device_add(&keyboard_at_ami_device);
+ device_add(&fdc_at_device);
+
+ return ret;
+}
+
int
machine_at_ecs386_init(const machine_t *model)
{
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index f71d2edd9..e6d22d0e3 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -154,7 +154,8 @@ const machine_t machines[] = {
/* 386DX machines */
{ "[386DX ISA] Compaq Portable III (386)", "portableiii386", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC | MACHINE_VIDEO, 1, 14, 1, 127, machine_at_portableiii386_init, at_cpqiii_get_device },
- { "[386DX ISA] ECS 386/32", "ecs386", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512,16384, 512, 127, machine_at_ecs386_init, NULL },
+ { "[386DX ISA] AMI 386DX clone", "acc386", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 512, 16384, 128, 127, machine_at_acc386_init, NULL },
+ { "[386DX ISA] ECS 386/32", "ecs386", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 1, 32, 1, 127, machine_at_ecs386_init, NULL },
{ "[386DX ISA] Micronics 386 clone", "micronics386", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 512, 8192, 128, 127, machine_at_micronics386_init, NULL },
/* 386DX machines which utilize the VLB bus */
From b87b01896a58a19f274ab004ca913f7a6182e4d6 Mon Sep 17 00:00:00 2001
From: tiseno100 <58827426+tiseno100@users.noreply.github.com>
Date: Mon, 4 May 2020 14:59:20 +0300
Subject: [PATCH 08/23] Replaced the TX100 with the FIC VA-502
Socket 7 predecessor to the already added VA-503+
---
src/include/86box/machine.h | 3 ++-
src/machine/m_at_socket7_s7.c | 10 +++++-----
src/machine/machine_table.c | 7 ++++---
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index a6b5a9f0d..aac4ebbfc 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -309,8 +309,9 @@ extern int machine_at_807ds_init(const machine_t *);
#endif
extern int machine_at_p5mms98_init(const machine_t *);
+extern int machine_at_ficva502_init(const machine_t *);
+
#if defined(DEV_BRANCH) && defined(NO_SIO)
-extern int machine_at_tx100_init(const machine_t *);
extern int machine_at_advanceii_init(const machine_t *);
#endif
diff --git a/src/machine/m_at_socket7_s7.c b/src/machine/m_at_socket7_s7.c
index 24a6d533c..c3d2343c5 100644
--- a/src/machine/m_at_socket7_s7.c
+++ b/src/machine/m_at_socket7_s7.c
@@ -879,13 +879,12 @@ machine_at_p5mms98_init(const machine_t *model)
return ret;
}
-#if defined(DEV_BRANCH) && defined(NO_SIO)
int
-machine_at_tx100_init(const machine_t *model)
+machine_at_ficva502_init(const machine_t *model)
{
int ret;
- ret = bios_load_linear(L"roms/machines/tx100/T100108E.rom",
+ ret = bios_load_linear(L"roms/machines/ficva502/VA502bp.BIN",
0x000e0000, 131072, 0);
if (bios_only || !ret)
@@ -902,14 +901,15 @@ machine_at_tx100_init(const machine_t *model)
pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
device_add(&via_vpx_device);
device_add(&via_vt82c586b_device);
- device_add(&keyboard_ps2_ami_pci_device);
- device_add(&um8669f_device); //IT8661F
+ device_add(&keyboard_ps2_pci_device);
+ device_add(&fdc37c669_device);
device_add(&sst_flash_29ee010_device);
spd_register(SPD_TYPE_SDRAM, 0xF, 256);
return ret;
}
+#if defined(DEV_BRANCH) && defined(NO_SIO)
int
machine_at_advanceii_init(const machine_t *model)
{
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index e6d22d0e3..9c40d614b 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -267,10 +267,11 @@ const machine_t machines[] = {
#endif
{ "[Socket 7 TX] SuperMicro P5MMS98", "p5mms98", MACHINE_CPUS_PENTIUM_S7, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 256, 8, 255, machine_at_p5mms98_init, NULL },
-#if defined(DEV_BRANCH) && defined(NO_SIO)
- /* Apollo VPX */
- { "[Socket 7 VPX] Zida Tomato TX100", "tx100", MACHINE_CPUS_PENTIUM_S7, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 512, 8, 127, machine_at_tx100_init, NULL },
+ /* Apollo VPX */
+ { "[Socket 7 VPX] FIC VA-502", "ficva502", MACHINE_CPUS_PENTIUM_S7, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 512, 8, 127, machine_at_ficva502_init, NULL },
+
+#if defined(DEV_BRANCH) && defined(NO_SIO)
/* Apollo VP3 */
{ "[Socket 7 VP3] QDI Advance II", "advanceii", MACHINE_CPUS_PENTIUM_S7, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_advanceii_init, NULL },
#endif
From b23031fa65e19f38f16c89e5420a68b2de614453 Mon Sep 17 00:00:00 2001
From: tiseno100 <58827426+tiseno100@users.noreply.github.com>
Date: Mon, 4 May 2020 17:14:59 +0300
Subject: [PATCH 09/23] The KENITEC serves the Phoenix 286 Clone
Unbranded NEAT Bios that work much better than Headland
---
src/machine/m_at_286_386sx.c | 40 ++++++++++++++++++------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/machine/m_at_286_386sx.c b/src/machine/m_at_286_386sx.c
index fc4615a1a..113cb49b9 100644
--- a/src/machine/m_at_286_386sx.c
+++ b/src/machine/m_at_286_386sx.c
@@ -139,26 +139,6 @@ machine_at_ama932j_init(const machine_t *model)
return ret;
}
-int
-machine_at_px286_init(const machine_t *model)
-{
- int ret;
-
- ret = bios_load_interleaved(L"roms/machines/px286/286-Headland-LO.BIN",
- L"roms/machines/px286/286-Headland-HI.BIN",
- 0x000f0000, 131072, 0);
-
- if (bios_only || !ret)
- return ret;
-
- machine_at_common_ide_init(model);
- device_add(&keyboard_at_device);
- device_add(&fdc_at_device);
- device_add(&headland_device);
-
- return ret;
-}
-
int
machine_at_quadt286_init(const machine_t *model)
{
@@ -220,6 +200,26 @@ machine_at_neat_ami_init(const machine_t *model)
return ret;
}
+int
+machine_at_px286_init(const machine_t *model)
+{
+ int ret;
+
+ ret = bios_load_linear(L"roms/machines/px286/KENITEC.BIN",
+ 0x000f0000, 65536, 0);
+
+ if (bios_only || !ret)
+ return ret;
+
+ machine_at_common_init(model);
+ device_add(&keyboard_at_device);
+ device_add(&fdc_at_device);
+ device_add(&neat_device);
+
+ return ret;
+}
+
+
int
machine_at_goldstar386_init(const machine_t *model)
{
From 5415b8404105ebf15f33c83864b63086832a2d26 Mon Sep 17 00:00:00 2001
From: tiseno100 <58827426+tiseno100@users.noreply.github.com>
Date: Mon, 4 May 2020 17:33:36 +0300
Subject: [PATCH 10/23] Implemented the ACUMOS AVGA1
meant for the new Phoenix 286 clone
---
src/include/86box/video.h | 1 +
src/video/vid_cl54xx.c | 26 ++++++++++++++++++++++++++
2 files changed, 27 insertions(+)
diff --git a/src/include/86box/video.h b/src/include/86box/video.h
index 04f81c628..3ae6d3cf2 100644
--- a/src/include/86box/video.h
+++ b/src/include/86box/video.h
@@ -211,6 +211,7 @@ extern const device_t ati28800_wonderxl24_device;
#endif
/* Cirrus Logic CL-GD 54xx */
+extern const device_t gd5401_isa_device;
extern const device_t gd5402_isa_device;
extern const device_t gd5402_onboard_device;
extern const device_t gd5420_isa_device;
diff --git a/src/video/vid_cl54xx.c b/src/video/vid_cl54xx.c
index 9df438696..ddcb5624f 100644
--- a/src/video/vid_cl54xx.c
+++ b/src/video/vid_cl54xx.c
@@ -36,6 +36,7 @@
#include <86box/vid_svga.h>
#include <86box/vid_svga_render.h>
+#define BIOS_GD5401_PATH L"roms/video/cirruslogic/avga1.rom"
#define BIOS_GD5402_PATH L"roms/video/cirruslogic/avga2.rom"
#define BIOS_GD5402_ONBOARD_PATH L"roms/video/machines/cbm_sl386sx25/Commodore386SX-25_AVGA2.bin"
#define BIOS_GD5420_PATH L"roms/video/cirruslogic/5420.vbi"
@@ -57,6 +58,7 @@
#define BIOS_GD5446_STB_PATH L"roms/video/cirruslogic/stb nitro64v.BIN"
#define BIOS_GD5480_PATH L"roms/video/cirruslogic/clgd5480.rom"
+#define CIRRUS_ID_CLGD5401 0x88
#define CIRRUS_ID_CLGD5402 0x89
#define CIRRUS_ID_CLGD5420 0x8a
#define CIRRUS_ID_CLGD5422 0x8c
@@ -2960,6 +2962,11 @@ static void
gd54xx->has_bios = 1;
switch (id) {
+
+ case CIRRUS_ID_CLGD5401:
+ romfn = BIOS_GD5401_PATH;
+ break;
+
case CIRRUS_ID_CLGD5402:
if (info->local & 0x200)
romfn = BIOS_GD5402_ONBOARD_PATH;
@@ -3133,6 +3140,12 @@ static void
return gd54xx;
}
+static int
+gd5401_available(void)
+{
+ return rom_present(BIOS_GD5401_PATH);
+}
+
static int
gd5402_available(void)
{
@@ -3355,6 +3368,19 @@ static const device_config_t gd5434_config[] =
}
};
+const device_t gd5401_isa_device =
+{
+ "Cirrus Logic GD-5401 (ACUMOS AVGA1)",
+ DEVICE_AT | DEVICE_ISA,
+ CIRRUS_ID_CLGD5401,
+ gd54xx_init, gd54xx_close,
+ NULL,
+ gd5401_available,
+ gd54xx_speed_changed,
+ gd54xx_force_redraw,
+ NULL,
+};
+
const device_t gd5402_isa_device =
{
"Cirrus Logic GD-5402 (ACUMOS AVGA2)",
From 1ef6f8da0c6aee9449389771d17c15ac29bf8035 Mon Sep 17 00:00:00 2001
From: tiseno100 <58827426+tiseno100@users.noreply.github.com>
Date: Mon, 4 May 2020 17:35:12 +0300
Subject: [PATCH 11/23] Added the AVGA1 on the video table
---
src/video/vid_table.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/video/vid_table.c b/src/video/vid_table.c
index f1f10835b..1305547cb 100644
--- a/src/video/vid_table.c
+++ b/src/video/vid_table.c
@@ -68,6 +68,7 @@ video_cards[] = {
#endif
{ "[ISA] CGA", "cga", &cga_device },
{ "[ISA] Chips & Technologies SuperEGA", "superega", &sega_device },
+ { "[ISA] Cirrus Logic CL-GD 5401", "cl_gd5401_isa", &gd5401_isa_device },
{ "[ISA] Cirrus Logic CL-GD 5402", "cl_gd5402_isa", &gd5402_isa_device },
{ "[ISA] Cirrus Logic CL-GD 5420", "cl_gd5420_isa", &gd5420_isa_device },
#if defined(DEV_BRANCH) && defined(USE_CL5422)
From 5e29bb7eb79dad771abcc0dd7689f4269ee1d0b9 Mon Sep 17 00:00:00 2001
From: tiseno100 <58827426+tiseno100@users.noreply.github.com>
Date: Tue, 5 May 2020 11:46:59 +0300
Subject: [PATCH 12/23] Added the FIC PA-2012
Motherboard of historic significance as it's the first ever one which came with AGP
---
src/include/86box/machine.h | 1 +
src/machine/m_at_socket7_s7.c | 30 ++++++++++++++++++++++++++++++
src/machine/machine_table.c | 3 ++-
3 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index aac4ebbfc..fd2ab8986 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -311,6 +311,7 @@ extern int machine_at_p5mms98_init(const machine_t *);
extern int machine_at_ficva502_init(const machine_t *);
+extern int machine_at_ficpa2012_init(const machine_t *);
#if defined(DEV_BRANCH) && defined(NO_SIO)
extern int machine_at_advanceii_init(const machine_t *);
#endif
diff --git a/src/machine/m_at_socket7_s7.c b/src/machine/m_at_socket7_s7.c
index c3d2343c5..020603c60 100644
--- a/src/machine/m_at_socket7_s7.c
+++ b/src/machine/m_at_socket7_s7.c
@@ -909,6 +909,36 @@ machine_at_ficva502_init(const machine_t *model)
return ret;
}
+int
+machine_at_ficpa2012_init(const machine_t *model)
+{
+ int ret;
+
+ ret = bios_load_linear(L"roms/machines/ficpa2012/113jb16.awd",
+ 0x000e0000, 131072, 0);
+
+ if (bios_only || !ret)
+ return ret;
+
+ machine_at_common_init_ex(model, 2);
+
+ pci_init(PCI_CONFIG_TYPE_1);
+ pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+ pci_register_slot(0x08, PCI_CARD_NORMAL, 1, 2, 3, 4);
+ pci_register_slot(0x09, PCI_CARD_NORMAL, 2, 3, 4, 1);
+ pci_register_slot(0x0A, PCI_CARD_NORMAL, 3, 4, 1, 2);
+ pci_register_slot(0x0B, PCI_CARD_NORMAL, 4, 1, 2, 3);
+ pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
+ device_add(&via_vp3_device);
+ device_add(&via_vt82c586b_device);
+ device_add(&keyboard_ps2_pci_device);
+ device_add(&w83877f_device);
+ device_add(&sst_flash_39sf010_device);
+ spd_register(SPD_TYPE_SDRAM, 0xF, 64);
+
+ return ret;
+}
+
#if defined(DEV_BRANCH) && defined(NO_SIO)
int
machine_at_advanceii_init(const machine_t *model)
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index 9c40d614b..00f524949 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -271,8 +271,9 @@ const machine_t machines[] = {
/* Apollo VPX */
{ "[Socket 7 VPX] FIC VA-502", "ficva502", MACHINE_CPUS_PENTIUM_S7, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 512, 8, 127, machine_at_ficva502_init, NULL },
-#if defined(DEV_BRANCH) && defined(NO_SIO)
/* Apollo VP3 */
+ { "[Socket 7 VP3] FIC PA-2012", "ficpa2012", MACHINE_CPUS_PENTIUM_S7, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 192, 8, 127, machine_at_ficpa2012_init, NULL },
+#if defined(DEV_BRANCH) && defined(NO_SIO)
{ "[Socket 7 VP3] QDI Advance II", "advanceii", MACHINE_CPUS_PENTIUM_S7, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_advanceii_init, NULL },
#endif
From 2e1778e1bd2d6854476851bdd775e8b917580960 Mon Sep 17 00:00:00 2001
From: tiseno100 <58827426+tiseno100@users.noreply.github.com>
Date: Tue, 5 May 2020 12:10:15 +0300
Subject: [PATCH 13/23] Removed the Intel VS440FX
It doesn't POST and on all of that, not helpful at all on PC87307 development.
---
src/include/86box/machine.h | 3 ---
src/machine/m_at_socket8.c | 32 --------------------------------
src/machine/machine_table.c | 5 +----
3 files changed, 1 insertion(+), 39 deletions(-)
diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index fd2ab8986..c4af4a08e 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -329,9 +329,6 @@ extern int machine_at_686nx_init(const machine_t *);
extern int machine_at_mb600n_init(const machine_t *);
extern int machine_at_8500ttc_init(const machine_t *);
extern int machine_at_m6mi_init(const machine_t *);
-#if defined(DEV_BRANCH) && defined(NO_SIO)
-extern int machine_at_vs440fx_init(const machine_t *);
-#endif
#ifdef EMU_DEVICE_H
extern void machine_at_p65up5_common_init(const machine_t *, const device_t *northbridge);
#endif
diff --git a/src/machine/m_at_socket8.c b/src/machine/m_at_socket8.c
index dba53237b..fd7b5bcea 100644
--- a/src/machine/m_at_socket8.c
+++ b/src/machine/m_at_socket8.c
@@ -158,38 +158,6 @@ machine_at_m6mi_init(const machine_t *model)
return ret;
}
-#if defined(DEV_BRANCH) && defined(NO_SIO)
-int
-machine_at_vs440fx_init(const machine_t *model)
-{
- int ret;
-
- ret = bios_load_linear_combined2(L"roms/machines/vs440fx/1011CS1_.BIO",
- L"roms/machines/vs440fx/1011CS1_.BI1",
- L"roms/machines/vs440fx/1011CS1_.BI2",
- L"roms/machines/vs440fx/1011CS1_.BI3",
- L"roms/machines/vs440fx/1011CS1_.RCV",
- 0x3a000, 128);
-
- if (bios_only || !ret)
- return ret;
-
- machine_at_common_init(model);
-
- pci_init(PCI_CONFIG_TYPE_1);
- pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
- pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
- device_add(&i440fx_device);
- device_add(&piix3_device);
- device_add(&keyboard_ps2_ami_pci_device);
- //device_add(&pc87307_device);
- device_add(&pc87306_device);
- device_add(&intel_flash_bxt_ami_device);
-
- return ret;
-}
-#endif
-
void
machine_at_p65up5_common_init(const machine_t *model, const device_t *northbridge)
{
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index 00f524949..22ea3b0cb 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -288,9 +288,6 @@ const machine_t machines[] = {
{ "[Socket 8 FX] PC Partner MB600N", "mb600n", {{"Intel", cpus_PentiumPro}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 512, 8, 127, machine_at_mb600n_init, NULL },
{ "[Socket 8 FX] Biostar MB-8500ttc", "8500ttc", {{"Intel", cpus_PentiumPro}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 512, 8, 127, machine_at_8500ttc_init, NULL },
{ "[Socket 8 FX] Micronics M6MI", "m6mi", {{"Intel", cpus_PentiumPro}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 384, 8, 127, machine_at_m6mi_init, NULL },
-#if defined(DEV_BRANCH) && defined(NO_SIO)
- { "[Socket 8 FX] Intel VS440FX", "vs440fx", {{"Intel", cpus_PentiumPro}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 256, 8, 127, machine_at_vs440fx_init, NULL },
-#endif
{ "[Socket 8 FX] ASUS P/I-P65UP5 (C-P6ND)", "p65up5_cp6nd", {{"Intel", cpus_PentiumPro}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 512, 8, 127, machine_at_p65up5_cp6nd_init, NULL },
@@ -301,8 +298,8 @@ const machine_t machines[] = {
/* 440LX */
- /* 440BX */
#if defined(DEV_BRANCH) && defined(NO_SIO)
+ /* 440BX */
{ "[Slot 1 BX] Gigabyte GA-6BXC", "6bxc", {{"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_6bxc_init, NULL },
#endif
{ "[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 },
From f83b1d2609291df5554e4361074ac67c10784ce6 Mon Sep 17 00:00:00 2001
From: tiseno100 <58827426+tiseno100@users.noreply.github.com>
Date: Tue, 5 May 2020 12:11:48 +0300
Subject: [PATCH 14/23] Small change on the 440BX comment
It was inside on the 6BXC's NO_SIO dev branch by accident
---
src/machine/machine_table.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index 22ea3b0cb..adca17b4a 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -298,8 +298,8 @@ const machine_t machines[] = {
/* 440LX */
-#if defined(DEV_BRANCH) && defined(NO_SIO)
/* 440BX */
+#if defined(DEV_BRANCH) && defined(NO_SIO)
{ "[Slot 1 BX] Gigabyte GA-6BXC", "6bxc", {{"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_6bxc_init, NULL },
#endif
{ "[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 },
From b6207798968447419aac36bd58fbdbcbecb097ef Mon Sep 17 00:00:00 2001
From: tiseno100 <58827426+tiseno100@users.noreply.github.com>
Date: Tue, 5 May 2020 12:17:58 +0300
Subject: [PATCH 15/23] Corrected the ROM location of the Soltek board
---
src/machine/m_at_socket370.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/machine/m_at_socket370.c b/src/machine/m_at_socket370.c
index 009999f07..871b3cc6b 100644
--- a/src/machine/m_at_socket370.c
+++ b/src/machine/m_at_socket370.c
@@ -140,7 +140,7 @@ machine_at_63a_init(const machine_t *model)
difference between to chipsets other than the name. */
int ret;
- ret = bios_load_linear(L"roms/machines/63a/63a-q3.bin",
+ ret = bios_load_linear(L"roms/machines/63a1/63a-q3.bin",
0x000c0000, 262144, 0);
if (bios_only || !ret)
@@ -198,4 +198,3 @@ machine_at_apas3_init(const machine_t *model)
return ret;
}
-
From 811fac7064c6a4735540d1dffaf92971afa46375 Mon Sep 17 00:00:00 2001
From: tiseno100 <58827426+tiseno100@users.noreply.github.com>
Date: Tue, 5 May 2020 13:29:59 +0300
Subject: [PATCH 16/23] Corrected the Mendocino multipliers
Now the Mendocino's use the correct intended multipliers.
---
src/cpu_common/cpu_table.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/cpu_common/cpu_table.c b/src/cpu_common/cpu_table.c
index 620d94eaa..8fb271b47 100644
--- a/src/cpu_common/cpu_table.c
+++ b/src/cpu_common/cpu_table.c
@@ -720,29 +720,29 @@ CPU cpus_PentiumII[] = {
{"Pentium II Deschutes 350", CPU_PENTIUM2D, 350000000, 3.5, 0x651, 0x651, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 32,32,11,11, 42},
{"Pentium II Deschutes 400", CPU_PENTIUM2D, 400000000, 4.0, 0x652, 0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 36,36,12,12, 48},
{"Pentium II Deschutes 450", CPU_PENTIUM2D, 450000000, 4.5, 0x652, 0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 41,41,14,14, 54},
+
+ /*Intel Celeron Mendocino Mobile(Applied on a BGA615 Socket)*/
+ {"Mobile Celeron Mendocino 466", CPU_PENTIUM2D, 466666666, 7.0, 0x66a, 0x66a, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 40,40,14,14, 52},
{"", -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
};
CPU cpus_Celeron[] = {
- /* Mendocino Celerons. Exact architecture as the P2D series. Intended for
- the PGA370 boards but they were capable to fit on a PGA 370 to Slot 1
+ /* Mendocino Celerons. Exact architecture as the P2D series with their L2 cache on-dye.
+ Intended for the PGA370 boards but they were capable to fit on a PGA 370 to Slot 1
adaptor card so they work on Slot 1 motherboards too!.
- The 100Mhz Mendocino is only meant to not cause any struggle
+ The 100Mhz & 166Mhz Mendocino is only meant to not cause any struggle
to the recompiler. */
- {"Celeron Mendocino 25", CPU_PENTIUM2D, 25000000, 1.0, 0x665, 0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 4, 4, 3, 3, 3},
- {"Celeron Mendocino 50", CPU_PENTIUM2D, 50000000, 1.0, 0x665, 0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 4, 4, 3, 3, 6},
- {"Celeron Mendocino 66", CPU_PENTIUM2D, 66666666, 1.0, 0x665, 0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 6, 6, 3, 3, 8},
{"Celeron Mendocino 100", CPU_PENTIUM2D, 100000000, 1.5, 0x665, 0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 10,10, 6, 6, 12},
+ {"Celeron Mendocino 166", CPU_PENTIUM2D, 166666666, 2.5, 0x665, 0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 15,15, 7, 7, 20},
{"Celeron Mendocino 300/66", CPU_PENTIUM2D, 300000000, 4.5, 0x665, 0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 25,25,12,12, 36},
{"Celeron Mendocino 333", CPU_PENTIUM2D, 333333333, 5.0, 0x665, 0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 27,27,13,13, 40},
{"Celeron Mendocino 366", CPU_PENTIUM2D, 366666666, 5.5, 0x665, 0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 33,33,17,17, 44},
- {"Celeron Mendocino 400", CPU_PENTIUM2D, 400000000, 4.0, 0x665, 0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 36,36,12,12, 48},
- {"Celeron Mendocino 433", CPU_PENTIUM2D, 433333333, 4.5, 0x665, 0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 39,39,13,13, 51},
- {"Celeron Mendocino 466", CPU_PENTIUM2D, 466666666, 5.0, 0x665, 0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 43,43,15,15, 57},
- {"Celeron Mendocino 500", CPU_PENTIUM2D, 500000000, 5.0, 0x665, 0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 45,45,15,15, 60},
- {"Celeron Mendocino 533", CPU_PENTIUM2D, 533333333, 5.5, 0x665, 0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 48,48,17,17, 64},
+ {"Celeron Mendocino 400", CPU_PENTIUM2D, 400000000, 6.0, 0x665, 0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 36,36,12,12, 48},
+ {"Celeron Mendocino 433", CPU_PENTIUM2D, 433333333, 6.5, 0x665, 0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 39,39,13,13, 51},
+ {"Celeron Mendocino 500", CPU_PENTIUM2D, 500000000, 7.5, 0x665, 0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 45,45,15,15, 60},
+ {"Celeron Mendocino 533", CPU_PENTIUM2D, 533333333, 8.0, 0x665, 0x665, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 48,48,17,17, 64},
{"", -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
};
From c9003894ed1d7ff0f561296cc8b0a1f90f20e03b Mon Sep 17 00:00:00 2001
From: tiseno100 <58827426+tiseno100@users.noreply.github.com>
Date: Thu, 7 May 2020 17:51:53 +0300
Subject: [PATCH 17/23] Few minor changes on the VPX
---
src/chipset/via_vpx.c | 44 ++++++++++++++++++++++---------------------
1 file changed, 23 insertions(+), 21 deletions(-)
diff --git a/src/chipset/via_vpx.c b/src/chipset/via_vpx.c
index f19d682e1..c9798e319 100644
--- a/src/chipset/via_vpx.c
+++ b/src/chipset/via_vpx.c
@@ -1,25 +1,25 @@
/*
-
- 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.
-
-
-
-VIA Apollo VPX North Bridge emulation
-
-VT82C585VPX used in the Zida Tomato TX100 board
-based on the model of VIA MVP3 by mooch & Sarah
-
-There's also a SOYO board using the ETEQ chipset which is a rebranded
-VPX + 586B but fails to save on CMOS properly.
-
-Authors: Sarah Walker,
-Copyright(C) 2020 Tiseno100
-Copyright(C) 2020 Melissa Goad
-Copyright(C) 2020 Miran Grca
-
+*
+* 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.
+*
+*
+*
+* VIA Apollo VPX North Bridge emulation
+*
+* VT82C585VPX used in the FIC VA-502 board
+* based on the model of VIA MVP3 by mooch & Sarah
+*
+* There's also a SOYO board using the ETEQ chipset which is a rebranded
+* VPX + 586B but fails to save on CMOS properly.
+*
+* Authors: Sarah Walker,
+* Copyright(C) 2020 Tiseno100
+* Copyright(C) 2020 Melissa Goad
+* Copyright(C) 2020 Miran Grca
+*
*/
#include
@@ -88,6 +88,8 @@ via_vpx_t *dev = (via_vpx_t *) priv;
} else if(dev->pci_conf[0x04] && 0x200){ //Bitfield 9
dev->pci_conf[0x04] = (dev->pci_conf[0x04] & ~0x200) | (val & 0x200);
}
+ break;
+
case 0x07: // Status
dev->pci_conf[0x07] &= ~(val & 0xb0);
break;
From d4e1f2e405df1d9d1cab36aa0c00fd425c1c55b2 Mon Sep 17 00:00:00 2001
From: tiseno100 <58827426+tiseno100@users.noreply.github.com>
Date: Thu, 7 May 2020 17:54:43 +0300
Subject: [PATCH 18/23] Removed the Award 430FX President board. Replaced it
with the QDI Chariot
As we didn't have enough information for that board, it was removed and replaced with the QDI Chariot.
---
src/include/86box/machine.h | 3 ++-
src/machine/m_at_socket4_5.c | 31 -------------------------------
src/machine/m_at_socket7_s7.c | 30 +++++++++++++++++++++++++++++-
src/machine/machine_table.c | 9 +++++++--
4 files changed, 38 insertions(+), 35 deletions(-)
diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index c4af4a08e..7a28a53f6 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -199,6 +199,7 @@ extern int machine_at_spc4200p_init(const machine_t *);
extern int machine_at_spc4216p_init(const machine_t *);
extern int machine_at_kmxc02_init(const machine_t *);
extern int machine_at_deskmaster286_init(const machine_t *);
+extern int machine_at_alr_init(const machine_t *);
extern int machine_at_commodore_sl386sx_init(const machine_t *);
extern int machine_at_wd76c10_init(const machine_t *);
@@ -265,7 +266,6 @@ extern int machine_at_p54tp4xe_init(const machine_t *);
extern int machine_at_endeavor_init(const machine_t *);
extern int machine_at_zappa_init(const machine_t *);
extern int machine_at_mb500n_init(const machine_t *);
-extern int machine_at_president_init(const machine_t *);
#if defined(DEV_BRANCH) && defined(USE_VECTRA54)
extern int machine_at_vectra54_init(const machine_t *);
#endif
@@ -276,6 +276,7 @@ extern const device_t *at_endeavor_get_device(void);
#endif
/* m_at_socket7_s7.c */
+extern int machine_at_chariot_init(const machine_t *);
extern int machine_at_thor_init(const machine_t *);
#if defined(DEV_BRANCH) && defined(USE_MRTHOR)
extern int machine_at_mrthor_init(const machine_t *);
diff --git a/src/machine/m_at_socket4_5.c b/src/machine/m_at_socket4_5.c
index 81dcb13ac..793b7e977 100644
--- a/src/machine/m_at_socket4_5.c
+++ b/src/machine/m_at_socket4_5.c
@@ -353,37 +353,6 @@ machine_at_mb500n_init(const machine_t *model)
return ret;
}
-
-int
-machine_at_president_init(const machine_t *model)
-{
- int ret;
-
- ret = bios_load_linear(L"roms/machines/president/bios.bin",
- 0x000e0000, 131072, 0);
-
- if (bios_only || !ret)
- return ret;
-
- machine_at_common_init(model);
-
- pci_init(PCI_CONFIG_TYPE_1);
- pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
- pci_register_slot(0x08, PCI_CARD_NORMAL, 1, 2, 3, 4);
- pci_register_slot(0x09, PCI_CARD_NORMAL, 2, 3, 4, 1);
- pci_register_slot(0x0A, PCI_CARD_NORMAL, 3, 4, 1, 2);
- pci_register_slot(0x0B, PCI_CARD_NORMAL, 4, 1, 2, 3);
- pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
- device_add(&i430fx_device);
- device_add(&piix_device);
- device_add(&keyboard_ps2_pci_device);
- device_add(&w83877f_president_device);
- device_add(&intel_flash_bxt_device);
-
- return ret;
-}
-
-
#if defined(DEV_BRANCH) && defined(USE_VECTRA54)
int
machine_at_vectra54_init(const machine_t *model)
diff --git a/src/machine/m_at_socket7_s7.c b/src/machine/m_at_socket7_s7.c
index 020603c60..dbfc7e655 100644
--- a/src/machine/m_at_socket7_s7.c
+++ b/src/machine/m_at_socket7_s7.c
@@ -45,6 +45,35 @@
#include "cpu.h"
#include <86box/machine.h>
+int
+machine_at_chariot_init(const machine_t *model)
+{
+ int ret;
+
+ ret = bios_load_linear(L"roms/machines/chariot/P5IV183.ROM",
+ 0x000e0000, 131072, 0);
+
+ if (bios_only || !ret)
+ return ret;
+
+ machine_at_common_init(model);
+
+ pci_init(PCI_CONFIG_TYPE_1);
+ pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+ pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
+ pci_register_slot(0x14, PCI_CARD_NORMAL, 1, 2, 3, 4);
+ pci_register_slot(0x13, PCI_CARD_NORMAL, 2, 3, 4, 1);
+ pci_register_slot(0x12, PCI_CARD_NORMAL, 3, 4, 2, 1);
+ pci_register_slot(0x11, PCI_CARD_NORMAL, 4, 3, 2, 1);
+
+ device_add(&i430fx_device);
+ device_add(&piix_device);
+ device_add(&keyboard_ps2_ami_pci_device);
+ device_add(&pc87306_device);
+ device_add(&intel_flash_bxt_device);
+
+ return ret;
+}
static void
machine_at_thor_common_init(const machine_t *model, int mr)
@@ -138,7 +167,6 @@ machine_at_pb640_init(const machine_t *model)
return ret;
}
-
const device_t *
at_pb640_get_device(void)
{
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index adca17b4a..d11f72ac2 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -37,11 +37,13 @@
#if defined(DEV_BRANCH) && defined(USE_CYRIX_6X86)
#define MACHINE_CPUS_PENTIUM_S5 {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"AMD", cpus_K5}, {"", NULL}, {"", NULL}}
#define MACHINE_CPUS_PENTIUM_S73V {{ "Intel", cpus_Pentium3V}, {"IDT", cpus_WinChip}, {"AMD", cpus_K5}, {"Cyrix", cpus_6x863V}, {"", NULL}}
+#define MACHINE_CPUS_PENTIUM_S73VCH {{ "Intel", cpus_Pentium3V}, {"AMD", cpus_K5}, {"", NULL}, {"", NULL}, {"", NULL}}
#define MACHINE_CPUS_PENTIUM_S7 {{ "Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"AMD", cpus_K56}, {"Cyrix", cpus_6x86}, {"", NULL}}
#define MACHINE_CPUS_PENTIUM_SS7 {{ "Intel", cpus_Pentium}, {"IDT", cpus_WinChip_SS7}, {"AMD", cpus_K56_SS7}, {"Cyrix", cpus_6x86SS7}, {"", NULL}}
#else
#define MACHINE_CPUS_PENTIUM_S5 {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"AMD", cpus_K5}, {"", NULL}, {"", NULL}}
#define MACHINE_CPUS_PENTIUM_S73V {{ "Intel", cpus_Pentium3V}, {"IDT", cpus_WinChip}, {"AMD", cpus_K5}, {"", NULL}, {"", NULL}}
+#define MACHINE_CPUS_PENTIUM_S73VCH {{ "Intel", cpus_Pentium3V}, {"AMD", cpus_K5}, {"", NULL}, {"", NULL}, {"", NULL}}
#define MACHINE_CPUS_PENTIUM_S7 {{ "Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"AMD", cpus_K56}, {"", NULL}, {"", NULL}}
#define MACHINE_CPUS_PENTIUM_SS7 {{ "Intel", cpus_Pentium}, {"IDT", cpus_WinChip_SS7}, {"AMD", cpus_K56_SS7}, {"", NULL}, {"", NULL}}
#endif
@@ -49,11 +51,13 @@
#if defined(DEV_BRANCH) && defined(USE_CYRIX_6X86)
#define MACHINE_CPUS_PENTIUM_S5 {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"", NULL}, {"", NULL}, {"", NULL}}
#define MACHINE_CPUS_PENTIUM_S73V {{ "Intel", cpus_Pentium3V}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x863V}, {"", NULL}, {"", NULL}}
+#define MACHINE_CPUS_PENTIUM_S73VCH {{ "Intel", cpus_Pentium3V}, {"AMD", cpus_K5}, {"", NULL}, {"", NULL}, {"", NULL}}
#define MACHINE_CPUS_PENTIUM_S7 {{ "Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"AMD", cpus_K56}, {"Cyrix", cpus_6x86}, {"", NULL}}
#define MACHINE_CPUS_PENTIUM_SS7 {{ "Intel", cpus_Pentium}, {"IDT", cpus_WinChip_SS7}, {"AMD", cpus_K56_SS7}, {"Cyrix", cpus_6x86SS7}, {"", NULL}}
#else
#define MACHINE_CPUS_PENTIUM_S5 {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"", NULL}, {"", NULL}, {"", NULL}}
#define MACHINE_CPUS_PENTIUM_S73V {{ "Intel", cpus_Pentium3V}, {"IDT", cpus_WinChip}, {"", NULL}, {"", NULL}, {"", NULL}}
+#define MACHINE_CPUS_PENTIUM_S73VCH {{ "Intel", cpus_Pentium3V}, {"AMD", cpus_K5}, {"", NULL}, {"", NULL}, {"", NULL}}
#define MACHINE_CPUS_PENTIUM_S7 {{ "Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"AMD", cpus_K56}, {"", NULL}, {"", NULL}}
#define MACHINE_CPUS_PENTIUM_SS7 {{ "Intel", cpus_Pentium}, {"IDT", cpus_WinChip_SS7}, {"AMD", cpus_K56_SS7}, {"", NULL}, {"", NULL}}
#endif
@@ -131,6 +135,7 @@ const machine_t machines[] = {
{ "[286 ISA] Trigem 286M", "tg286m", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 512, 8192, 128, 127, machine_at_tg286m_init, NULL },
{ "[286 ISA] Samsung Deskmaster 286", "deskmaster286", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512,16384, 128, 127, machine_at_deskmaster286_init, NULL },
+ { "[286 ISA] ALR", "alr", {{"286", cpus_286}, {"386SX", cpus_i386SX}, {"486", cpus_i486S1}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512,16384, 128, 127, machine_at_alr_init, NULL },
/* 286 machines that utilize the MCA bus */
{ "[286 MCA] IBM PS/2 model 50", "ibmps2_m50", {{"Intel", cpus_ps2_m30_286}, {"IBM",cpus_IBM486SLC},{"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_MCA | MACHINE_AT | MACHINE_PS2 | MACHINE_VIDEO, 1, 10, 1, 63, machine_ps2_model_50_init, NULL },
@@ -224,11 +229,11 @@ const machine_t machines[] = {
{ "[Socket 5 FX] Intel Advanced/ZP", "zappa", MACHINE_CPUS_PENTIUM_S5, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_zappa_init, NULL },
{ "[Socket 5 FX] NEC PowerMate V", "powermate_v", MACHINE_CPUS_PENTIUM_S5, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_powermate_v_init, NULL },
{ "[Socket 5 FX] PC Partner MB500N", "mb500n", MACHINE_CPUS_PENTIUM_S5, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 8, 128, 8, 127, machine_at_mb500n_init, NULL },
- { "[Socket 5 FX] President Award 430FX PCI","president", MACHINE_CPUS_PENTIUM_S5, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 8, 128, 8, 127, machine_at_president_init, NULL },
/* Socket 7 machines */
/* 430FX */
{ "[Socket 7-3V FX] ASUS P/I-P54TP4XE", "p54tp4xe", MACHINE_CPUS_PENTIUM_S73V, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_p54tp4xe_init, NULL },
+ { "[Socket 7-3V FX] QDI Chariot", "chariot", MACHINE_CPUS_PENTIUM_S73VCH, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_chariot_init, NULL },
{ "[Socket 7-3V FX] Intel Advanced/ATX", "thor", MACHINE_CPUS_PENTIUM_S73V, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_thor_init, NULL },
{ "[Socket 7-3V FX] Intel Advanced/EV", "endeavor", MACHINE_CPUS_PENTIUM_S73V, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC | MACHINE_VIDEO, 8, 128, 8, 127, machine_at_endeavor_init, at_endeavor_get_device },
#if defined(DEV_BRANCH) && defined(USE_MRTHOR)
@@ -298,8 +303,8 @@ const machine_t machines[] = {
/* 440LX */
- /* 440BX */
#if defined(DEV_BRANCH) && defined(NO_SIO)
+ /* 440BX */
{ "[Slot 1 BX] Gigabyte GA-6BXC", "6bxc", {{"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_6bxc_init, NULL },
#endif
{ "[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 },
From 6888a6ca47f41a41f7ca752a70a73a16ac7103e6 Mon Sep 17 00:00:00 2001
From: tiseno100 <58827426+tiseno100@users.noreply.github.com>
Date: Thu, 7 May 2020 17:56:55 +0300
Subject: [PATCH 19/23] Removed ALR references
The ALR board is not yet planned for addition so it's removed.
---
src/include/86box/machine.h | 1 -
src/machine/machine_table.c | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index 7a28a53f6..b6f4e2a59 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -199,7 +199,6 @@ extern int machine_at_spc4200p_init(const machine_t *);
extern int machine_at_spc4216p_init(const machine_t *);
extern int machine_at_kmxc02_init(const machine_t *);
extern int machine_at_deskmaster286_init(const machine_t *);
-extern int machine_at_alr_init(const machine_t *);
extern int machine_at_commodore_sl386sx_init(const machine_t *);
extern int machine_at_wd76c10_init(const machine_t *);
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index d11f72ac2..ff34f449d 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -135,7 +135,6 @@ const machine_t machines[] = {
{ "[286 ISA] Trigem 286M", "tg286m", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 512, 8192, 128, 127, machine_at_tg286m_init, NULL },
{ "[286 ISA] Samsung Deskmaster 286", "deskmaster286", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512,16384, 128, 127, machine_at_deskmaster286_init, NULL },
- { "[286 ISA] ALR", "alr", {{"286", cpus_286}, {"386SX", cpus_i386SX}, {"486", cpus_i486S1}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512,16384, 128, 127, machine_at_alr_init, NULL },
/* 286 machines that utilize the MCA bus */
{ "[286 MCA] IBM PS/2 model 50", "ibmps2_m50", {{"Intel", cpus_ps2_m30_286}, {"IBM",cpus_IBM486SLC},{"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_MCA | MACHINE_AT | MACHINE_PS2 | MACHINE_VIDEO, 1, 10, 1, 63, machine_ps2_model_50_init, NULL },
@@ -303,8 +302,8 @@ const machine_t machines[] = {
/* 440LX */
-#if defined(DEV_BRANCH) && defined(NO_SIO)
/* 440BX */
+#if defined(DEV_BRANCH) && defined(NO_SIO)
{ "[Slot 1 BX] Gigabyte GA-6BXC", "6bxc", {{"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_6bxc_init, NULL },
#endif
{ "[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 },
From 2a93df7df977b8323cff42877924a36f58140f14 Mon Sep 17 00:00:00 2001
From: tiseno100 <58827426+tiseno100@users.noreply.github.com>
Date: Thu, 7 May 2020 22:44:41 +0300
Subject: [PATCH 20/23] Remove PS/2 support off the Chariot
The board doesn't seem to support it according to it's manual and neither works if applied.
---
src/machine/machine_table.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index ff34f449d..86b5442bd 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -135,6 +135,7 @@ const machine_t machines[] = {
{ "[286 ISA] Trigem 286M", "tg286m", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 512, 8192, 128, 127, machine_at_tg286m_init, NULL },
{ "[286 ISA] Samsung Deskmaster 286", "deskmaster286", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512,16384, 128, 127, machine_at_deskmaster286_init, NULL },
+ { "[286 ISA] ALR", "alr", {{"286", cpus_286}, {"386SX", cpus_i386SX}, {"486", cpus_i486S1}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512,16384, 128, 127, machine_at_alr_init, NULL },
/* 286 machines that utilize the MCA bus */
{ "[286 MCA] IBM PS/2 model 50", "ibmps2_m50", {{"Intel", cpus_ps2_m30_286}, {"IBM",cpus_IBM486SLC},{"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_MCA | MACHINE_AT | MACHINE_PS2 | MACHINE_VIDEO, 1, 10, 1, 63, machine_ps2_model_50_init, NULL },
@@ -232,7 +233,7 @@ const machine_t machines[] = {
/* Socket 7 machines */
/* 430FX */
{ "[Socket 7-3V FX] ASUS P/I-P54TP4XE", "p54tp4xe", MACHINE_CPUS_PENTIUM_S73V, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_p54tp4xe_init, NULL },
- { "[Socket 7-3V FX] QDI Chariot", "chariot", MACHINE_CPUS_PENTIUM_S73VCH, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_chariot_init, NULL },
+ { "[Socket 7-3V FX] QDI Chariot", "chariot", MACHINE_CPUS_PENTIUM_S73VCH, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 8, 128, 8, 127, machine_at_chariot_init, NULL },
{ "[Socket 7-3V FX] Intel Advanced/ATX", "thor", MACHINE_CPUS_PENTIUM_S73V, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_thor_init, NULL },
{ "[Socket 7-3V FX] Intel Advanced/EV", "endeavor", MACHINE_CPUS_PENTIUM_S73V, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC | MACHINE_VIDEO, 8, 128, 8, 127, machine_at_endeavor_init, at_endeavor_get_device },
#if defined(DEV_BRANCH) && defined(USE_MRTHOR)
@@ -302,8 +303,8 @@ const machine_t machines[] = {
/* 440LX */
- /* 440BX */
#if defined(DEV_BRANCH) && defined(NO_SIO)
+ /* 440BX */
{ "[Slot 1 BX] Gigabyte GA-6BXC", "6bxc", {{"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_6bxc_init, NULL },
#endif
{ "[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 },
From c79b7a7b423ebbfd1ce4d61a813d32518867683b Mon Sep 17 00:00:00 2001
From: tiseno100 <58827426+tiseno100@users.noreply.github.com>
Date: Thu, 7 May 2020 22:47:59 +0300
Subject: [PATCH 21/23] Fix table inconsistencies. Again -_-
---
src/machine/machine_table.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index 86b5442bd..344b47c45 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -135,7 +135,6 @@ const machine_t machines[] = {
{ "[286 ISA] Trigem 286M", "tg286m", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 512, 8192, 128, 127, machine_at_tg286m_init, NULL },
{ "[286 ISA] Samsung Deskmaster 286", "deskmaster286", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512,16384, 128, 127, machine_at_deskmaster286_init, NULL },
- { "[286 ISA] ALR", "alr", {{"286", cpus_286}, {"386SX", cpus_i386SX}, {"486", cpus_i486S1}, {"", NULL}, {"", NULL}}, MACHINE_ISA | MACHINE_AT, 512,16384, 128, 127, machine_at_alr_init, NULL },
/* 286 machines that utilize the MCA bus */
{ "[286 MCA] IBM PS/2 model 50", "ibmps2_m50", {{"Intel", cpus_ps2_m30_286}, {"IBM",cpus_IBM486SLC},{"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_MCA | MACHINE_AT | MACHINE_PS2 | MACHINE_VIDEO, 1, 10, 1, 63, machine_ps2_model_50_init, NULL },
@@ -303,8 +302,8 @@ const machine_t machines[] = {
/* 440LX */
-#if defined(DEV_BRANCH) && defined(NO_SIO)
/* 440BX */
+#if defined(DEV_BRANCH) && defined(NO_SIO)
{ "[Slot 1 BX] Gigabyte GA-6BXC", "6bxc", {{"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_6bxc_init, NULL },
#endif
{ "[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 },
From e1ec42d2b2c7dd903bab7e6debb49999da07878d Mon Sep 17 00:00:00 2001
From: tiseno100 <58827426+tiseno100@users.noreply.github.com>
Date: Fri, 8 May 2020 16:20:18 +0300
Subject: [PATCH 22/23] Fix and Dev Branch the PCI/I-486SP3G
Use the SST 29EE010, Include the NCR 810 onboard SCSI chip and use the AMI KBC like the real deal.
---
src/include/86box/machine.h | 3 +++
src/machine/m_at_386dx_486.c | 12 ++++++++----
src/machine/machine_table.c | 3 ++-
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index b6f4e2a59..5f93ca73e 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -199,6 +199,7 @@ extern int machine_at_spc4200p_init(const machine_t *);
extern int machine_at_spc4216p_init(const machine_t *);
extern int machine_at_kmxc02_init(const machine_t *);
extern int machine_at_deskmaster286_init(const machine_t *);
+extern int machine_at_alr_init(const machine_t *);
extern int machine_at_commodore_sl386sx_init(const machine_t *);
extern int machine_at_wd76c10_init(const machine_t *);
@@ -236,7 +237,9 @@ extern int machine_at_r418_init(const machine_t *);
extern int machine_at_ls486e_init(const machine_t *);
extern int machine_at_4dps_init(const machine_t *);
extern int machine_at_alfredo_init(const machine_t *);
+#if defined(DEV_BRANCH) && defined(NO_SIO)
extern int machine_at_486sp3g_init(const machine_t *);
+#endif
/* m_at_commodore.c */
extern int machine_at_cmdpc_init(const machine_t *);
diff --git a/src/machine/m_at_386dx_486.c b/src/machine/m_at_386dx_486.c
index e67f95c30..8cb014f2b 100644
--- a/src/machine/m_at_386dx_486.c
+++ b/src/machine/m_at_386dx_486.c
@@ -39,7 +39,9 @@
#include <86box/hdc.h>
#include <86box/video.h>
#include <86box/intel_flash.h>
+#include <86box/sst_flash.h>
#include <86box/intel_sio.h>
+#include <86box/scsi_ncr53c8xx.h>
#include <86box/machine.h>
int
@@ -427,7 +429,7 @@ machine_at_alfredo_init(const machine_t *model)
return ret;
}
-
+#if defined(DEV_BRANCH) && defined(NO_SIO)
int
machine_at_486sp3g_init(const machine_t *model)
{
@@ -451,12 +453,14 @@ machine_at_486sp3g_init(const machine_t *model)
pci_register_slot(0x06, PCI_CARD_NORMAL, 4, 1, 2, 3); /* 06 = Slot 4 */
pci_register_slot(0x07, PCI_CARD_SCSI, 1, 2, 3, 4); /* 07 = SCSI */
pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
- device_add(&keyboard_ps2_pci_device);
+ device_add(&keyboard_ps2_ami_pci_device); /* Uses the AMIKEY KBC */
device_add(&sio_device); /* Site says it has a ZB, but the BIOS is designed for an IB. */
- device_add(&pc87306_device);
- device_add(&intel_flash_bxt_ami_device);
+ device_add(&pc87306_device); /*PC87332*/
+ device_add(&sst_flash_29ee010_device);
+ device_add(&ncr53c810_pci_device);
device_add(&i420zx_device);
return ret;
}
+#endif
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index 344b47c45..474e1a055 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -200,7 +200,9 @@ const machine_t machines[] = {
#endif
/* 486 machines which utilize the PCI bus */
+#if defined(DEV_BRANCH) && defined(NO_SIO)
{ "[486 PCI] ASUS PCI/I-486SP3G", "486sp3g", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}, {"", NULL}, {"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 1, 128, 1, 127, machine_at_486sp3g_init, NULL },
+#endif
{ "[486 PCI] Intel Classic/PCI", "alfredo", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}, {"", NULL}, {"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 2, 128, 2, 127, machine_at_alfredo_init, NULL },
{ "[486 PCI] Lucky Star LS-486E", "ls486e", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}, {"", NULL}, {"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 1, 128, 1, 127, machine_at_ls486e_init, NULL },
{ "[486 PCI] Rise Computer R418", "r418", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}, {"", NULL}, {"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 1, 255, 1, 127, machine_at_r418_init, NULL },
@@ -214,7 +216,6 @@ const machine_t machines[] = {
#endif
{ "[Socket 4 LX] Intel Premiere/PCI", "revenge", {{"Intel", cpus_Pentium5V}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 2, 128, 2, 127, machine_at_batman_init, NULL },
{ "[Socket 4 LX] Micro Star 586MC1", "586mc1", {{"Intel", cpus_Pentium5V}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 2, 128, 2, 127, machine_at_586mc1_init, NULL },
-
/* Socket 5 machines */
/* 430NX */
{ "[Socket 5 NX] Intel Premiere/PCI II", "plato", MACHINE_CPUS_PENTIUM_S5, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 2, 128, 2, 127, machine_at_plato_init, NULL },
From de87d0ee007880d522a58484fb5c1d60f7584206 Mon Sep 17 00:00:00 2001
From: tiseno100 <58827426+tiseno100@users.noreply.github.com>
Date: Fri, 8 May 2020 16:21:33 +0300
Subject: [PATCH 23/23] Removed another ALR reference
Considering that machine doesn't exist.
---
src/include/86box/machine.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index 5f93ca73e..fba2e69c2 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -199,7 +199,6 @@ extern int machine_at_spc4200p_init(const machine_t *);
extern int machine_at_spc4216p_init(const machine_t *);
extern int machine_at_kmxc02_init(const machine_t *);
extern int machine_at_deskmaster286_init(const machine_t *);
-extern int machine_at_alr_init(const machine_t *);
extern int machine_at_commodore_sl386sx_init(const machine_t *);
extern int machine_at_wd76c10_init(const machine_t *);