summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/raiden2.cpp
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2018-05-16 21:56:39 +1000
committer Vas Crabb <vas@vastheman.com>2018-05-16 21:56:39 +1000
commit166638ce8093e04884166296469bda82882890fd (patch)
tree6dedcf3bde5d05843695efaf4949ab285d3193f1 /src/mame/drivers/raiden2.cpp
parent8e796a2075415427491a541b75884aea6e21f6a9 (diff)
Revert "- Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much"
This reverts commit c83e2a853d4e1643fcc85b68ada3c6f7f33adea4. Revert "fix compile. (nw)" This reverts commit a259ba3e366f442a22a9341755ff58163869860c. GCC is being bad and allowing invalid C++ that other compilers reject.
Diffstat (limited to 'src/mame/drivers/raiden2.cpp')
-rw-r--r--src/mame/drivers/raiden2.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/mame/drivers/raiden2.cpp b/src/mame/drivers/raiden2.cpp
index 3a1d0c0b7a7..c1d61acb00b 100644
--- a/src/mame/drivers/raiden2.cpp
+++ b/src/mame/drivers/raiden2.cpp
@@ -522,7 +522,7 @@ TILE_GET_INFO_MEMBER(raiden2_state::get_text_tile_info)
/* VIDEO START (move to video file) */
-void raiden2_state::video_start_raiden2()
+VIDEO_START_MEMBER(raiden2_state,raiden2)
{
back_data = make_unique_clear<uint16_t[]>(0x800/2);
fore_data = make_unique_clear<uint16_t[]>(0x800/2);
@@ -743,7 +743,7 @@ void raiden2_state::common_reset()
tx_bank = 0;
}
-void raiden2_state::machine_reset_raiden2()
+MACHINE_RESET_MEMBER(raiden2_state,raiden2)
{
common_reset();
sprcpt_init();
@@ -755,7 +755,7 @@ void raiden2_state::machine_reset_raiden2()
//cop_init();
}
-void raiden2_state::machine_reset_raidendx()
+MACHINE_RESET_MEMBER(raiden2_state,raidendx)
{
common_reset();
sprcpt_init();
@@ -768,7 +768,7 @@ void raiden2_state::machine_reset_raidendx()
//cop_init();
}
-void raiden2_state::machine_reset_zeroteam()
+MACHINE_RESET_MEMBER(raiden2_state,zeroteam)
{
bg_bank = 0;
fg_bank = 2;
@@ -783,7 +783,7 @@ void raiden2_state::machine_reset_zeroteam()
//cop_init();
}
-void raiden2_state::machine_reset_xsedae()
+MACHINE_RESET_MEMBER(raiden2_state,xsedae)
{
bg_bank = 0;
fg_bank = 2;
@@ -1437,7 +1437,7 @@ MACHINE_CONFIG_START(raiden2_state::raiden2)
MCFG_DEVICE_PROGRAM_MAP(raiden2_mem)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", raiden2_state, raiden2_interrupt)
- set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_raiden2, this));
+ MCFG_MACHINE_RESET_OVERRIDE(raiden2_state,raiden2)
MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(28'636'363)/8)
MCFG_DEVICE_PROGRAM_MAP(raiden2_sound_map)
@@ -1459,7 +1459,7 @@ MACHINE_CONFIG_START(raiden2_state::raiden2)
MCFG_DEVICE_ADD("raiden2cop", RAIDEN2COP, 0)
MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(*this, raiden2_state, m_videoram_private_w))
- set_video_start_cb(config, driver_callback_delegate(&video_start_raiden2, this));
+ MCFG_VIDEO_START_OVERRIDE(raiden2_state,raiden2)
/* sound hardware */
SPEAKER(config, "mono").front_center();
@@ -1487,7 +1487,7 @@ MACHINE_CONFIG_START(raiden2_state::xsedae)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_PROGRAM_MAP(xsedae_mem)
- set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_xsedae, this));
+ MCFG_MACHINE_RESET_OVERRIDE(raiden2_state,xsedae)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
@@ -1499,7 +1499,7 @@ MACHINE_CONFIG_START(raiden2_state::raidendx)
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_PROGRAM_MAP(raidendx_mem)
- set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_raidendx, this));
+ MCFG_MACHINE_RESET_OVERRIDE(raiden2_state,raidendx)
MACHINE_CONFIG_END
@@ -1510,7 +1510,7 @@ MACHINE_CONFIG_START(raiden2_state::zeroteam)
MCFG_DEVICE_PROGRAM_MAP(zeroteam_mem)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", raiden2_state, raiden2_interrupt)
- set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_zeroteam, this));
+ MCFG_MACHINE_RESET_OVERRIDE(raiden2_state,zeroteam)
MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(28'636'363)/8)
MCFG_DEVICE_PROGRAM_MAP(zeroteam_sound_map)
@@ -1533,7 +1533,7 @@ MACHINE_CONFIG_START(raiden2_state::zeroteam)
MCFG_DEVICE_ADD("raiden2cop", RAIDEN2COP, 0)
MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(*this, raiden2_state, m_videoram_private_w))
- set_video_start_cb(config, driver_callback_delegate(&video_start_raiden2, this));
+ MCFG_VIDEO_START_OVERRIDE(raiden2_state,raiden2)
/* sound hardware */
SPEAKER(config, "mono").front_center();