diff options
Diffstat (limited to 'src/mame/drivers/s8.cpp')
-rw-r--r-- | src/mame/drivers/s8.cpp | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/src/mame/drivers/s8.cpp b/src/mame/drivers/s8.cpp index 03bfc4a22e7..5cfc5d6845d 100644 --- a/src/mame/drivers/s8.cpp +++ b/src/mame/drivers/s8.cpp @@ -314,8 +314,8 @@ DRIVER_INIT_MEMBER( s8_state, s8 ) MACHINE_CONFIG_START(s8_state::s8) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M6802, XTAL(4'000'000)) - MCFG_CPU_PROGRAM_MAP(s8_main_map) + MCFG_DEVICE_ADD("maincpu", M6802, XTAL(4'000'000)) + MCFG_DEVICE_PROGRAM_MAP(s8_main_map) MCFG_MACHINE_RESET_OVERRIDE(s8_state, s8) /* Video */ @@ -326,50 +326,50 @@ MACHINE_CONFIG_START(s8_state::s8) /* Devices */ MCFG_DEVICE_ADD("pia21", PIA6821, 0) - MCFG_PIA_READPA_HANDLER(READ8(s8_state, sound_r)) - MCFG_PIA_READCA1_HANDLER(READLINE(s8_state, pia21_ca1_r)) - MCFG_PIA_WRITEPA_HANDLER(WRITE8(s8_state, sound_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(s8_state, sol2_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(s8_state, pia21_ca2_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE(s8_state, pia21_cb2_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(s8_state, pia_irq)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(s8_state, pia_irq)) + 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(s8_state, lamp0_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(s8_state, lamp1_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE(s8_state, pia24_cb2_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(s8_state, pia_irq)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(s8_state, pia_irq)) + 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(s8_state, dig0_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(s8_state, dig1_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(s8_state, pia28_ca2_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE(s8_state, pia28_cb2_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(s8_state, pia_irq)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(s8_state, pia_irq)) + 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(s8_state, switch_r)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(s8_state, switch_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(s8_state, pia_irq)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(s8_state, pia_irq)) + 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)) MCFG_NVRAM_ADD_0FILL("nvram") /* Add the soundcard */ - MCFG_CPU_ADD("audiocpu", M6808, XTAL(4'000'000)) - MCFG_CPU_PROGRAM_MAP(s8_audio_map) + MCFG_DEVICE_ADD("audiocpu", M6808, XTAL(4'000'000)) + MCFG_DEVICE_PROGRAM_MAP(s8_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_DEVICE_ADD("pias", PIA6821, 0) - MCFG_PIA_READPA_HANDLER(READ8(s8_state, sound_r)) - MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8("dac", dac_byte_interface, write)) + MCFG_PIA_READPA_HANDLER(READ8(*this, s8_state, sound_r)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8("dac", dac_byte_interface, write)) MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE)) MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE)) MACHINE_CONFIG_END |