diff options
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 |
commit | 166638ce8093e04884166296469bda82882890fd (patch) | |
tree | 6dedcf3bde5d05843695efaf4949ab285d3193f1 /src/mame/drivers/gberet.cpp | |
parent | 8e796a2075415427491a541b75884aea6e21f6a9 (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/gberet.cpp')
-rw-r--r-- | src/mame/drivers/gberet.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mame/drivers/gberet.cpp b/src/mame/drivers/gberet.cpp index 71fd1109d30..e1fe2860c34 100644 --- a/src/mame/drivers/gberet.cpp +++ b/src/mame/drivers/gberet.cpp @@ -394,14 +394,14 @@ GFXDECODE_END * *************************************/ -void gberet_state::machine_start_gberet() +MACHINE_START_MEMBER(gberet_state,gberet) { save_item(NAME(m_interrupt_mask)); save_item(NAME(m_interrupt_ticks)); save_item(NAME(m_spritebank)); } -void gberet_state::machine_reset_gberet() +MACHINE_RESET_MEMBER(gberet_state,gberet) { m_interrupt_mask = 0; m_interrupt_ticks = 0; @@ -416,8 +416,8 @@ MACHINE_CONFIG_START(gberet_state::gberet) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", gberet_state, gberet_interrupt_tick, "screen", 0, 16) MCFG_WATCHDOG_ADD("watchdog") - set_machine_start_cb(config, driver_callback_delegate(&machine_start_gberet, this)); - set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_gberet, this)); + MCFG_MACHINE_START_OVERRIDE(gberet_state,gberet) + MCFG_MACHINE_RESET_OVERRIDE(gberet_state,gberet) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -432,7 +432,7 @@ MACHINE_CONFIG_START(gberet_state::gberet) MCFG_PALETTE_ADD("palette", 2*16*16) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(gberet_state,gberet) - set_video_start_cb(config, driver_callback_delegate(&video_start_gberet, this)); + MCFG_VIDEO_START_OVERRIDE(gberet_state,gberet) /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -457,8 +457,8 @@ MACHINE_CONFIG_START(gberet_state::gberetb) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gberet_state, irq0_line_assert) MCFG_DEVICE_PERIODIC_INT_DRIVER(gberet_state, nmi_line_assert, XTAL(20'000'000)/0x8000) // divider guessed - set_machine_start_cb(config, driver_callback_delegate(&machine_start_gberet, this)); - set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_gberet, this)); + MCFG_MACHINE_START_OVERRIDE(gberet_state,gberet) + MCFG_MACHINE_RESET_OVERRIDE(gberet_state,gberet) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -473,7 +473,7 @@ MACHINE_CONFIG_START(gberet_state::gberetb) MCFG_PALETTE_ADD("palette", 2*16*16) MCFG_PALETTE_INDIRECT_ENTRIES(32) MCFG_PALETTE_INIT_OWNER(gberet_state,gberet) - set_video_start_cb(config, driver_callback_delegate(&video_start_gberet, this)); + MCFG_VIDEO_START_OVERRIDE(gberet_state,gberet) /* sound hardware */ SPEAKER(config, "mono").front_center(); |