fix Commoder PC, work around MSX cartridge (nw)

This commit is contained in:
Vas Crabb 2018-05-01 16:58:50 +10:00
parent ab7a8ecc6f
commit 5470866582
2 changed files with 9 additions and 3 deletions

View File

@ -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));
}
}

View File

@ -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)