diff options
Diffstat (limited to 'src/mame/drivers/splash.cpp')
-rw-r--r-- | src/mame/drivers/splash.cpp | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/src/mame/drivers/splash.cpp b/src/mame/drivers/splash.cpp index 6a35d576719..8353e6c0b0d 100644 --- a/src/mame/drivers/splash.cpp +++ b/src/mame/drivers/splash.cpp @@ -488,19 +488,19 @@ MACHINE_RESET_MEMBER(splash_state,splash) MACHINE_CONFIG_START(splash_state::splash) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12MHz (24/2) */ - MCFG_CPU_PROGRAM_MAP(splash_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", splash_state, irq6_line_hold) + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12MHz (24/2) */ + MCFG_DEVICE_PROGRAM_MAP(splash_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", splash_state, irq6_line_hold) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(30'000'000)/8) /* 3.75MHz (30/8) */ - MCFG_CPU_PROGRAM_MAP(splash_sound_map) - MCFG_CPU_PERIODIC_INT_DRIVER(splash_state, nmi_line_pulse, 60*64) /* needed for the msm5205 to play the samples */ + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(30'000'000)/8) /* 3.75MHz (30/8) */ + MCFG_DEVICE_PROGRAM_MAP(splash_sound_map) + MCFG_DEVICE_PERIODIC_INT_DRIVER(splash_state, nmi_line_pulse, 60*64) /* needed for the msm5205 to play the samples */ MCFG_DEVICE_ADD("outlatch", LS259, 0) // A8 - MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(splash_state, coin1_lockout_w)) - MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(splash_state, coin2_lockout_w)) - MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(splash_state, coin1_counter_w)) - MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(splash_state, coin2_counter_w)) + MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, splash_state, coin1_lockout_w)) + MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, splash_state, coin2_lockout_w)) + MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, splash_state, coin1_counter_w)) + MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, splash_state, coin2_counter_w)) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -524,11 +524,11 @@ MACHINE_CONFIG_START(splash_state::splash) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0)) - MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(30'000'000)/8) /* 3.75MHz (30/8) */ + MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(30'000'000)/8) /* 3.75MHz (30/8) */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000)) - MCFG_MSM5205_VCLK_CB(WRITELINE(splash_state, splash_msm5205_int)) /* IRQ handler */ + MCFG_DEVICE_ADD("msm", MSM5205, XTAL(384'000)) + MCFG_MSM5205_VCLK_CB(WRITELINE(*this, splash_state, splash_msm5205_int)) /* IRQ handler */ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8KHz */ /* Sample rate = 384kHz/48 */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MACHINE_CONFIG_END @@ -550,20 +550,20 @@ INTERRUPT_GEN_MEMBER(splash_state::roldfrog_interrupt) MACHINE_CONFIG_START(splash_state::roldfrog) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz - verified */ - MCFG_CPU_PROGRAM_MAP(roldfrog_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", splash_state, irq6_line_hold) + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz - verified */ + MCFG_DEVICE_PROGRAM_MAP(roldfrog_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", splash_state, irq6_line_hold) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/8) /* 3 MHz - verified */ - MCFG_CPU_PROGRAM_MAP(roldfrog_sound_map) - MCFG_CPU_IO_MAP(roldfrog_sound_io_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", splash_state, roldfrog_interrupt) + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/8) /* 3 MHz - verified */ + MCFG_DEVICE_PROGRAM_MAP(roldfrog_sound_map) + MCFG_DEVICE_IO_MAP(roldfrog_sound_io_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", splash_state, roldfrog_interrupt) MCFG_DEVICE_ADD("outlatch", LS259, 0) - MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(splash_state, coin1_lockout_w)) - MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(splash_state, coin2_lockout_w)) - MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(splash_state, coin1_counter_w)) - MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(splash_state, coin2_counter_w)) + MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, splash_state, coin1_lockout_w)) + MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, splash_state, coin2_lockout_w)) + MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, splash_state, coin1_counter_w)) + MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, splash_state, coin2_counter_w)) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -588,8 +588,8 @@ MACHINE_CONFIG_START(splash_state::roldfrog) MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI)) MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true) - MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(24'000'000) / 8) - MCFG_YM2203_IRQ_HANDLER(WRITELINE(splash_state, ym_irq)) + MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(24'000'000) / 8) + MCFG_YM2203_IRQ_HANDLER(WRITELINE(*this, splash_state, ym_irq)) MCFG_SOUND_ROUTE(0, "mono", 0.20) MCFG_SOUND_ROUTE(1, "mono", 0.20) MCFG_SOUND_ROUTE(2, "mono", 0.20) @@ -644,13 +644,13 @@ void funystrp_state::machine_start() MACHINE_CONFIG_START(funystrp_state::funystrp) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz (24/2) */ - MCFG_CPU_PROGRAM_MAP(funystrp_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", funystrp_state, irq6_line_hold) + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz (24/2) */ + MCFG_DEVICE_PROGRAM_MAP(funystrp_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", funystrp_state, irq6_line_hold) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* 6MHz (24/4) */ - MCFG_CPU_PROGRAM_MAP(funystrp_sound_map) - MCFG_CPU_IO_MAP(funystrp_sound_io_map) + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* 6MHz (24/4) */ + MCFG_DEVICE_PROGRAM_MAP(funystrp_sound_map) + MCFG_DEVICE_IO_MAP(funystrp_sound_io_map) MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") @@ -673,13 +673,13 @@ MACHINE_CONFIG_START(funystrp_state::funystrp) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI)) - MCFG_SOUND_ADD("msm1", MSM5205, XTAL(400'000)) - MCFG_MSM5205_VCLK_CB(WRITELINE(funystrp_state, adpcm_int1)) /* interrupt function */ + MCFG_DEVICE_ADD("msm1", MSM5205, XTAL(400'000)) + MCFG_MSM5205_VCLK_CB(WRITELINE(*this, funystrp_state, adpcm_int1)) /* interrupt function */ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 1 / 48 */ /* Sample rate = 400kHz/64 */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MCFG_SOUND_ADD("msm2", MSM5205, XTAL(400'000)) - MCFG_MSM5205_VCLK_CB(WRITELINE(funystrp_state, adpcm_int2)) /* interrupt function */ + MCFG_DEVICE_ADD("msm2", MSM5205, XTAL(400'000)) + MCFG_MSM5205_VCLK_CB(WRITELINE(*this, funystrp_state, adpcm_int2)) /* interrupt function */ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 1 / 96 */ /* Sample rate = 400kHz/96 */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MACHINE_CONFIG_END |