diff options
Diffstat (limited to 'src/mame/drivers/s9.cpp')
-rw-r--r-- | src/mame/drivers/s9.cpp | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/src/mame/drivers/s9.cpp b/src/mame/drivers/s9.cpp index 698b6409c81..195cc91b26d 100644 --- a/src/mame/drivers/s9.cpp +++ b/src/mame/drivers/s9.cpp @@ -336,36 +336,36 @@ MACHINE_CONFIG_START(s9_state::s9) genpin_audio(config); /* Devices */ - MCFG_DEVICE_ADD("pia21", PIA6821, 0) - MCFG_PIA_READPA_HANDLER(READ8(*this, s9_state, sound_r)) - MCFG_PIA_READCA1_HANDLER(READLINE(*this, s9_state, pia21_ca1_r)) - MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s9_state, sound_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s9_state, sol2_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s9_state, pia21_ca2_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s9_state, pia21_cb2_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s9_state, pia_irq)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s9_state, pia_irq)) - - MCFG_DEVICE_ADD("pia24", PIA6821, 0) - MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s9_state, lamp0_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s9_state, lamp1_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s9_state, pia24_cb2_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s9_state, pia_irq)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s9_state, pia_irq)) - - MCFG_DEVICE_ADD("pia28", PIA6821, 0) - MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s9_state, dig0_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s9_state, dig1_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s9_state, pia28_ca2_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s9_state, pia28_cb2_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s9_state, pia_irq)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s9_state, pia_irq)) - - MCFG_DEVICE_ADD("pia30", PIA6821, 0) - MCFG_PIA_READPA_HANDLER(READ8(*this, s9_state, switch_r)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s9_state, switch_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s9_state, pia_irq)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s9_state, pia_irq)) + PIA6821(config, m_pia21, 0); + m_pia21->readpa_handler().set(FUNC(s9_state::sound_r)); + m_pia21->readca1_handler().set(FUNC(s9_state::pia21_ca1_r)); + m_pia21->writepa_handler().set(FUNC(s9_state::sound_w)); + m_pia21->writepb_handler().set(FUNC(s9_state::sol2_w)); + m_pia21->ca2_handler().set(FUNC(s9_state::pia21_ca2_w)); + m_pia21->cb2_handler().set(FUNC(s9_state::pia21_cb2_w)); + m_pia21->irqa_handler().set(FUNC(s9_state::pia_irq)); + m_pia21->irqb_handler().set(FUNC(s9_state::pia_irq)); + + PIA6821(config, m_pia24, 0); + m_pia24->writepa_handler().set(FUNC(s9_state::lamp0_w)); + m_pia24->writepb_handler().set(FUNC(s9_state::lamp1_w)); + m_pia24->cb2_handler().set(FUNC(s9_state::pia24_cb2_w)); + m_pia24->irqa_handler().set(FUNC(s9_state::pia_irq)); + m_pia24->irqb_handler().set(FUNC(s9_state::pia_irq)); + + PIA6821(config, m_pia28, 0); + m_pia28->writepa_handler().set(FUNC(s9_state::dig0_w)); + m_pia28->writepb_handler().set(FUNC(s9_state::dig1_w)); + m_pia28->ca2_handler().set(FUNC(s9_state::pia28_ca2_w)); + m_pia28->cb2_handler().set(FUNC(s9_state::pia28_cb2_w)); + m_pia28->irqa_handler().set(FUNC(s9_state::pia_irq)); + m_pia28->irqb_handler().set(FUNC(s9_state::pia_irq)); + + PIA6821(config, m_pia30, 0); + m_pia30->readpa_handler().set(FUNC(s9_state::switch_r)); + m_pia30->writepb_handler().set(FUNC(s9_state::switch_w)); + m_pia30->irqa_handler().set(FUNC(s9_state::pia_irq)); + m_pia30->irqb_handler().set(FUNC(s9_state::pia_irq)); MCFG_NVRAM_ADD_0FILL("nvram") @@ -382,13 +382,13 @@ MACHINE_CONFIG_START(s9_state::s9) MCFG_DEVICE_ADD("hc55516", HC55516, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speech", 1.00) - MCFG_DEVICE_ADD("pias", PIA6821, 0) - MCFG_PIA_READPA_HANDLER(READ8(*this, s9_state, sound_r)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8("dac", dac_byte_interface, data_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE("hc55516", hc55516_device, clock_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE("hc55516", hc55516_device, digit_w)) - MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE)) - MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE)) + PIA6821(config, m_pias, 0); + m_pias->readpa_handler().set(FUNC(s9_state::sound_r)); + m_pias->writepb_handler().set("dac", FUNC(dac_byte_interface::data_w)); + m_pias->ca2_handler().set("hc55516", FUNC(hc55516_device::clock_w)); + m_pias->cb2_handler().set("hc55516", FUNC(hc55516_device::digit_w)); + m_pias->irqa_handler().set_inputline("audiocpu", M6808_IRQ_LINE); + m_pias->irqa_handler().set_inputline("audiocpu", M6808_IRQ_LINE); MACHINE_CONFIG_END /*----------------------------- |