summaryrefslogtreecommitdiffstats
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.cpp72
1 files changed, 36 insertions, 36 deletions
diff --git a/src/mame/drivers/s11c.cpp b/src/mame/drivers/s11c.cpp
index 128af7ea3ec..8c628700b12 100644
--- a/src/mame/drivers/s11c.cpp
+++ b/src/mame/drivers/s11c.cpp
@@ -155,8 +155,8 @@ DRIVER_INIT_MEMBER(s11c_state,s11c)
MACHINE_CONFIG_START(s11c_state::s11c)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6808, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(s11c_main_map)
+ MCFG_DEVICE_ADD("maincpu", M6808, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(s11c_main_map)
MCFG_MACHINE_RESET_OVERRIDE(s11c_state, s11c)
/* Video */
@@ -167,49 +167,49 @@ MACHINE_CONFIG_START(s11c_state::s11c)
/* Devices */
MCFG_DEVICE_ADD("pia21", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s11_state, sound_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, sound_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, sol2_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s11_state, pia21_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia21_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ 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(s11_state, lamp0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, lamp1_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia24_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ 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(s11_state, pia28_w7_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11a_state, dig0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11b_state, dig1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s11_state, pia28_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia28_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ 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(s11b_state, pia2c_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11b_state, pia2c_pb_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ 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(s11_state, switch_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, switch_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia30_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ 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(s11b_state, pia34_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, pia34_pb_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia34_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ 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))
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -217,7 +217,7 @@ MACHINE_CONFIG_START(s11c_state::s11c)
/* Add the background music card */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("bgm", S11C_BG, 0)
+ MCFG_DEVICE_ADD("bgm", S11C_BG)
MCFG_S11C_BG_ROM_REGION(":bgcpu")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END