claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '86Box:master' into pc140_6260

Browse Source
This commit is contained in:
rue
2024-05-09 19:58:42 +03:00
committed by GitHub
parent 544ea87764 62193ab259
commit f95852c19f
28 changed files with 562 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/machine/m_at_386dx_486.c
View File

@@ -702,13 +702,13 @@ machine_at_pb450_init(const machine_t *model)
pci_register_slot(0x12, PCI_CARD_NORMAL, 5, 6, 7, 8);
if (gfxcard[0] == VID_INTERNAL)
device_add(&gd5428_vlb_onboard_device);
device_add(machine_get_vid_device(machine));
device_add(&opti602_device);
device_add(&opti895_device);
device_add(&opti602_device);
device_add(&opti822_device);
device_add(&keyboard_ps2_ami_device);
device_add(&fdc37c661_ide_device);
device_add(&keyboard_ps2_phoenix_device);
device_add(&fdc37c665_ide_device);
device_add(&ide_opti611_vlb_sec_device);
device_add(&intel_flash_bxt_device);
device_add(&phoenix_486_jumper_pci_device);
@@ -2223,10 +2223,10 @@ machine_at_dvent4xx_init(const machine_t *model)
device_add(&sis_85c471_device);
device_add(&ide_cmd640_vlb_pri_device);
device_add(&fdc37c665_ide_device);
device_add(&keyboard_ps2_device);
device_add(&keyboard_ps2_phoenix_device);
if (gfxcard[0] == VID_INTERNAL)
device_add(&s3_phoenix_trio32_onboard_vlb_device);
device_add(machine_get_vid_device(machine));
return ret;
}

4
src/machine/m_at_socket7.c
View File

@@ -657,7 +657,7 @@ machine_at_brio80xx_init(const machine_t *model)
pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
device_add(&i430vx_device);
device_add(&piix3_device);
device_add(&fdc37c935_device);
device_add(&fdc37c935_370_device);
device_add(&sst_flash_29ee020_device);
return ret;
@@ -726,7 +726,7 @@ machine_at_pb810_init(const machine_t *model)
device_add(&i430vx_device);
device_add(&piix3_device);
device_add(&fdc37c935_device);
device_add(&fdc37c935_370_device);
device_add(&intel_flash_bxt_device);
return ret;

8
src/machine/machine_table.c
View File

@@ -6522,10 +6522,10 @@ const machine_t machines[] = {
.kbc_p1 = 0xff,
.gpio = 0xffffffff,
.gpio_acpi = 0xffffffff,
.device = &gd5428_vlb_onboard_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &gd5428_vlb_onboard_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -6804,10 +6804,10 @@ const machine_t machines[] = {
.kbc_p1 = 0xff,
.gpio = 0xffffffff,
.gpio_acpi = 0xffffffff,
.device = &s3_phoenix_trio32_onboard_vlb_device,
.device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &s3_phoenix_trio32_onboard_vlb_device,
.snd_device = NULL,
.net_device = NULL
},