diff options
Diffstat (limited to 'src/mame/drivers/ambush.cpp')
-rw-r--r-- | src/mame/drivers/ambush.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/mame/drivers/ambush.cpp b/src/mame/drivers/ambush.cpp index 8e1f19fa319..2775ec4197a 100644 --- a/src/mame/drivers/ambush.cpp +++ b/src/mame/drivers/ambush.cpp @@ -688,19 +688,19 @@ WRITE8_MEMBER(ambush_state::output_latches_w) //************************************************************************** MACHINE_CONFIG_START(ambush_state::ambush) - MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6) - MCFG_CPU_PROGRAM_MAP(main_map) - MCFG_CPU_IO_MAP(main_portmap) - MCFG_CPU_VBLANK_INT_DRIVER("screen", ambush_state, irq0_line_hold) + MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'432'000)/6) + MCFG_DEVICE_PROGRAM_MAP(main_map) + MCFG_DEVICE_IO_MAP(main_portmap) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ambush_state, irq0_line_hold) // addressable latches at 8B and 8C MCFG_DEVICE_ADD("outlatch1", LS259, 0) - MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(ambush_state, flip_screen_w)) - MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(ambush_state, color_bank_1_w)) - MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(ambush_state, coin_counter_1_w)) + MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, ambush_state, flip_screen_w)) + MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, ambush_state, color_bank_1_w)) + MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, ambush_state, coin_counter_1_w)) MCFG_DEVICE_ADD("outlatch2", LS259, 0) - MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(ambush_state, color_bank_2_w)) - MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(ambush_state, coin_counter_2_w)) + MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, ambush_state, color_bank_2_w)) + MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, ambush_state, coin_counter_2_w)) MCFG_WATCHDOG_ADD("watchdog") @@ -719,26 +719,26 @@ MACHINE_CONFIG_START(ambush_state::ambush) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ay1", AY8912, XTAL(18'432'000)/6/2) + MCFG_DEVICE_ADD("ay1", AY8912, XTAL(18'432'000)/6/2) MCFG_AY8910_PORT_A_READ_CB(IOPORT("buttons")) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33) - MCFG_SOUND_ADD("ay2", AY8912, XTAL(18'432'000)/6/2) + MCFG_DEVICE_ADD("ay2", AY8912, XTAL(18'432'000)/6/2) MCFG_AY8910_PORT_A_READ_CB(IOPORT("joystick")) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33) MACHINE_CONFIG_END MACHINE_CONFIG_START(ambush_state::mariobl) ambush(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(bootleg_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(bootleg_map) // To be verified: do these bootlegs only have one LS259? MCFG_DEVICE_REMOVE("outlatch1") MCFG_DEVICE_REMOVE("outlatch2") MCFG_DEVICE_ADD("outlatch", LS259, 0) - MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(ambush_state, coin_counter_1_w)) - MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(ambush_state, color_bank_1_w)) + MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, ambush_state, coin_counter_1_w)) + MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, ambush_state, color_bank_1_w)) MCFG_MACHINE_START_OVERRIDE(ambush_state, mariobl) @@ -750,11 +750,11 @@ MACHINE_CONFIG_START(ambush_state::mariobl) MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(ambush_state, mario) - MCFG_SOUND_REPLACE("ay1", AY8910, XTAL(18'432'000)/6/2) + MCFG_DEVICE_REPLACE("ay1", AY8910, XTAL(18'432'000)/6/2) MCFG_AY8910_PORT_A_READ_CB(IOPORT("buttons")) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33) - MCFG_SOUND_REPLACE("ay2", AY8910, XTAL(18'432'000)/6/2) + MCFG_DEVICE_REPLACE("ay2", AY8910, XTAL(18'432'000)/6/2) MCFG_AY8910_PORT_A_READ_CB(IOPORT("joystick")) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33) MACHINE_CONFIG_END |