summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/compc.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/compc.cpp')
-rw-r--r--src/mame/drivers/compc.cpp32
1 files changed, 17 insertions, 15 deletions
diff --git a/src/mame/drivers/compc.cpp b/src/mame/drivers/compc.cpp
index 17debf68727..a13dc96603f 100644
--- a/src/mame/drivers/compc.cpp
+++ b/src/mame/drivers/compc.cpp
@@ -220,11 +220,12 @@ void compc_state::compciii_io(address_map &map)
map(0x0060, 0x0063).rw(FUNC(compc_state::pioiii_r), FUNC(compc_state::pioiii_w));
}
-MACHINE_CONFIG_START(compc_state::compc)
- MCFG_DEVICE_ADD("maincpu", I8088, 4772720*2)
- MCFG_DEVICE_PROGRAM_MAP(compc_map)
- MCFG_DEVICE_IO_MAP(compc_io)
- MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
+void compc_state::compc(machine_config &config)
+{
+ I8088(config, m_maincpu, 4772720*2);
+ m_maincpu->set_addrmap(AS_PROGRAM, &compc_state::compc_map);
+ m_maincpu->set_addrmap(AS_IO, &compc_state::compc_io);
+ m_maincpu->set_irq_acknowledge_callback("mb:pic8259", FUNC(pic8259_device::inta_cb));
PCNOPPI_MOTHERBOARD(config, "mb", 0).set_cputag(m_maincpu);
config.device_remove("mb:pit8253");
@@ -237,25 +238,26 @@ MACHINE_CONFIG_START(compc_state::compc)
pit.out_handler<2>().set(m_mb, FUNC(ibm5160_mb_device::pc_pit8253_out2_changed));
// FIXME: determine ISA bus clock
- MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "mda", false)
- MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "lpt", false)
- MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "com", false)
- MCFG_DEVICE_ADD("isa4", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "fdc_xt", false)
+ ISA8_SLOT(config, "isa1", 0, "mb:isa", pc_isa8_cards, "mda", false);
+ ISA8_SLOT(config, "isa2", 0, "mb:isa", pc_isa8_cards, "lpt", false);
+ ISA8_SLOT(config, "isa3", 0, "mb:isa", pc_isa8_cards, "com", false);
+ ISA8_SLOT(config, "isa4", 0, "mb:isa", pc_isa8_cards, "fdc_xt", false);
- MCFG_PC_KEYB_ADD("pc_keyboard", WRITELINE("mb:pic8259", pic8259_device, ir1_w))
+ PC_KEYB(config, m_keyboard);
+ m_keyboard->keypress().set("mb:pic8259", FUNC(pic8259_device::ir1_w));
/* internal ram */
RAM(config, RAM_TAG).set_default_size("256K").set_extra_options("512K, 640K");
/* software lists */
SOFTWARE_LIST(config, "disk_list").set_original("ibm5150");
-MACHINE_CONFIG_END
+}
-MACHINE_CONFIG_START(compc_state::pc10iii)
+void compc_state::pc10iii(machine_config &config)
+{
compc(config);
- MCFG_DEVICE_MODIFY("maincpu")
- MCFG_DEVICE_IO_MAP(compciii_io)
-MACHINE_CONFIG_END
+ m_maincpu->set_addrmap(AS_IO, &compc_state::compciii_io);
+}
ROM_START(compc10)
ROM_REGION(0x10000, "bios", 0)