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

Merge pull request #6108 from win2kgamer/machine-fixes

Browse Source 
Several machine fixes
This commit is contained in:
Miran Grča
2025-08-30 10:45:08 +02:00
committed by GitHub
parent 89591ae8c9 a9ca61589b
commit 6e933155c1
5 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/machine/m_at_386sx.c
View File

@@ -408,6 +408,7 @@ machine_at_cmdsl386sx16_init(const machine_t *model)
device_add(&fdc_at_device);
device_add(&neat_device);
device_add(&ide_isa_device);
/* Two serial ports - on the real hardware SL386SX-16, they are on the single UMC UM82C452. */
device_add_inst(&ns16450_device, 1);
device_add_inst(&ns16450_device, 2);

3
src/machine/m_at_socket1.c
View File

@@ -115,6 +115,9 @@ machine_at_svc486wb_init(const machine_t *model)
device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add(&ide_isa_device);
if (fdc_current[0] == FDC_INTERNAL)
device_add(&fdc_at_device);
return ret;
}

5
src/machine/m_at_socket3_pci.c
View File

@@ -588,7 +588,7 @@ machine_at_sb486p_init(const machine_t *model)
device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add_params(&i82091aa_device, (void *) I82091AA_022);
device_add_params(&i82091aa_device, (void *) I82091AA_26E);
device_add(&i420ex_device);
return ret;
@@ -1211,6 +1211,7 @@ machine_at_ecs486_init(const machine_t *model)
device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
device_add(&intel_flash_bxt_device);
machine_force_ps2(1);
device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
return ret;
@@ -1387,7 +1388,7 @@ machine_at_hot433a_init(const machine_t *model)
return ret;
device_context(model->device);
int is_award = !strcmp(device_get_config_bios("bios"), "hot433a_award");
int is_award = !strcmp(device_get_config_bios("bios"), "hot433a_v451pg");
fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
ret = bios_load_linear(fn, 0x000e0000, 131072, 0);
device_context_restore();

1
src/machine/m_at_socket5.c
View File

@@ -249,6 +249,7 @@ machine_at_tek932_init(const machine_t *model)
pci_register_slot(0x0E, PCI_CARD_NORMAL, 3, 4, 1, 2);
pci_register_slot(0x0D, PCI_CARD_NORMAL, 4, 1, 2, 3);
pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 3, 2, 4);
machine_force_ps2(1);
device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
device_add(&i430nx_device);
device_add(&sio_zb_device);

2
src/machine/machine_table.c
View File

@@ -12053,7 +12053,7 @@ const machine_t machines[] = {
.max_multi = 1.5
},
.bus_flags = MACHINE_PCI,
.flags = MACHINE_IDE | MACHINE_APM,
.flags = MACHINE_PS2_KBC | MACHINE_IDE | MACHINE_APM,
.ram = {
.min = 2048,
.max = 262144,