From 38fe1ce7c4587ad8f0398f52df4504e6c76fe546 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Wed, 29 Sep 2021 04:41:46 -0400 Subject: [PATCH 1/3] FIC 486-VIP-IO2 supports PS/2 Mouse --- src/machine/machine_table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index 4f65bb383..115e5130e 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -242,7 +242,7 @@ const machine_t machines[] = { { "[UMC 8881] A-Trend ATC-1415", "atc1415", MACHINE_TYPE_486_S3, CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0, MACHINE_PCI | MACHINE_IDE_DUAL, 1024, 65536, 1024, 255, machine_at_atc1415_init, NULL }, { "[UMC 8881] ECS Elite UM8810PAIO", "ecs486", MACHINE_TYPE_486_S3, CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0, MACHINE_PCI | MACHINE_IDE_DUAL, 1024, 131072, 1024, 255, machine_at_ecs486_init, NULL }, { "[UMC 8881] Shuttle HOT-433A", "hot433", MACHINE_TYPE_486_S3, CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0, MACHINE_PCI | MACHINE_IDE_DUAL, 1024, 262144, 1024, 255, machine_at_hot433_init, NULL }, - { "[VIA VT82C496G] FIC VIP-IO2", "486vipio2", MACHINE_TYPE_486_S3, CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0, MACHINE_PCIV | MACHINE_IDE_DUAL, 1024, 131072, 1024, 255, machine_at_486vipio2_init, NULL }, + { "[VIA VT82C496G] FIC VIP-IO2", "486vipio2", MACHINE_TYPE_486_S3, CPU_PKG_SOCKET3, 0, 0, 0, 0, 0, 0, 0, MACHINE_PCIV | MACHINE_BUS_PS2 | MACHINE_IDE_DUAL, 1024, 131072, 1024, 255, machine_at_486vipio2_init, NULL }, /* 486 machines - Miscellaneous */ /* 486 machines with just the ISA slot */ From 2ba21b3b86fcbe82ab5abc68439f84cd77f55a4c Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Wed, 29 Sep 2021 05:03:27 -0400 Subject: [PATCH 2/3] support FDC_INTERNAL on 486-VIP-IO2 --- src/machine/m_at_386dx_486.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/machine/m_at_386dx_486.c b/src/machine/m_at_386dx_486.c index 03ba605f3..f5c7107f4 100644 --- a/src/machine/m_at_386dx_486.c +++ b/src/machine/m_at_386dx_486.c @@ -1105,6 +1105,9 @@ machine_at_486vipio2_init(const machine_t *model) device_add(&keyboard_ps2_ami_pci_device); device_add(&sst_flash_29ee010_device); + if (fdc_type == FDC_INTERNAL) + device_add(&fdc_at_device); + return ret; } From 734d7505ffc3530da8628fa4d9cbbb492cb2408e Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Wed, 29 Sep 2021 14:59:54 -0400 Subject: [PATCH 3/3] Revert "support FDC_INTERNAL on 486-VIP-IO2" This reverts commit 2ba21b3b86fcbe82ab5abc68439f84cd77f55a4c. --- src/machine/m_at_386dx_486.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/machine/m_at_386dx_486.c b/src/machine/m_at_386dx_486.c index f5c7107f4..03ba605f3 100644 --- a/src/machine/m_at_386dx_486.c +++ b/src/machine/m_at_386dx_486.c @@ -1105,9 +1105,6 @@ machine_at_486vipio2_init(const machine_t *model) device_add(&keyboard_ps2_ami_pci_device); device_add(&sst_flash_29ee010_device); - if (fdc_type == FDC_INTERNAL) - device_add(&fdc_at_device); - return ret; }