diff options
Diffstat (limited to 'src/mame/drivers/s6.cpp')
-rw-r--r-- | src/mame/drivers/s6.cpp | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/src/mame/drivers/s6.cpp b/src/mame/drivers/s6.cpp index f0f421ac433..ea9470c16ad 100644 --- a/src/mame/drivers/s6.cpp +++ b/src/mame/drivers/s6.cpp @@ -406,8 +406,8 @@ DRIVER_INIT_MEMBER( s6_state, s6 ) MACHINE_CONFIG_START(s6_state::s6) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M6808, 3580000) // 6802 or 6808 could be used here - MCFG_CPU_PROGRAM_MAP(s6_main_map) + MCFG_DEVICE_ADD("maincpu", M6808, 3580000) // 6802 or 6808 could be used here + MCFG_DEVICE_PROGRAM_MAP(s6_main_map) MCFG_MACHINE_RESET_OVERRIDE(s6_state, s6) /* Video */ @@ -418,58 +418,58 @@ MACHINE_CONFIG_START(s6_state::s6) /* Devices */ MCFG_DEVICE_ADD("pia22", PIA6821, 0) - MCFG_PIA_WRITEPA_HANDLER(WRITE8(s6_state, sol0_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(s6_state, sol1_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(s6_state, pia22_ca2_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE(s6_state, pia22_cb2_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(s6_state, pia_irq)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(s6_state, pia_irq)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s6_state, sol0_w)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s6_state, sol1_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s6_state, pia22_ca2_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s6_state, pia22_cb2_w)) + MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s6_state, pia_irq)) + MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s6_state, pia_irq)) MCFG_DEVICE_ADD("pia24", PIA6821, 0) - MCFG_PIA_WRITEPA_HANDLER(WRITE8(s6_state, lamp0_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(s6_state, lamp1_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(s6_state, pia24_ca2_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE(s6_state, pia24_cb2_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(s6_state, pia_irq)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(s6_state, pia_irq)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s6_state, lamp0_w)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s6_state, lamp1_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s6_state, pia24_ca2_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s6_state, pia24_cb2_w)) + MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s6_state, pia_irq)) + MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s6_state, pia_irq)) MCFG_DEVICE_ADD("pia28", PIA6821, 0) - MCFG_PIA_READPA_HANDLER(READ8(s6_state, dips_r)) - MCFG_PIA_WRITEPA_HANDLER(WRITE8(s6_state, dig0_w)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(s6_state, dig1_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(s6_state, pia28_ca2_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE(s6_state, pia28_cb2_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(s6_state, pia_irq)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(s6_state, pia_irq)) + MCFG_PIA_READPA_HANDLER(READ8(*this, s6_state, dips_r)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s6_state, dig0_w)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s6_state, dig1_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s6_state, pia28_ca2_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s6_state, pia28_cb2_w)) + MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s6_state, pia_irq)) + MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s6_state, pia_irq)) MCFG_DEVICE_ADD("pia30", PIA6821, 0) - MCFG_PIA_READPA_HANDLER(READ8(s6_state, switch_r)) - MCFG_PIA_WRITEPB_HANDLER(WRITE8(s6_state, switch_w)) - MCFG_PIA_CA2_HANDLER(WRITELINE(s6_state, pia30_ca2_w)) - MCFG_PIA_CB2_HANDLER(WRITELINE(s6_state, pia30_cb2_w)) - MCFG_PIA_IRQA_HANDLER(WRITELINE(s6_state, pia_irq)) - MCFG_PIA_IRQB_HANDLER(WRITELINE(s6_state, pia_irq)) + MCFG_PIA_READPA_HANDLER(READ8(*this, s6_state, switch_r)) + MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s6_state, switch_w)) + MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s6_state, pia30_ca2_w)) + MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s6_state, pia30_cb2_w)) + MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s6_state, pia_irq)) + MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s6_state, pia_irq)) MCFG_NVRAM_ADD_0FILL("nvram") /* Add the soundcard */ - MCFG_CPU_ADD("audiocpu", M6802, 3580000) - MCFG_CPU_PROGRAM_MAP(s6_audio_map) + MCFG_DEVICE_ADD("audiocpu", M6802, 3580000) + MCFG_DEVICE_PROGRAM_MAP(s6_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(s6_state, sound_r)) - MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("dac", dac_byte_interface, write)) - MCFG_PIA_CA2_HANDLER(DEVWRITELINE("hc55516", hc55516_device, digit_w)) - MCFG_PIA_CB2_HANDLER(DEVWRITELINE("hc55516", hc55516_device, clock_w)) + MCFG_PIA_READPB_HANDLER(READ8(*this, s6_state, sound_r)) + MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, write)) + 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", M6802_IRQ_LINE)) MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE)) MACHINE_CONFIG_END |