From f44821d8407ba714d57322366fe080f4d648f878 Mon Sep 17 00:00:00 2001 From: OBattler Date: Thu, 6 Jul 2023 20:38:34 +0200 Subject: [PATCH 1/2] Removed an invalid change from cpu/cpu.c. --- src/cpu/cpu.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index cbf85baee..257d23845 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -526,7 +526,6 @@ cpu_set(void) cpu_set_agp_speed(0); io_handler(cpu_iscyrix, 0x0022, 0x0002, cpu_read, NULL, NULL, cpu_write, NULL, NULL, NULL); - cpu_iscyrix = cpu_iscyrix || (cpu_s->cpu_type == CPU_386SX) || (cpu_s->cpu_type == CPU_386DX); io_handler(hasfpu, 0x00f0, 0x000f, cpu_read, NULL, NULL, cpu_write, NULL, NULL, NULL); io_handler(hasfpu, 0xf007, 0x0001, cpu_read, NULL, NULL, cpu_write, NULL, NULL, NULL); From a926c7e8441977e9669d499d70b1df3908d0576b Mon Sep 17 00:00:00 2001 From: OBattler Date: Thu, 6 Jul 2023 20:41:35 +0200 Subject: [PATCH 2/2] Fixed the ASUS 486SP3. --- src/machine/m_at_386dx_486.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/machine/m_at_386dx_486.c b/src/machine/m_at_386dx_486.c index b99e3b165..deaa540c4 100644 --- a/src/machine/m_at_386dx_486.c +++ b/src/machine/m_at_386dx_486.c @@ -1049,20 +1049,14 @@ machine_at_486sp3_init(const machine_t *model) { int ret; -#if 0 ret = bios_load_linear("roms/machines/486sp3/awsi2737.bin", 0x000e0000, 131072, 0); -#else - ret = bios_load_linear("roms/machines/486sp3/140394.BIN", - 0x000e0000, 131072, 0); -#endif if (bios_only || !ret) return ret; machine_at_common_init(model); - device_add(&ide_vlb_device); - // device_add(&ide_isa_device); + device_add(&ide_isa_device); pci_init(PCI_CONFIG_TYPE_2 | PCI_NO_IRQ_STEERING); pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0); @@ -1074,9 +1068,8 @@ machine_at_486sp3_init(const machine_t *model) pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0); device_add(&keyboard_ps2_ami_pci_device); /* Uses the AMIKEY KBC */ device_add(&sio_device); - device_add(&fdc_at_device); - // device_add(&fdc37c663_ide_device); - // device_add(&sst_flash_29ee010_device); + device_add(&fdc37c663_ide_device); + device_add(&sst_flash_29ee010_device); device_add(&i420tx_device); device_add(&ncr53c810_onboard_pci_device);