diff options
Diffstat (limited to 'src/mame/drivers/ct486.cpp')
-rw-r--r-- | src/mame/drivers/ct486.cpp | 53 |
1 files changed, 26 insertions, 27 deletions
diff --git a/src/mame/drivers/ct486.cpp b/src/mame/drivers/ct486.cpp index 0cd1035ad38..cc4dbe25081 100644 --- a/src/mame/drivers/ct486.cpp +++ b/src/mame/drivers/ct486.cpp @@ -110,12 +110,11 @@ void ct486_state::ct486_io(address_map &map) // MACHINE DRIVERS //************************************************************************** -void ct486_state::ct486(machine_config &config) -{ - I486(config, m_maincpu, XTAL(25'000'000)); - m_maincpu->set_addrmap(AS_PROGRAM, &ct486_state::ct486_map); - m_maincpu->set_addrmap(AS_IO, &ct486_state::ct486_io); - m_maincpu->set_irq_acknowledge_callback("cs4031", FUNC(cs4031_device::int_ack_r)); +MACHINE_CONFIG_START(ct486_state::ct486) + MCFG_DEVICE_ADD("maincpu", I486, XTAL(25'000'000)) + MCFG_DEVICE_PROGRAM_MAP(ct486_map) + MCFG_DEVICE_IO_MAP(ct486_io) + MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("cs4031", cs4031_device, int_ack_r) CS4031(config, m_cs4031, XTAL(25'000'000), "maincpu", "isa", "bios", "keybc"); // cpu connections @@ -140,14 +139,13 @@ void ct486_state::ct486(machine_config &config) keybc.kbd_clk().set("pc_kbdc", FUNC(pc_kbdc_device::clock_write_from_mb)); keybc.kbd_data().set("pc_kbdc", FUNC(pc_kbdc_device::data_write_from_mb)); - pc_kbdc_device &pc_kbdc(PC_KBDC(config, "pc_kbdc", 0)); - pc_kbdc.out_clock_cb().set(keybc, FUNC(at_kbc_device_base::kbd_clk_w)); - pc_kbdc.out_data_cb().set(keybc, FUNC(at_kbc_device_base::kbd_data_w)); - PC_KBDC_SLOT(config, "kbd", pc_at_keyboards, STR_KBD_MICROSOFT_NATURAL).set_pc_kbdc_slot(&pc_kbdc); + MCFG_DEVICE_ADD("pc_kbdc", PC_KBDC, 0) + MCFG_PC_KBDC_OUT_CLOCK_CB(WRITELINE("keybc", at_kbc_device_base, kbd_clk_w)) + MCFG_PC_KBDC_OUT_DATA_CB(WRITELINE("keybc", at_kbc_device_base, kbd_data_w)) + MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_at_keyboards, STR_KBD_MICROSOFT_NATURAL) ISA16(config, m_isabus, 0); - m_isabus->set_memspace(m_maincpu, AS_PROGRAM); - m_isabus->set_iospace(m_maincpu, AS_IO); + m_isabus->set_cputag("maincpu"); m_isabus->iochck_callback().set(m_cs4031, FUNC(cs4031_device::iochck_w)); m_isabus->irq2_callback().set(m_cs4031, FUNC(cs4031_device::irq09_w)); m_isabus->irq3_callback().set(m_cs4031, FUNC(cs4031_device::irq03_w)); @@ -167,28 +165,29 @@ void ct486_state::ct486(machine_config &config) m_isabus->drq5_callback().set(m_cs4031, FUNC(cs4031_device::dreq5_w)); m_isabus->drq6_callback().set(m_cs4031, FUNC(cs4031_device::dreq6_w)); m_isabus->drq7_callback().set(m_cs4031, FUNC(cs4031_device::dreq7_w)); - ISA16_SLOT(config, "board1", 0, "isabus", pc_isa16_cards, "fdcsmc", true); - ISA16_SLOT(config, "board2", 0, "isabus", pc_isa16_cards, "comat", true); - ISA16_SLOT(config, "board3", 0, "isabus", pc_isa16_cards, "ide", true); - ISA16_SLOT(config, "board4", 0, "isabus", pc_isa16_cards, "lpt", true); - ISA16_SLOT(config, "isa1", 0, "isabus", pc_isa16_cards, "svga_et4k", false); - ISA16_SLOT(config, "isa2", 0, "isabus", pc_isa16_cards, nullptr, false); - ISA16_SLOT(config, "isa3", 0, "isabus", pc_isa16_cards, nullptr, false); - ISA16_SLOT(config, "isa4", 0, "isabus", pc_isa16_cards, nullptr, false); - ISA16_SLOT(config, "isa5", 0, "isabus", pc_isa16_cards, nullptr, false); + MCFG_DEVICE_ADD("board1", ISA16_SLOT, 0, "isabus", pc_isa16_cards, "fdcsmc", true) + MCFG_DEVICE_ADD("board2", ISA16_SLOT, 0, "isabus", pc_isa16_cards, "comat", true) + MCFG_DEVICE_ADD("board3", ISA16_SLOT, 0, "isabus", pc_isa16_cards, "ide", true) + MCFG_DEVICE_ADD("board4", ISA16_SLOT, 0, "isabus", pc_isa16_cards, "lpt", true) + MCFG_DEVICE_ADD("isa1", ISA16_SLOT, 0, "isabus", pc_isa16_cards, "svga_et4k", false) + MCFG_DEVICE_ADD("isa2", ISA16_SLOT, 0, "isabus", pc_isa16_cards, nullptr, false) + MCFG_DEVICE_ADD("isa3", ISA16_SLOT, 0, "isabus", pc_isa16_cards, nullptr, false) + MCFG_DEVICE_ADD("isa4", ISA16_SLOT, 0, "isabus", pc_isa16_cards, nullptr, false) + MCFG_DEVICE_ADD("isa5", ISA16_SLOT, 0, "isabus", pc_isa16_cards, nullptr, false) // sound hardware SPEAKER(config, "mono").front_center(); - SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.50); + MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) // video hardware - PALETTE(config, "palette").set_entries(256); // todo: really needed? + MCFG_PALETTE_ADD("palette", 256) // todo: really needed? /* software lists */ - SOFTWARE_LIST(config, "pc_disk_list").set_original("ibm5150"); - SOFTWARE_LIST(config, "at_disk_list").set_original("ibm5170"); - SOFTWARE_LIST(config, "at_cdrom_list").set_original("ibm5170_cdrom"); -} + MCFG_SOFTWARE_LIST_ADD("pc_disk_list","ibm5150") + MCFG_SOFTWARE_LIST_ADD("at_disk_list","ibm5170") + MCFG_SOFTWARE_LIST_ADD("at_cdrom_list","ibm5170_cdrom") +MACHINE_CONFIG_END //************************************************************************** |