summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/s6.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/s6.cpp')
-rw-r--r--src/mame/drivers/s6.cpp78
1 files changed, 39 insertions, 39 deletions
diff --git a/src/mame/drivers/s6.cpp b/src/mame/drivers/s6.cpp
index 79db4cea411..397b9236be0 100644
--- a/src/mame/drivers/s6.cpp
+++ b/src/mame/drivers/s6.cpp
@@ -422,38 +422,38 @@ MACHINE_CONFIG_START(s6_state::s6)
genpin_audio(config);
/* Devices */
- MCFG_DEVICE_ADD("pia22", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s6_state, sol0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s6_state, sol1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s6_state, pia22_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s6_state, pia22_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s6_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s6_state, pia_irq))
-
- MCFG_DEVICE_ADD("pia24", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s6_state, lamp0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s6_state, lamp1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s6_state, pia24_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s6_state, pia24_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s6_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s6_state, pia_irq))
-
- MCFG_DEVICE_ADD("pia28", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(*this, s6_state, dips_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s6_state, dig0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s6_state, dig1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s6_state, pia28_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s6_state, pia28_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s6_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s6_state, pia_irq))
-
- MCFG_DEVICE_ADD("pia30", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(*this, s6_state, switch_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s6_state, switch_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s6_state, pia30_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s6_state, pia30_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s6_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s6_state, pia_irq))
+ PIA6821(config, m_pia22, 0);
+ m_pia22->writepa_handler().set(FUNC(s6_state::sol0_w));
+ m_pia22->writepb_handler().set(FUNC(s6_state::sol1_w));
+ m_pia22->ca2_handler().set(FUNC(s6_state::pia22_ca2_w));
+ m_pia22->cb2_handler().set(FUNC(s6_state::pia22_cb2_w));
+ m_pia22->irqa_handler().set(FUNC(s6_state::pia_irq));
+ m_pia22->irqb_handler().set(FUNC(s6_state::pia_irq));
+
+ PIA6821(config, m_pia24, 0);
+ m_pia24->writepa_handler().set(FUNC(s6_state::lamp0_w));
+ m_pia24->writepb_handler().set(FUNC(s6_state::lamp1_w));
+ m_pia24->ca2_handler().set(FUNC(s6_state::pia24_ca2_w));
+ m_pia24->cb2_handler().set(FUNC(s6_state::pia24_cb2_w));
+ m_pia24->irqa_handler().set(FUNC(s6_state::pia_irq));
+ m_pia24->irqb_handler().set(FUNC(s6_state::pia_irq));
+
+ PIA6821(config, m_pia28, 0);
+ m_pia28->readpa_handler().set(FUNC(s6_state::dips_r));
+ m_pia28->writepa_handler().set(FUNC(s6_state::dig0_w));
+ m_pia28->writepb_handler().set(FUNC(s6_state::dig1_w));
+ m_pia28->ca2_handler().set(FUNC(s6_state::pia28_ca2_w));
+ m_pia28->cb2_handler().set(FUNC(s6_state::pia28_cb2_w));
+ m_pia28->irqa_handler().set(FUNC(s6_state::pia_irq));
+ m_pia28->irqb_handler().set(FUNC(s6_state::pia_irq));
+
+ PIA6821(config, m_pia30, 0);
+ m_pia30->readpa_handler().set(FUNC(s6_state::switch_r));
+ m_pia30->writepb_handler().set(FUNC(s6_state::switch_w));
+ m_pia30->ca2_handler().set(FUNC(s6_state::pia30_ca2_w));
+ m_pia30->cb2_handler().set(FUNC(s6_state::pia30_cb2_w));
+ m_pia30->irqa_handler().set(FUNC(s6_state::pia_irq));
+ m_pia30->irqb_handler().set(FUNC(s6_state::pia_irq));
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -470,13 +470,13 @@ MACHINE_CONFIG_START(s6_state::s6)
MCFG_DEVICE_ADD("hc55516", HC55516, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speech", 1.00)
- MCFG_DEVICE_ADD("pias", PIA6821, 0)
- MCFG_PIA_READPB_HANDLER(READ8(*this, s6_state, sound_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, data_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE("hc55516", hc55516_device, digit_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE("hc55516", hc55516_device, clock_w))
- MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
- MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
+ PIA6821(config, m_pias, 0);
+ m_pias->readpb_handler().set(FUNC(s6_state::sound_r));
+ m_pias->writepa_handler().set("dac", FUNC(dac_byte_interface::data_w));
+ m_pias->ca2_handler().set(m_hc55516, FUNC(hc55516_device::digit_w));
+ m_pias->cb2_handler().set(m_hc55516, FUNC(hc55516_device::clock_w));
+ m_pias->irqa_handler().set_inputline(m_audiocpu, M6802_IRQ_LINE); // FIXME: needs an input merger
+ m_pias->irqb_handler().set_inputline(m_audiocpu, M6802_IRQ_LINE);
MACHINE_CONFIG_END