mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-22 09:35:32 -07:00
Code Issues Packages Projects Releases Activity

Onboard devices update to existing machines

Browse Source
This commit is contained in:
Maxwell Scott
2026-01-14 01:09:50 +07:00
parent bb83a5c1fb
commit e7198230e5
6 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/machine/m_at_286.c
View File

@@ -938,7 +938,7 @@ machine_at_pc7286_init(const machine_t *model)
machine_at_common_init_ex(model, 2);
if (gfxcard[0] == VID_INTERNAL)
device_add(&gd5401_onboard_device);
device_add(machine_get_vid_device(machine));
device_add_params(&dw90c50_device, (void *) DW90C50_IDE);
device_add(&vl82c113_device); /* The keyboard controller is part of the VL82c113. */
@@ -1161,7 +1161,7 @@ machine_at_spc4620p_init(const machine_t *model)
return ret;
if (gfxcard[0] == VID_INTERNAL)
device_add(&ati28800k_spc4620p_device);
device_add(machine_get_vid_device(machine));
machine_at_scat_init(model, 1, 1);

2
src/machine/m_at_386sx.c
View File

@@ -750,7 +750,7 @@ machine_at_wd76c10_init(const machine_t *model)
machine_at_common_init_ex(model, 2);
if (gfxcard[0] == VID_INTERNAL)
device_add(&paradise_wd90c11_megapc_device);
device_add(machine_get_vid_device(machine));
device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);

9
src/machine/m_at_socket2.c
View File

@@ -343,8 +343,12 @@ machine_at_valuepoint433_init(const machine_t *model) // hangs without the PS/2
machine_at_common_ide_init(model);
device_add(&sis_85c461_device);
if (gfxcard[0] == VID_INTERNAL)
device_add(&et4000w32_onboard_device);
device_add(machine_get_vid_device(machine));
else {
for (uint16_t i = 0; i < 32768; i++)
rom[i] = mem_readb_phys(0x000c0000 + i);
device_add_params(&fdc37c6xx_device, (void *) (FDC37C661 | FDC37C6XX_IDE_PRI));
@@ -353,9 +357,6 @@ machine_at_valuepoint433_init(const machine_t *model) // hangs without the PS/2
if (fdc_current[0] == FDC_INTERNAL)
device_add(&fdc_at_device);
if (gfxcard[0] != VID_INTERNAL) {
for (uint16_t i = 0; i < 32768; i++)
rom[i] = mem_readb_phys(0x000c0000 + i);
}
mem_mapping_set_addr(&bios_mapping, 0x0c0000, 0x40000);
mem_mapping_set_exec(&bios_mapping, rom);

2
src/machine/m_at_socket7.c
View File

@@ -1211,7 +1211,7 @@ machine_at_pb810_init(const machine_t *model)
pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
if (sound_card_current[0] == SOUND_INTERNAL)
device_add(&cs4237b_device);
machine_snd = device_add(machine_get_snd_device(machine));
device_add(&i430vx_device);
device_add(&piix3_device);

16
src/machine/machine_table.c
View File

@@ -4442,7 +4442,7 @@ const machine_t machines[] = {
.kbd_device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &gd5401_onboard_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -4884,7 +4884,7 @@ const machine_t machines[] = {
.kbd_device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &ati28800k_spc4620p_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -5373,7 +5373,7 @@ const machine_t machines[] = {
.kbd_device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = &tvga8900d_device,
.vid_device = &tvga8900d_device, /* Onboard variant not yet emulated */
.snd_device = NULL,
.net_device = NULL
},
@@ -6043,7 +6043,7 @@ const machine_t machines[] = {
.kbd_device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &paradise_wd90c11_megapc_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -8445,7 +8445,7 @@ const machine_t machines[] = {
.kbd_device = NULL,
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.vid_device = &et4000w32_onboard_device,
.snd_device = NULL,
.net_device = NULL
},
@@ -10632,7 +10632,7 @@ const machine_t machines[] = {
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = &gd5430_onboard_pci_device,
.snd_device = &ess_1688_device,
.snd_device = &ess_1688_device, /* Onboard variant not yet emulated */
.net_device = NULL
},
/* This has an AMIKey-2, which is an updated version of type 'H'. */
@@ -15721,7 +15721,7 @@ const machine_t machines[] = {
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.snd_device = NULL,
.snd_device = &cs4237b_device,
.net_device = NULL
},
/* This has the AMIKey 'H' firmware, possibly AMIKey-2. Photos show it with a BestKey, so it
@@ -16044,7 +16044,7 @@ const machine_t machines[] = {
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = &s3_trio64v2_dx_onboard_pci_device,
.snd_device = &cs4236b_device,
.snd_device = &cs4236b_onboard_device,
.net_device = &pcnet_am79c973_onboard_device
},
/* This has the Phoenix MultiKey KBC firmware on the NSC Super I/O chip. */

2
src/network/net_pcnet.c
View File

@@ -3317,7 +3317,7 @@ const device_t pcnet_am79c973_device = {
};
const device_t pcnet_am79c973_onboard_device = {
.name = "AMD PCnet-FAST III",
.name = "AMD PCnet-FAST III (On-Board)",
.internal_name = "pcnetfast_onboard",
.flags = DEVICE_PCI,
.local = DEV_AM79C973 | 0x0100,