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

Merge remote-tracking branch 'origin/master' into feature/machine_and_kb

Browse Source
This commit is contained in:
OBattler
2021-10-21 21:18:44 +02:00
parent 40fa608e0e 85f810aa22
commit 820e9eede7
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/chipset/intel_4x0.c
View File

@@ -1775,7 +1775,6 @@ const device_t i440ex_device =
NULL
};
const device_t i440bx_device =
{
"Intel 82443BX",
@@ -1790,6 +1789,20 @@ const device_t i440bx_device =
NULL
};
const device_t i440bx_no_agp_device =
{
"Intel 82443BX",
DEVICE_PCI,
0x8200 | INTEL_440BX,
i4x0_init,
i4x0_close,
i4x0_reset,
{ NULL },
NULL,
NULL,
NULL
};
const device_t i440gx_device =
{
"Intel 82443GX",

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

@@ -80,6 +80,7 @@ extern const device_t i440fx_device;
extern const device_t i440lx_device;
extern const device_t i440ex_device;
extern const device_t i440bx_device;
extern const device_t i440bx_no_agp_device;
extern const device_t i440gx_device;
extern const device_t i440zx_device;

2
src/machine/m_at_misc.c
View File

@@ -63,7 +63,7 @@ machine_at_vpc2007_init(const machine_t *model)
pci_register_slot(0x0D, PCI_CARD_NORMAL, 1, 2, 3, 4);
pci_register_slot(0x0E, PCI_CARD_NORMAL, 1, 2, 3, 4);
pci_register_slot(0x0F, PCI_CARD_NORMAL, 1, 2, 3, 4);
device_add(&i440bx_device);
device_add(&i440bx_no_agp_device);
device_add(&piix4e_device);
device_add(&w83977f_370_device);
device_add(&keyboard_ps2_ami_pci_device);