summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/s11c.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/s11c.cpp')
-rw-r--r--src/mame/drivers/s11c.cpp88
1 files changed, 44 insertions, 44 deletions
diff --git a/src/mame/drivers/s11c.cpp b/src/mame/drivers/s11c.cpp
index 2cbd6fd7248..f962cb7229a 100644
--- a/src/mame/drivers/s11c.cpp
+++ b/src/mame/drivers/s11c.cpp
@@ -166,50 +166,50 @@ MACHINE_CONFIG_START(s11c_state::s11c)
genpin_audio(config);
/* Devices */
- MCFG_DEVICE_ADD("pia21", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(*this, s11_state, sound_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11_state, sound_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, sol2_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s11_state, pia21_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia21_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
-
- MCFG_DEVICE_ADD("pia24", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11_state, lamp0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, lamp1_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia24_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
-
- MCFG_DEVICE_ADD("pia28", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(*this, s11_state, pia28_w7_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11a_state, dig0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11b_state, dig1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s11_state, pia28_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia28_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
-
- MCFG_DEVICE_ADD("pia2c", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11b_state, pia2c_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11b_state, pia2c_pb_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
-
- MCFG_DEVICE_ADD("pia30", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(*this, s11_state, switch_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, switch_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia30_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
-
- MCFG_DEVICE_ADD("pia34", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11b_state, pia34_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, pia34_pb_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia34_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
+ PIA6821(config, m_pia21, 0);
+ m_pia21->readpa_handler().set(FUNC(s11_state::sound_r));
+ m_pia21->writepa_handler().set(FUNC(s11_state::sound_w));
+ m_pia21->writepb_handler().set(FUNC(s11_state::sol2_w));
+ m_pia21->ca2_handler().set(FUNC(s11_state::pia21_ca2_w));
+ m_pia21->cb2_handler().set(FUNC(s11_state::pia21_cb2_w));
+ m_pia21->irqa_handler().set(FUNC(s11_state::pia_irq));
+ m_pia21->irqb_handler().set(FUNC(s11_state::pia_irq));
+
+ PIA6821(config, m_pia24, 0);
+ m_pia24->writepa_handler().set(FUNC(s11_state::lamp0_w));
+ m_pia24->writepb_handler().set(FUNC(s11_state::lamp1_w));
+ m_pia24->cb2_handler().set(FUNC(s11_state::pia24_cb2_w));
+ m_pia24->irqa_handler().set(FUNC(s11_state::pia_irq));
+ m_pia24->irqb_handler().set(FUNC(s11_state::pia_irq));
+
+ PIA6821(config, m_pia28, 0);
+ m_pia28->readpa_handler().set(FUNC(s11_state::pia28_w7_r));
+ m_pia28->writepa_handler().set(FUNC(s11a_state::dig0_w));
+ m_pia28->writepb_handler().set(FUNC(s11b_state::dig1_w));
+ m_pia28->ca2_handler().set(FUNC(s11_state::pia28_ca2_w));
+ m_pia28->cb2_handler().set(FUNC(s11_state::pia28_cb2_w));
+ m_pia28->irqa_handler().set(FUNC(s11_state::pia_irq));
+ m_pia28->irqb_handler().set(FUNC(s11_state::pia_irq));
+
+ PIA6821(config, m_pia2c, 0);
+ m_pia2c->writepa_handler().set(FUNC(s11b_state::pia2c_pa_w));
+ m_pia2c->writepb_handler().set(FUNC(s11b_state::pia2c_pb_w));
+ m_pia2c->irqa_handler().set(FUNC(s11_state::pia_irq));
+ m_pia2c->irqb_handler().set(FUNC(s11_state::pia_irq));
+
+ PIA6821(config, m_pia30, 0);
+ m_pia30->readpa_handler().set(FUNC(s11_state::switch_r));
+ m_pia30->writepb_handler().set(FUNC(s11_state::switch_w));
+ m_pia30->cb2_handler().set(FUNC(s11_state::pia30_cb2_w));
+ m_pia30->irqa_handler().set(FUNC(s11_state::pia_irq));
+ m_pia30->irqb_handler().set(FUNC(s11_state::pia_irq));
+
+ PIA6821(config, m_pia34, 0);
+ m_pia34->writepa_handler().set(FUNC(s11b_state::pia34_pa_w));
+ m_pia34->writepb_handler().set(FUNC(s11b_state::pia34_pb_w));
+ m_pia34->cb2_handler().set(FUNC(s11b_state::pia34_cb2_w));
+ m_pia34->irqa_handler().set(FUNC(s11_state::pia_irq));
+ m_pia34->irqb_handler().set(FUNC(s11_state::pia_irq));
MCFG_NVRAM_ADD_1FILL("nvram")