diff options
Diffstat (limited to 'src/mame/drivers/r2dx_v33.cpp')
-rw-r--r-- | src/mame/drivers/r2dx_v33.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/mame/drivers/r2dx_v33.cpp b/src/mame/drivers/r2dx_v33.cpp index 4e3078ea822..3203cc7a6a9 100644 --- a/src/mame/drivers/r2dx_v33.cpp +++ b/src/mame/drivers/r2dx_v33.cpp @@ -787,9 +787,9 @@ void r2dx_v33_state::r2dx_oki_map(address_map &map) MACHINE_CONFIG_START(r2dx_v33_state::rdx_v33) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", V33, 32000000/2 ) // ? - MCFG_CPU_PROGRAM_MAP(rdx_v33_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", r2dx_v33_state, rdx_v33_interrupt) + MCFG_DEVICE_ADD("maincpu", V33, 32000000/2 ) // ? + MCFG_DEVICE_PROGRAM_MAP(rdx_v33_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", r2dx_v33_state, rdx_v33_interrupt) MCFG_MACHINE_RESET_OVERRIDE(r2dx_v33_state,r2dx_v33) @@ -810,8 +810,8 @@ MACHINE_CONFIG_START(r2dx_v33_state::rdx_v33) MCFG_VIDEO_START_OVERRIDE(raiden2_state,raiden2) MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0) - MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(raiden2_state, tilemap_enable_w)) - MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(raiden2_state, tile_scroll_w)) + MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, raiden2_state, tilemap_enable_w)) + MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, raiden2_state, tile_scroll_w)) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -824,14 +824,14 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(r2dx_v33_state::nzerotea) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", V33,XTAL(32'000'000)/2) /* verified on pcb */ - MCFG_CPU_PROGRAM_MAP(nzerotea_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", r2dx_v33_state, rdx_v33_interrupt) + MCFG_DEVICE_ADD("maincpu", V33,XTAL(32'000'000)/2) /* verified on pcb */ + MCFG_DEVICE_PROGRAM_MAP(nzerotea_map) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", r2dx_v33_state, rdx_v33_interrupt) MCFG_MACHINE_RESET_OVERRIDE(r2dx_v33_state,nzeroteam) - MCFG_CPU_ADD("audiocpu", Z80, 14318180/4) - MCFG_CPU_PROGRAM_MAP(zeroteam_sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, 14318180/4) + MCFG_DEVICE_PROGRAM_MAP(zeroteam_sound_map) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK) @@ -848,14 +848,14 @@ MACHINE_CONFIG_START(r2dx_v33_state::nzerotea) MCFG_VIDEO_START_OVERRIDE(raiden2_state,raiden2) MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0) - MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(raiden2_state, tilemap_enable_w)) - MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(raiden2_state, tile_scroll_w)) + MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, raiden2_state, tilemap_enable_w)) + MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, raiden2_state, tile_scroll_w)) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM3812, 14318180/4) - MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) + MCFG_DEVICE_ADD("ymsnd", YM3812, 14318180/4) + MCFG_YM3812_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_OKIM6295_ADD("oki", 1320000, PIN7_LOW) @@ -864,14 +864,14 @@ MACHINE_CONFIG_START(r2dx_v33_state::nzerotea) MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) MCFG_SEIBU_SOUND_CPU("audiocpu") MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1") - MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read)) - MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write)) + MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym3812_device, read)) + MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym3812_device, write)) MACHINE_CONFIG_END MACHINE_CONFIG_START(r2dx_v33_state::zerotm2k) nzerotea(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(zerotm2k_map) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(zerotm2k_map) MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") MACHINE_CONFIG_END |