diff options
Diffstat (limited to 'src/mame/drivers/raiden2.cpp')
-rw-r--r-- | src/mame/drivers/raiden2.cpp | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/src/mame/drivers/raiden2.cpp b/src/mame/drivers/raiden2.cpp index 9a62484b225..9b767ec933c 100644 --- a/src/mame/drivers/raiden2.cpp +++ b/src/mame/drivers/raiden2.cpp @@ -1433,14 +1433,14 @@ GFXDECODE_END MACHINE_CONFIG_START(raiden2_state::raiden2) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", V30,XTAL(32'000'000)/2) /* verified on pcb */ - MCFG_CPU_PROGRAM_MAP(raiden2_mem) - MCFG_CPU_VBLANK_INT_DRIVER("screen", raiden2_state, raiden2_interrupt) + MCFG_DEVICE_ADD("maincpu", V30,XTAL(32'000'000)/2) /* verified on pcb */ + MCFG_DEVICE_PROGRAM_MAP(raiden2_mem) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", raiden2_state, raiden2_interrupt) MCFG_MACHINE_RESET_OVERRIDE(raiden2_state,raiden2) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'636'363)/8) - MCFG_CPU_PROGRAM_MAP(raiden2_sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(28'636'363)/8) + MCFG_DEVICE_PROGRAM_MAP(raiden2_sound_map) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1453,11 +1453,11 @@ MACHINE_CONFIG_START(raiden2_state::raiden2) //MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) 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)) MCFG_DEVICE_ADD("raiden2cop", RAIDEN2COP, 0) - MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(raiden2_state, m_videoram_private_w)) + MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(*this, raiden2_state, m_videoram_private_w)) MCFG_VIDEO_START_OVERRIDE(raiden2_state,raiden2) @@ -1465,7 +1465,7 @@ MACHINE_CONFIG_START(raiden2_state::raiden2) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_YM2151_ADD("ymsnd", XTAL(28'636'363)/8) - MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) + MCFG_YM2151_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) MCFG_SOUND_ROUTE(0, "mono", 0.50) MCFG_SOUND_ROUTE(1, "mono", 0.50) @@ -1478,14 +1478,14 @@ MACHINE_CONFIG_START(raiden2_state::raiden2) 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", ym2151_device, read)) - MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym2151_device, write)) + MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym2151_device, read)) + MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym2151_device, write)) MACHINE_CONFIG_END MACHINE_CONFIG_START(raiden2_state::xsedae) raiden2(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(xsedae_mem) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(xsedae_mem) MCFG_MACHINE_RESET_OVERRIDE(raiden2_state,xsedae) @@ -1496,8 +1496,8 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(raiden2_state::raidendx) raiden2(config); - MCFG_CPU_MODIFY("maincpu") - MCFG_CPU_PROGRAM_MAP(raidendx_mem) + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(raidendx_mem) MCFG_MACHINE_RESET_OVERRIDE(raiden2_state,raidendx) MACHINE_CONFIG_END @@ -1506,14 +1506,14 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(raiden2_state::zeroteam) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", V30,XTAL(32'000'000)/2) /* verified on pcb */ - MCFG_CPU_PROGRAM_MAP(zeroteam_mem) - MCFG_CPU_VBLANK_INT_DRIVER("screen", raiden2_state, raiden2_interrupt) + MCFG_DEVICE_ADD("maincpu", V30,XTAL(32'000'000)/2) /* verified on pcb */ + MCFG_DEVICE_PROGRAM_MAP(zeroteam_mem) + MCFG_DEVICE_VBLANK_INT_DRIVER("screen", raiden2_state, raiden2_interrupt) MCFG_MACHINE_RESET_OVERRIDE(raiden2_state,zeroteam) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'636'363)/8) - MCFG_CPU_PROGRAM_MAP(zeroteam_sound_map) + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(28'636'363)/8) + MCFG_DEVICE_PROGRAM_MAP(zeroteam_sound_map) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -1527,19 +1527,19 @@ MACHINE_CONFIG_START(raiden2_state::zeroteam) //MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) 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)) MCFG_DEVICE_ADD("raiden2cop", RAIDEN2COP, 0) - MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(raiden2_state, m_videoram_private_w)) + MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(*this, raiden2_state, m_videoram_private_w)) MCFG_VIDEO_START_OVERRIDE(raiden2_state,raiden2) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(28'636'363)/8) - MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) + MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(28'636'363)/8) + 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) @@ -1548,8 +1548,8 @@ MACHINE_CONFIG_START(raiden2_state::zeroteam) 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 /* ROM LOADING */ |