diff options
Diffstat (limited to 'src/mame/drivers/s7.cpp')
-rw-r--r-- | src/mame/drivers/s7.cpp | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/src/mame/drivers/s7.cpp b/src/mame/drivers/s7.cpp index a88266a1af8..3f210f32263 100644 --- a/src/mame/drivers/s7.cpp +++ b/src/mame/drivers/s7.cpp @@ -432,8 +432,8 @@ DRIVER_INIT_MEMBER( s7_state, s7 ) MACHINE_CONFIG_START(s7_state::s7) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M6808, 3580000) - MCFG_CPU_PROGRAM_MAP(s7_main_map) + MCFG_DEVICE_ADD("maincpu", M6808, 3580000) + MCFG_DEVICE_PROGRAM_MAP(s7_main_map) MCFG_MACHINE_RESET_OVERRIDE(s7_state, s7) /* Video */ @@ -446,68 +446,68 @@ MACHINE_CONFIG_START(s7_state::s7) MCFG_DEVICE_ADD("pia21", PIA6821, 0) MCFG_PIA_READPA_HANDLER(CONSTANT(0xff)) MCFG_PIA_READPB_HANDLER(CONSTANT(0x3f)) - MCFG_PIA_WRITEPA_HANDLER(WRITE8(s7_state, sound_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(s7_state, sol2_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(s7_state, pia21_ca2_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE(s7_state, pia21_cb2_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(s7_state, pia_irq)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(s7_state, pia_irq)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s7_state, sound_w)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s7_state, sol2_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s7_state, pia21_ca2_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s7_state, pia21_cb2_w)) + MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s7_state, pia_irq)) + MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s7_state, pia_irq)) MCFG_DEVICE_ADD("pia22", PIA6821, 0) - MCFG_PIA_WRITEPA_HANDLER(WRITE8(s7_state, sol0_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(s7_state, sol1_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(s7_state, pia22_ca2_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE(s7_state, pia22_cb2_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(s7_state, pia_irq)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(s7_state, pia_irq)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s7_state, sol0_w)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s7_state, sol1_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s7_state, pia22_ca2_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s7_state, pia22_cb2_w)) + MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s7_state, pia_irq)) + MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s7_state, pia_irq)) MCFG_DEVICE_ADD("pia24", PIA6821, 0) - MCFG_PIA_WRITEPA_HANDLER(WRITE8(s7_state, lamp0_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(s7_state, lamp1_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(s7_state, pia24_ca2_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE(s7_state, pia24_cb2_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(s7_state, pia_irq)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(s7_state, pia_irq)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s7_state, lamp0_w)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s7_state, lamp1_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s7_state, pia24_ca2_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s7_state, pia24_cb2_w)) + MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s7_state, pia_irq)) + MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s7_state, pia_irq)) MCFG_DEVICE_ADD("pia28", PIA6821, 0) - MCFG_PIA_READPA_HANDLER(READ8(s7_state, dips_r)) - MCFG_PIA_WRITEPA_HANDLER(WRITE8(s7_state, dig0_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(s7_state, dig1_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(s7_state, pia28_ca2_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE(s7_state, pia28_cb2_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(s7_state, pia_irq)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(s7_state, pia_irq)) + MCFG_PIA_READPA_HANDLER(READ8(*this, s7_state, dips_r)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s7_state, dig0_w)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s7_state, dig1_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s7_state, pia28_ca2_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s7_state, pia28_cb2_w)) + MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s7_state, pia_irq)) + MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s7_state, pia_irq)) MCFG_DEVICE_ADD("pia30", PIA6821, 0) - MCFG_PIA_READPA_HANDLER(READ8(s7_state, switch_r)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(s7_state, switch_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(s7_state, pia30_ca2_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE(s7_state, pia30_cb2_w)) + MCFG_PIA_READPA_HANDLER(READ8(*this, s7_state, switch_r)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s7_state, switch_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s7_state, pia30_ca2_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s7_state, pia30_cb2_w)) MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6808_IRQ_LINE)) MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6808_IRQ_LINE)) MCFG_NVRAM_ADD_0FILL("nvram") /* Add the soundcard */ - MCFG_CPU_ADD("audiocpu", M6808, 3580000) - MCFG_CPU_PROGRAM_MAP(s7_audio_map) + MCFG_DEVICE_ADD("audiocpu", M6808, 3580000) + MCFG_DEVICE_PROGRAM_MAP(s7_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_READPB_HANDLER(READ8(s7_state, sound_r)) - MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("dac", dac_byte_interface, write)) + MCFG_PIA_READPB_HANDLER(READ8(*this, s7_state, sound_r)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, write)) MCFG_PIA_WRITEPB_HANDLER(NOOP) MCFG_PIA_READCA1_HANDLER(VCC) - MCFG_PIA_CA2_HANDLER(DEVWRITELINE("hc55516", hc55516_device, digit_w)) - MCFG_PIA_CB2_HANDLER(DEVWRITELINE("hc55516", hc55516_device, clock_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", M6808_IRQ_LINE)) MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE)) MACHINE_CONFIG_END |