summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/namcofl.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/namcofl.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/namcofl.cpp')
-rw-r--r--src/mame/drivers/namcofl.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mame/drivers/namcofl.cpp b/src/mame/drivers/namcofl.cpp
index 8fc1f906321..285cc731d61 100644
--- a/src/mame/drivers/namcofl.cpp
+++ b/src/mame/drivers/namcofl.cpp
@@ -552,7 +552,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(namcofl_state::mcu_adc_cb)
}
-void namcofl_state::machine_start_namcofl()
+MACHINE_START_MEMBER(namcofl_state,namcofl)
{
m_raster_interrupt_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(namcofl_state::raster_interrupt_callback),this));
m_network_interrupt_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(namcofl_state::network_interrupt_callback),this));
@@ -568,7 +568,7 @@ void namcofl_state::machine_start_namcofl()
}
-void namcofl_state::machine_reset_namcofl()
+MACHINE_RESET_MEMBER(namcofl_state,namcofl)
{
m_network_interrupt_timer->adjust(m_screen->time_until_pos(m_screen->visible_area().max_y + 3));
m_vblank_interrupt_timer->adjust(m_screen->time_until_pos(m_screen->visible_area().max_y + 1));
@@ -592,8 +592,8 @@ MACHINE_CONFIG_START(namcofl_state::namcofl)
MCFG_TIMER_DRIVER_ADD_PERIODIC("mcu_irq2", namcofl_state, mcu_irq2_cb, attotime::from_hz(60))
MCFG_TIMER_DRIVER_ADD_PERIODIC("mcu_adc", namcofl_state, mcu_adc_cb, attotime::from_hz(60))
- set_machine_start_cb(config, driver_callback_delegate(&machine_start_namcofl, this));
- set_machine_reset_cb(config, driver_callback_delegate(&machine_reset_namcofl, this));
+ MCFG_MACHINE_START_OVERRIDE(namcofl_state,namcofl)
+ MCFG_MACHINE_RESET_OVERRIDE(namcofl_state,namcofl)
MCFG_NVRAM_ADD_1FILL("nvram")
MCFG_SCREEN_ADD("screen", RASTER)
@@ -610,7 +610,7 @@ MACHINE_CONFIG_START(namcofl_state::namcofl)
MCFG_DEVICE_ADD("c116", NAMCO_C116, 0)
MCFG_GFX_PALETTE("palette")
- set_video_start_cb(config, driver_callback_delegate(&video_start_namcofl, this));
+ MCFG_VIDEO_START_OVERRIDE(namcofl_state,namcofl)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();