diff options
| author | 2026-03-18 17:51:21 +0100 | |
|---|---|---|
| committer | 2026-03-18 19:32:35 +0100 | |
| commit | 81111e08e63bcfd6f2e95b5fd0bf031ff7e2d321 (patch) | |
| tree | e2b141e96697b91acd844dadb58db41e09ecf213 | |
| parent | 7a552c92e7175dffee473f84fbb8e4a79263adf0 (diff) | |
intel/i420ex.cpp: inherit a486ap4 romset from pc/at.cpp
| -rw-r--r-- | src/mame/intel/i420ex.cpp | 71 | ||||
| -rw-r--r-- | src/mame/mame.lst | 2 | ||||
| -rw-r--r-- | src/mame/pc/at.cpp | 19 |
3 files changed, 59 insertions, 33 deletions
diff --git a/src/mame/intel/i420ex.cpp b/src/mame/intel/i420ex.cpp index b68a30b432f..a0b5be0dfb8 100644 --- a/src/mame/intel/i420ex.cpp +++ b/src/mame/intel/i420ex.cpp @@ -62,9 +62,12 @@ public: , m_speaker(*this, "speaker") { } - void i420ex(machine_config &config) ATTR_COLD; + void entrada(machine_config &config) ATTR_COLD; + void a486ap4(machine_config &config) ATTR_COLD; protected: + void i420ex(machine_config &config) ATTR_COLD; + required_device<cpu_device> m_maincpu; required_device<ds12885_device> m_rtc; required_device<speaker_sound_device> m_speaker; @@ -144,15 +147,6 @@ void i420ex_state::i420ex(machine_config &config) psc.ide1_irq_w().set("ib:intc2", FUNC(pic8259_device::ir6_w)); psc.ide2_irq_w().set("ib:intc2", FUNC(pic8259_device::ir7_w)); - GD5434_PCI(config, "pci:06.0", 0); - - // TODO: on proprietary riser - PCI_SLOT(config, "pci:1", pci_cards, 7, 0, 1, 2, 3, nullptr); - PCI_SLOT(config, "pci:2", pci_cards, 8, 1, 2, 3, 0, nullptr); - - ISA16_SLOT(config, "board1", 0, "ib:isabus", pc_isa_onboard, "superio", true).set_option_machine_config("superio", intel_superio_config); - ISA16_SLOT(config, "isa1", 0, "ib:isabus", pc_isa16_cards, nullptr, false); - // TODO: really DS12887 DS12885(config, m_rtc); m_rtc->irq().set("ib:intc2", FUNC(pic8259_device::ir0_w)); @@ -179,6 +173,23 @@ void i420ex_state::i420ex(machine_config &config) aux_kbdc.out_clock_cb().set(keybc, FUNC(at_kbc_device_base::kbd_clk_w)); aux_kbdc.out_data_cb().set(keybc, FUNC(at_kbc_device_base::kbd_data_w)); + SPEAKER(config, "mono").front_center(); + SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.50); +} + +void i420ex_state::entrada(machine_config &config) +{ + i420ex(config); + + GD5434_PCI(config, "pci:06.0", 0); + + // TODO: on proprietary PISA riser + PCI_SLOT(config, "pci:1", pci_cards, 7, 0, 1, 2, 3, nullptr); + PCI_SLOT(config, "pci:2", pci_cards, 8, 1, 2, 3, 0, nullptr); + + ISA16_SLOT(config, "board1", 0, "ib:isabus", pc_isa_onboard, "superio", true).set_option_machine_config("superio", intel_superio_config); + ISA16_SLOT(config, "isa1", 0, "ib:isabus", pc_isa16_cards, nullptr, false); + rs232_port_device& serport0(RS232_PORT(config, "serport0", isa_com, "logitech_mouse")); serport0.rxd_handler().set("board1:superio", FUNC(i82091aa_device::rxd1_w)); serport0.dcd_handler().set("board1:superio", FUNC(i82091aa_device::ndcd1_w)); @@ -192,9 +203,23 @@ void i420ex_state::i420ex(machine_config &config) serport1.dsr_handler().set("board1:superio", FUNC(i82091aa_device::ndsr2_w)); serport1.ri_handler().set("board1:superio", FUNC(i82091aa_device::nri2_w)); serport1.cts_handler().set("board1:superio", FUNC(i82091aa_device::ncts2_w)); +} - SPEAKER(config, "mono").front_center(); - SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.50); +void i420ex_state::a486ap4(machine_config &config) +{ + i420ex(config); + + PCI_SLOT(config, "pci:1", pci_cards, 7, 0, 1, 2, 3, nullptr); + PCI_SLOT(config, "pci:2", pci_cards, 8, 1, 2, 3, 0, nullptr); + PCI_SLOT(config, "pci:3", pci_cards, 9, 2, 3, 0, 1, nullptr); + PCI_SLOT(config, "pci:4", pci_cards, 10, 3, 0, 1, 2, nullptr); + + ISA16_SLOT(config, "isa1", 0, "ib:isabus", pc_isa16_cards, "fdc_smc", false); + ISA16_SLOT(config, "isa2", 0, "ib:isabus", pc_isa16_cards, "comat", false); + ISA16_SLOT(config, "isa3", 0, "ib:isabus", pc_isa16_cards, "lpt", false); + ISA16_SLOT(config, "isa4", 0, "ib:isabus", pc_isa16_cards, nullptr, false); + // TODO: VLB really + ISA16_SLOT(config, "isa5", 0, "ib:isabus", pc_isa16_cards, "svga_et4k", false); } @@ -225,8 +250,28 @@ ROM_START( entrada ) // AZ02 known to exist ROM_END +// ASUS PVI-486AP4 (Socket 3, 4xSIMM72, Cache: 128/256/512KB, 4 PCI, 4 ISA, 1 VLB) +// Intel Aries PCIset S82425EX + S82426EX; DS12887 RTC; VIA VT82C42N - BIOS: 32pin +ROM_START( a486ap4 ) + ROM_REGION32_LE(0x20000, "pci:05.0", 0) + // 0: BIOS-String: 07/20/94-ARIES-P/I-AP4G-00 / #401A0-0104 + ROM_SYSTEM_BIOS(0, "486ap4v104", "ASUS PVI-486AP4 V1.04") + ROMX_LOAD( "awai0104.bin", 0x00000, 0x20000, CRC(52ea7123) SHA1(3d242ea6d1bcdddd41e32e40708133c72f2bd060), ROM_BIOS(0)) + // 1: BIOS-String: 10/21/94-ARIES-P/I-AP4G-00 / #401A0-0203 + ROM_SYSTEM_BIOS(1, "486ap4v203", "ASUS PVI-486AP4 V2.03") + ROMX_LOAD( "awai0203.bin", 0x00000, 0x20000, CRC(68d3a3f4) SHA1(6eee0c9aed2ede028eb170f8dd7921563293b99f), ROM_BIOS(1)) + // 2: BIOS-String: 11/08/94-ARIES-P/I-AP4G-00 / #401A0-0204 + ROM_SYSTEM_BIOS(2, "486ap4v204", "ASUS PVI-486AP4 V2.04") + ROMX_LOAD( "awai0204.bin", 0x00000, 0x20000, CRC(b62b35bb) SHA1(b6fa3d7b1c88da37ce74aca329a31d2587652d97), ROM_BIOS(2)) + // 3: BIOS-String: 11/25/97/ARIES-P/I-AP4G-00 / #401A0-0205-2 + ROM_SYSTEM_BIOS(3, "486ap4v205-2", "ASUS PVI-486AP4 V2.05-2") + ROMX_LOAD( "0205.002", 0x00000, 0x20000, CRC(632e8ee6) SHA1(3cf57b2654b0365e41ef5f5c82f68eeadf0e7a21), ROM_BIOS(3)) +ROM_END + + } // anonymous namespace -COMP( 1994, entrada, 0, 0, i420ex, 0, i420ex_state, empty_init, "Intel", "Classic/PCI LP \"Entrada\" (Intel I420EX Aries chipset)", MACHINE_NOT_WORKING ) +COMP( 1994, entrada, 0, 0, entrada, 0, i420ex_state, empty_init, "Intel", "Classic/PCI LP \"Entrada\" (Intel I420EX Aries chipset)", MACHINE_NOT_WORKING ) +COMP( 1994, a486ap4, 0, 0, a486ap4, 0, i420ex_state, empty_init, "Asus", "PVI-486AP4 (Intel I420EX Aries chipset)", MACHINE_NOT_WORKING ) diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 67968a8c784..115df5fcbe7 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -22227,6 +22227,7 @@ basic31 basic52 @source:intel/i420ex.cpp +a486ap4 entrada @source:intel/imds2.cpp @@ -37157,7 +37158,6 @@ asst128 486igb21 486wb6a3 a433cc -a486ap4 a486isa a486sio a486sp3g diff --git a/src/mame/pc/at.cpp b/src/mame/pc/at.cpp index 52f20226e94..f19e22a4d0b 100644 --- a/src/mame/pc/at.cpp +++ b/src/mame/pc/at.cpp @@ -4448,24 +4448,6 @@ ROM_START( a433cc ) ROM_LOAD( "ami_j-bond_a433c-c.bin", 0x10000, 0x10000, CRC(66031e98) SHA1(d2d1a26837d3ca943a6ef09ec3e6fbfaaa62cc46)) ROM_END -// ASUS PVI-486AP4 (Socket 3, 4xSIMM72, Cache: 128/256/512KB, 4 PCI, 4 ISA, 1 VLB) -// Intel Aries PCIset S82425EX + S82426EX; DS12887 RTC; VIA VT82C42N - BIOS: 32pin -ROM_START( a486ap4 ) - ROM_REGION32_LE(0x20000, "bios", 0) - // 0: BIOS-String: 07/20/94-ARIES-P/I-AP4G-00 / #401A0-0104 - ROM_SYSTEM_BIOS(0, "486ap4v104", "ASUS PVI-486AP4 V1.04") - ROMX_LOAD( "awai0104.bin", 0x00000, 0x20000, CRC(52ea7123) SHA1(3d242ea6d1bcdddd41e32e40708133c72f2bd060), ROM_BIOS(0)) - // 1: BIOS-String: 10/21/94-ARIES-P/I-AP4G-00 / #401A0-0203 - ROM_SYSTEM_BIOS(1, "486ap4v203", "ASUS PVI-486AP4 V2.03") - ROMX_LOAD( "awai0203.bin", 0x00000, 0x20000, CRC(68d3a3f4) SHA1(6eee0c9aed2ede028eb170f8dd7921563293b99f), ROM_BIOS(1)) - // 2: BIOS-String: 11/08/94-ARIES-P/I-AP4G-00 / #401A0-0204 - ROM_SYSTEM_BIOS(2, "486ap4v204", "ASUS PVI-486AP4 V2.04") - ROMX_LOAD( "awai0204.bin", 0x00000, 0x20000, CRC(b62b35bb) SHA1(b6fa3d7b1c88da37ce74aca329a31d2587652d97), ROM_BIOS(2)) - // 3: BIOS-String: 11/25/97/ARIES-P/I-AP4G-00 / #401A0-0205-2 - ROM_SYSTEM_BIOS(3, "486ap4v205-2", "ASUS PVI-486AP4 V2.05-2") - ROMX_LOAD( "0205.002", 0x00000, 0x20000, CRC(632e8ee6) SHA1(3cf57b2654b0365e41ef5f5c82f68eeadf0e7a21), ROM_BIOS(3)) -ROM_END - // ASUS PCI/I-486SP3G V3.02 (Socket 3, RAM: 4xSIMM72, Cache: 128/256/512K, 1 IDE, 1 SCSI, 3 PCI, 4 ISA) - BIOS: 32pin // Intel Saturn II chipset: 82424ZX CDC + 82423TX DPU + 82378ZB SIO; NCR 53C820; National PC87332; DS12887 RTC; VIA VT82C42N ROM_START( a486sp3g ) @@ -5798,7 +5780,6 @@ COMP( 199?, 486wb6a3, ibm5170, 0, at486, 0, at_state, init_at COMP( 199?, 4dmshl3g, ibm5170, 0, at486, 0, at_state, init_at, "EFA", "4DMS HL3G-L4-VI", MACHINE_NOT_WORKING ) COMP( 199?, 4dmuhl3s, ibm5170, 0, at486, 0, at_state, init_at, "EFA", "4DMU HL3S", MACHINE_NOT_WORKING ) COMP( 1992, a433cc, ibm5170, 0, at486, 0, at_state, init_at, "J-Bond", "A433C-C/A450C-C", MACHINE_NOT_WORKING ) -COMP( 1994, a486ap4, ibm5170, 0, at486, 0, at_state, init_at, "Asus", "PVI-486AP4", MACHINE_NOT_WORKING ) COMP( 199?, a486isa, ibm5170, 0, at486, 0, at_state, init_at, "Asus", "ISA-486", MACHINE_NOT_WORKING ) COMP( 199?, a486sio, ibm5170, 0, at486, 0, at_state, init_at, "Asus", "ISA-486SIO rev. 1.2", MACHINE_NOT_WORKING ) COMP( 1994, a486sp3g, ibm5170, 0, at486, 0, at_state, init_at, "Asus", "PCI/I-486SP3G", MACHINE_NOT_WORKING ) |
