80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch 'version/4.1' of https://github.com/86Box/86Box into version/4.1

Browse Source
This commit is contained in:
OBattler
2023-09-24 18:42:02 +02:00
parent 893856d6cb 4475a8595c
commit cf7b71bc5a
3 changed files with 74 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/86box/machine.h
View File

@@ -689,6 +689,7 @@ extern int machine_at_aurora_init(const machine_t *);
extern int machine_at_686nx_init(const machine_t *); extern int machine_at_686nx_init(const machine_t *);
extern int machine_at_acerv60n_init(const machine_t *); extern int machine_at_acerv60n_init(const machine_t *);
extern int machine_at_vs440fx_init(const machine_t *); extern int machine_at_vs440fx_init(const machine_t *);
extern int machine_at_GW2KVenus_init(const machine_t *);
extern int machine_at_ap440fx_init(const machine_t *); extern int machine_at_ap440fx_init(const machine_t *);
extern int machine_at_mb600n_init(const machine_t *); extern int machine_at_mb600n_init(const machine_t *);
extern int machine_at_8600ttc_init(const machine_t *); extern int machine_at_8600ttc_init(const machine_t *);

34
src/machine/m_at_socket8.c
View File

@@ -195,6 +195,40 @@ machine_at_vs440fx_init(const machine_t *model)
return ret; return ret;
} }
int
machine_at_GW2KVenus_init(const machine_t *model)
{
int ret;
ret = bios_load_linear_combined2("roms/machines/GW2KVenus/1011CS1T.BIO",
"roms/machines/GW2KVenus/1011CS1T.BI1",
"roms/machines/GW2KVenus/1011CS1T.BI2",
"roms/machines/GW2KVenus/1011CS1T.BI3",
"roms/machines/GW2KVenus/1011CS1T.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(0x0B, PCI_CARD_NORMAL, 1, 2, 3, 4);
pci_register_slot(0x0F, PCI_CARD_NORMAL, 4, 1, 2, 3);
pci_register_slot(0x11, PCI_CARD_NORMAL, 3, 4, 1, 2);
pci_register_slot(0x13, PCI_CARD_NORMAL, 2, 3, 4, 1);
pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
device_add(&i440fx_device);
device_add(&piix3_device);
device_add(&keyboard_ps2_intel_ami_pci_device);
device_add(&pc87307_device);
device_add(&intel_flash_bxt_ami_device);
return ret;
}
int int
machine_at_ap440fx_init(const machine_t *model) machine_at_ap440fx_init(const machine_t *model)
{ {

39
src/machine/machine_table.c
View File

@@ -11378,6 +11378,45 @@ const machine_t machines[] = {
.snd_device = NULL, .snd_device = NULL,
.net_device = NULL .net_device = NULL
}, },
/* It's a Intel VS440FX with a Gateway 2000 OEM BIOS */
{
.name = "[i440FX] Gateway 2000 Venus",
.internal_name = "GW2KVenus",
.type = MACHINE_TYPE_SOCKET8,
.chipset = MACHINE_CHIPSET_INTEL_440FX,
.init = machine_at_GW2KVenus_init,
.pad = 0,
.pad0 = 0,
.pad1 = MACHINE_AVAILABLE,
.pad2 = 0,
.cpu = {
.package = CPU_PKG_SOCKET8,
.block = CPU_BLOCK_NONE,
.min_bus = 60000000,
.max_bus = 66666667,
.min_voltage = 2100,
.max_voltage = 3500,
.min_multi = 2.0,
.max_multi = 3.5
},
.bus_flags = MACHINE_PS2_PCI,
.flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI,
.ram = {
.min = 8192,
.max = 524288,
.step = 8192
},
.nvrmask = 127,
.kbc_device = NULL,
.kbc_p1 = 0,
.gpio = 0,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.snd_device = NULL,
.net_device = NULL
},
/* Has the SMC FDC73C935's on-chip KBC with Phoenix MultiKey firmware. */ /* Has the SMC FDC73C935's on-chip KBC with Phoenix MultiKey firmware. */
{ {
.name = "[i440FX] Micronics M6Mi", .name = "[i440FX] Micronics M6Mi",