diff options
Diffstat (limited to 'src/mame/drivers/gameplan.cpp')
-rw-r--r-- | src/mame/drivers/gameplan.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/mame/drivers/gameplan.cpp b/src/mame/drivers/gameplan.cpp index 45690003b5f..7640f1df6e9 100644 --- a/src/mame/drivers/gameplan.cpp +++ b/src/mame/drivers/gameplan.cpp @@ -962,15 +962,15 @@ MACHINE_RESET_MEMBER(gameplan_state,gameplan) MACHINE_CONFIG_START(gameplan_state::gameplan) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M6502, GAMEPLAN_MAIN_CPU_CLOCK) - MCFG_CPU_PROGRAM_MAP(gameplan_main_map) + MCFG_DEVICE_ADD("maincpu", M6502, GAMEPLAN_MAIN_CPU_CLOCK) + MCFG_DEVICE_PROGRAM_MAP(gameplan_main_map) - MCFG_CPU_ADD("audiocpu", M6502, GAMEPLAN_AUDIO_CPU_CLOCK) - MCFG_CPU_PROGRAM_MAP(gameplan_audio_map) + MCFG_DEVICE_ADD("audiocpu", M6502, GAMEPLAN_AUDIO_CPU_CLOCK) + MCFG_DEVICE_PROGRAM_MAP(gameplan_audio_map) MCFG_DEVICE_ADD("riot", RIOT6532, GAMEPLAN_AUDIO_CPU_CLOCK) - MCFG_RIOT6532_OUT_PB_CB(WRITE8(gameplan_state, r6532_soundlatch_w)) - MCFG_RIOT6532_IRQ_CB(WRITELINE(gameplan_state, r6532_irq)) + MCFG_RIOT6532_OUT_PB_CB(WRITE8(*this, gameplan_state, r6532_soundlatch_w)) + MCFG_RIOT6532_IRQ_CB(WRITELINE(*this, gameplan_state, r6532_irq)) MCFG_MACHINE_START_OVERRIDE(gameplan_state,gameplan) MCFG_MACHINE_RESET_OVERRIDE(gameplan_state,gameplan) @@ -983,47 +983,47 @@ MACHINE_CONFIG_START(gameplan_state::gameplan) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_SOUND_ADD("aysnd", AY8910, GAMEPLAN_AY8910_CLOCK) + MCFG_DEVICE_ADD("aysnd", AY8910, GAMEPLAN_AY8910_CLOCK) MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW2")) MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW3")) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33) /* via */ MCFG_DEVICE_ADD("via6522_0", VIA6522, GAMEPLAN_MAIN_CPU_CLOCK) - MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(gameplan_state, video_data_w)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(gameplan_state, gameplan_video_command_w)) - MCFG_VIA6522_CA2_HANDLER(WRITELINE(gameplan_state, video_command_trigger_w)) - MCFG_VIA6522_IRQ_HANDLER(WRITELINE(gameplan_state, via_irq)) + MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, gameplan_state, video_data_w)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, gameplan_state, gameplan_video_command_w)) + MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, gameplan_state, video_command_trigger_w)) + MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, gameplan_state, via_irq)) MCFG_DEVICE_ADD("via6522_1", VIA6522, GAMEPLAN_MAIN_CPU_CLOCK) - MCFG_VIA6522_READPA_HANDLER(READ8(gameplan_state, io_port_r)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(gameplan_state, io_select_w)) - MCFG_VIA6522_CB2_HANDLER(WRITELINE(gameplan_state, coin_w)) + MCFG_VIA6522_READPA_HANDLER(READ8(*this, gameplan_state, io_port_r)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, gameplan_state, io_select_w)) + MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, gameplan_state, coin_w)) MCFG_DEVICE_ADD("via6522_2", VIA6522, GAMEPLAN_MAIN_CPU_CLOCK) - MCFG_VIA6522_READPB_HANDLER(DEVREAD8("soundlatch", generic_latch_8_device, read)) - MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(gameplan_state, audio_cmd_w)) - MCFG_VIA6522_CA2_HANDLER(WRITELINE(gameplan_state, audio_trigger_w)) - MCFG_VIA6522_CB2_HANDLER(WRITELINE(gameplan_state, audio_reset_w)) + MCFG_VIA6522_READPB_HANDLER(READ8("soundlatch", generic_latch_8_device, read)) + MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, gameplan_state, audio_cmd_w)) + MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, gameplan_state, audio_trigger_w)) + MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, gameplan_state, audio_reset_w)) MACHINE_CONFIG_END MACHINE_CONFIG_START(gameplan_state::leprechn) gameplan(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_CLOCK(LEPRECHAUN_MAIN_CPU_CLOCK) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_CLOCK(LEPRECHAUN_MAIN_CPU_CLOCK) /* basic machine hardware */ - MCFG_CPU_MODIFY("audiocpu") - MCFG_CPU_PROGRAM_MAP(leprechn_audio_map) + MCFG_DEVICE_MODIFY("audiocpu") + MCFG_DEVICE_PROGRAM_MAP(leprechn_audio_map) /* video hardware */ leprechn_video(config); /* via */ MCFG_DEVICE_MODIFY("via6522_0") - MCFG_VIA6522_READPB_HANDLER(READ8(gameplan_state, leprechn_videoram_r)) - MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(gameplan_state, leprechn_video_command_w)) + MCFG_VIA6522_READPB_HANDLER(READ8(*this, gameplan_state, leprechn_videoram_r)) + MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, gameplan_state, leprechn_video_command_w)) MACHINE_CONFIG_END |