summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/s8.cpp
diff options
context:
space:
mode:
author mooglyguy <therealmogminer@gmail.com>2018-08-10 18:08:03 +0200
committer mooglyguy <therealmogminer@gmail.com>2018-08-10 18:08:03 +0200
commit358ee652df3d7f2ff7e9f3e2b9e3bfc71832942b (patch)
tree5d98cfd52e6bf275090837831f4efe87c4703694 /src/mame/drivers/s8.cpp
parent0d4a4e5e95a58ca1cb821df1cf9afd8b559ccac2 (diff)
-pia6821: Removed MCFG and old devcb. [Ryan Holtz]
Diffstat (limited to 'src/mame/drivers/s8.cpp')
-rw-r--r--src/mame/drivers/s8.cpp70
1 files changed, 35 insertions, 35 deletions
diff --git a/src/mame/drivers/s8.cpp b/src/mame/drivers/s8.cpp
index 4081ad4cbfd..4ace77fe10e 100644
--- a/src/mame/drivers/s8.cpp
+++ b/src/mame/drivers/s8.cpp
@@ -330,36 +330,36 @@ MACHINE_CONFIG_START(s8_state::s8)
genpin_audio(config);
/* Devices */
- MCFG_DEVICE_ADD("pia21", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(*this, s8_state, sound_r))
- MCFG_PIA_READCA1_HANDLER(READLINE(*this, s8_state, pia21_ca1_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s8_state, sound_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s8_state, sol2_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s8_state, pia21_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s8_state, pia21_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s8_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s8_state, pia_irq))
-
- MCFG_DEVICE_ADD("pia24", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s8_state, lamp0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s8_state, lamp1_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s8_state, pia24_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s8_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s8_state, pia_irq))
-
- MCFG_DEVICE_ADD("pia28", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s8_state, dig0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s8_state, dig1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s8_state, pia28_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s8_state, pia28_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s8_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s8_state, pia_irq))
-
- MCFG_DEVICE_ADD("pia30", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(*this, s8_state, switch_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s8_state, switch_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s8_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s8_state, pia_irq))
+ PIA6821(config, m_pia21, 0);
+ m_pia21->readpa_handler().set(FUNC(s8_state::sound_r));
+ m_pia21->readca1_handler().set(FUNC(s8_state::pia21_ca1_r));
+ m_pia21->writepa_handler().set(FUNC(s8_state::sound_w));
+ m_pia21->writepb_handler().set(FUNC(s8_state::sol2_w));
+ m_pia21->ca2_handler().set(FUNC(s8_state::pia21_ca2_w));
+ m_pia21->cb2_handler().set(FUNC(s8_state::pia21_cb2_w));
+ m_pia21->irqa_handler().set(FUNC(s8_state::pia_irq));
+ m_pia21->irqb_handler().set(FUNC(s8_state::pia_irq));
+
+ PIA6821(config, m_pia24, 0);
+ m_pia24->writepa_handler().set(FUNC(s8_state::lamp0_w));
+ m_pia24->writepb_handler().set(FUNC(s8_state::lamp1_w));
+ m_pia24->cb2_handler().set(FUNC(s8_state::pia24_cb2_w));
+ m_pia24->irqa_handler().set(FUNC(s8_state::pia_irq));
+ m_pia24->irqb_handler().set(FUNC(s8_state::pia_irq));
+
+ PIA6821(config, m_pia28, 0);
+ m_pia28->writepa_handler().set(FUNC(s8_state::dig0_w));
+ m_pia28->writepb_handler().set(FUNC(s8_state::dig1_w));
+ m_pia28->ca2_handler().set(FUNC(s8_state::pia28_ca2_w));
+ m_pia28->cb2_handler().set(FUNC(s8_state::pia28_cb2_w));
+ m_pia28->irqa_handler().set(FUNC(s8_state::pia_irq));
+ m_pia28->irqb_handler().set(FUNC(s8_state::pia_irq));
+
+ PIA6821(config, m_pia30, 0);
+ m_pia30->readpa_handler().set(FUNC(s8_state::switch_r));
+ m_pia30->writepb_handler().set(FUNC(s8_state::switch_w));
+ m_pia30->irqa_handler().set(FUNC(s8_state::pia_irq));
+ m_pia30->irqb_handler().set(FUNC(s8_state::pia_irq));
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -372,11 +372,11 @@ MACHINE_CONFIG_START(s8_state::s8)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
- MCFG_DEVICE_ADD("pias", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(*this, s8_state, sound_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8("dac", dac_byte_interface, data_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(s8_state::sound_r));
+ m_pias->writepb_handler().set("dac", FUNC(dac_byte_interface::data_w));
+ m_pias->irqa_handler().set_inputline("audiocpu", M6808_IRQ_LINE);
+ m_pias->irqa_handler().set_inputline("audiocpu", M6808_IRQ_LINE);
MACHINE_CONFIG_END
/*------------------------------