diff options
author | 2018-05-01 16:58:50 +1000 | |
---|---|---|
committer | 2018-05-01 16:58:50 +1000 | |
commit | 547086658208e3aa715ab74d520ad0b8e4d7fa22 (patch) | |
tree | 0951eca59ff5d643eb8055905aa433522dd22c62 | |
parent | ab7a8ecc6f56ad64aeeadcd2a6edffe328a9d9d5 (diff) |
fix Commoder PC, work around MSX cartridge (nw)
-rw-r--r-- | src/devices/bus/msx_slot/cartridge.cpp | 8 | ||||
-rw-r--r-- | src/mame/drivers/compc.cpp | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/devices/bus/msx_slot/cartridge.cpp b/src/devices/bus/msx_slot/cartridge.cpp index 34650b5f246..dd1e591eefd 100644 --- a/src/devices/bus/msx_slot/cartridge.cpp +++ b/src/devices/bus/msx_slot/cartridge.cpp @@ -169,7 +169,11 @@ image_init_result msx_slot_cartridge_device::call_load() } } - m_cartridge->set_out_irq_cb(DEVCB_WRITELINE(msx_slot_cartridge_device, irq_out)); + // FIXME: do this is a less horrid way + { + machine_config::token const tok(const_cast<machine_config &>(mconfig()).begin_configuration(*this)); + m_cartridge->set_out_irq_cb(DEVCB_WRITELINE(msx_slot_cartridge_device, irq_out)); + } m_cartridge->initialize_cartridge(); if (m_cartridge->get_sram_size() > 0) @@ -364,6 +368,8 @@ void msx_slot_yamaha_expansion_device::device_start() m_cartridge = dynamic_cast<msx_cart_interface *>(get_card_device()); if (m_cartridge) { + // FIXME: do this is a less horrid way + machine_config::token const tok(const_cast<machine_config &>(mconfig()).begin_configuration(*this)); m_cartridge->set_out_irq_cb(DEVCB_WRITELINE(msx_slot_cartridge_device, irq_out)); } } diff --git a/src/mame/drivers/compc.cpp b/src/mame/drivers/compc.cpp index 7bbead14a2b..ce514003eb9 100644 --- a/src/mame/drivers/compc.cpp +++ b/src/mame/drivers/compc.cpp @@ -204,9 +204,9 @@ MACHINE_CONFIG_START(compc_state::compc) MCFG_PIT8253_CLK0(XTAL(14'318'181)/12.0) /* heartbeat IRQ */ MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("mb:pic8259", pic8259_device, ir0_w)) MCFG_PIT8253_CLK1(XTAL(14'318'181)/12.0) /* dram refresh */ - MCFG_PIT8253_OUT1_HANDLER(WRITELINE(ibm5160_mb_device, pc_pit8253_out1_changed)) + MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("mb", ibm5160_mb_device, pc_pit8253_out1_changed)) MCFG_PIT8253_CLK2(XTAL(14'318'181)/12.0) /* pio port c pin 4, and speaker polling enough */ - MCFG_PIT8253_OUT2_HANDLER(WRITELINE(ibm5160_mb_device, pc_pit8253_out2_changed)) + MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("mb", ibm5160_mb_device, pc_pit8253_out2_changed)) MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "mda", false) MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "lpt", false) |