summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/s9.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/s9.cpp')
-rw-r--r--src/mame/drivers/s9.cpp66
1 files changed, 33 insertions, 33 deletions
diff --git a/src/mame/drivers/s9.cpp b/src/mame/drivers/s9.cpp
index d7ef5e23080..083fe3f1eb1 100644
--- a/src/mame/drivers/s9.cpp
+++ b/src/mame/drivers/s9.cpp
@@ -320,8 +320,8 @@ DRIVER_INIT_MEMBER( s9_state, s9 )
MACHINE_CONFIG_START(s9_state::s9)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6808, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(s9_main_map)
+ MCFG_DEVICE_ADD("maincpu", M6808, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(s9_main_map)
MCFG_MACHINE_RESET_OVERRIDE(s9_state, s9)
/* Video */
@@ -332,56 +332,56 @@ MACHINE_CONFIG_START(s9_state::s9)
/* Devices */
MCFG_DEVICE_ADD("pia21", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s9_state, sound_r))
- MCFG_PIA_READCA1_HANDLER(READLINE(s9_state, pia21_ca1_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s9_state, sound_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s9_state, sol2_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s9_state, pia21_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s9_state, pia21_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s9_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s9_state, pia_irq))
+ 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(s9_state, lamp0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s9_state, lamp1_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s9_state, pia24_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s9_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s9_state, pia_irq))
+ 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(s9_state, dig0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s9_state, dig1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s9_state, pia28_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s9_state, pia28_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s9_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s9_state, pia_irq))
+ 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(s9_state, switch_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s9_state, switch_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s9_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s9_state, pia_irq))
+ 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))
MCFG_NVRAM_ADD_0FILL("nvram")
/* Add the soundcard */
- MCFG_CPU_ADD("audiocpu", M6808, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(s9_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", M6808, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(s9_audio_map)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
+ MCFG_DEVICE_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
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_SPEAKER_STANDARD_MONO("speech")
- MCFG_SOUND_ADD("hc55516", HC55516, 0)
+ 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(s9_state, sound_r))
- MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_PIA_CA2_HANDLER(DEVWRITELINE("hc55516", hc55516_device, clock_w))
- MCFG_PIA_CB2_HANDLER(DEVWRITELINE("hc55516", hc55516_device, digit_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s9_state, sound_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8("dac", dac_byte_interface, write))
+ 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))
MACHINE_CONFIG_END