diff --git a/src/mame/drivers/nbmj8991.c b/src/mame/drivers/nbmj8991.c index 3f1c7a0458b..fcc462ceab9 100644 --- a/src/mame/drivers/nbmj8991.c +++ b/src/mame/drivers/nbmj8991.c @@ -57,7 +57,7 @@ READ8_MEMBER(nbmj8991_state::nbmj8991_sound_r) return data; } -MACHINE_RESET_MEMBER(nbmj8991_state,nbmj8991) +void nbmj8991_state::machine_reset() { device_t *audiocpu = machine().device("audiocpu"); if (audiocpu != NULL && audiocpu->type() == Z80) @@ -65,7 +65,7 @@ MACHINE_RESET_MEMBER(nbmj8991_state,nbmj8991) machine().root_device().membank("bank1")->configure_entries(0, 4, machine().root_device().memregion("audiocpu")->base() + 0x8000, 0x8000); machine().root_device().membank("bank1")->set_entry(0); } - nbmj8991_state::machine_reset(); + MACHINE_RESET_CALL_LEGACY(nb1413m3); } DRIVER_INIT_MEMBER(nbmj8991_state,pstadium) @@ -1475,8 +1475,6 @@ static MACHINE_CONFIG_START( nbmjdrv1, nbmj8991_state ) // galkoku MCFG_CPU_IO_MAP(galkoku_io_map) MCFG_CPU_VBLANK_INT("screen", nb1413m3_interrupt) - MCFG_MACHINE_RESET_OVERRIDE(nbmj8991_state,nbmj8991) - /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -1487,8 +1485,6 @@ static MACHINE_CONFIG_START( nbmjdrv1, nbmj8991_state ) // galkoku MCFG_PALETTE_LENGTH(256) - MCFG_VIDEO_START_OVERRIDE(nbmj8991_state,nbmj8991) - /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("fmsnd", YM3812, 25000000/10) @@ -1512,8 +1508,6 @@ static MACHINE_CONFIG_START( nbmjdrv2, nbmj8991_state ) // pstadium MCFG_CPU_IO_MAP(nbmj8991_sound_io_map) MCFG_CPU_PERIODIC_INT(irq0_line_hold, 128*60) // ? - MCFG_MACHINE_RESET_OVERRIDE(nbmj8991_state,nbmj8991) - /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -1524,8 +1518,6 @@ static MACHINE_CONFIG_START( nbmjdrv2, nbmj8991_state ) // pstadium MCFG_PALETTE_LENGTH(256) - MCFG_VIDEO_START_OVERRIDE(nbmj8991_state,nbmj8991) - /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/includes/nbmj8991.h b/src/mame/includes/nbmj8991.h index fc9d05340c4..60e430ae221 100644 --- a/src/mame/includes/nbmj8991.h +++ b/src/mame/includes/nbmj8991.h @@ -49,8 +49,8 @@ public: DECLARE_DRIVER_INIT(mcontest); DECLARE_DRIVER_INIT(finalbny); DECLARE_DRIVER_INIT(qmhayaku); - DECLARE_MACHINE_RESET(nbmj8991); - DECLARE_VIDEO_START(nbmj8991); + virtual void machine_reset(); + virtual void video_start(); }; diff --git a/src/mame/video/nbmj8991.c b/src/mame/video/nbmj8991.c index 8b9c7febfa8..190c65d0d64 100644 --- a/src/mame/video/nbmj8991.c +++ b/src/mame/video/nbmj8991.c @@ -287,7 +287,7 @@ static void nbmj8991_gfxdraw(running_machine &machine) ******************************************************************************/ -VIDEO_START_MEMBER(nbmj8991_state,nbmj8991) +void nbmj8991_state::video_start() { int width = machine().primary_screen->width(); int height = machine().primary_screen->height();