diff options
Diffstat (limited to 'src/mame/drivers/fuukifg3.c')
-rw-r--r-- | src/mame/drivers/fuukifg3.c | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/src/mame/drivers/fuukifg3.c b/src/mame/drivers/fuukifg3.c index 1327ed3f6ef..b8f61914ab7 100644 --- a/src/mame/drivers/fuukifg3.c +++ b/src/mame/drivers/fuukifg3.c @@ -547,31 +547,29 @@ static TIMER_CALLBACK( raster_interrupt_callback ) } -static MACHINE_START( fuuki32 ) +void fuuki32_state::machine_start() { - fuuki32_state *state = machine.driver_data<fuuki32_state>(); - UINT8 *ROM = state->memregion("soundcpu")->base(); + UINT8 *ROM = memregion("soundcpu")->base(); - state->membank("bank1")->configure_entries(0, 0x10, &ROM[0x10000], 0x8000); + membank("bank1")->configure_entries(0, 0x10, &ROM[0x10000], 0x8000); - state->m_maincpu = machine.device<cpu_device>("maincpu"); - state->m_audiocpu = machine.device<cpu_device>("soundcpu"); + m_maincpu = machine().device<cpu_device>("maincpu"); + m_audiocpu = machine().device<cpu_device>("soundcpu"); - state->m_raster_interrupt_timer = machine.scheduler().timer_alloc(FUNC(raster_interrupt_callback)); + m_raster_interrupt_timer = machine().scheduler().timer_alloc(FUNC(raster_interrupt_callback)); - state->save_item(NAME(state->m_spr_buffered_tilebank)); - state->save_item(NAME(state->m_shared_ram)); + save_item(NAME(m_spr_buffered_tilebank)); + save_item(NAME(m_shared_ram)); } -static MACHINE_RESET( fuuki32 ) +void fuuki32_state::machine_reset() { - fuuki32_state *state = machine.driver_data<fuuki32_state>(); - const rectangle &visarea = machine.primary_screen->visible_area(); + const rectangle &visarea = machine().primary_screen->visible_area(); - machine.scheduler().timer_set(machine.primary_screen->time_until_pos(248), FUNC(level_1_interrupt_callback)); - machine.scheduler().timer_set(machine.primary_screen->time_until_vblank_start(), FUNC(vblank_interrupt_callback)); - state->m_raster_interrupt_timer->adjust(machine.primary_screen->time_until_pos(0, visarea.max_x + 1)); + machine().scheduler().timer_set(machine().primary_screen->time_until_pos(248), FUNC(level_1_interrupt_callback)); + machine().scheduler().timer_set(machine().primary_screen->time_until_vblank_start(), FUNC(vblank_interrupt_callback)); + m_raster_interrupt_timer->adjust(machine().primary_screen->time_until_pos(0, visarea.max_x + 1)); } @@ -601,8 +599,6 @@ static MACHINE_CONFIG_START( fuuki32, fuuki32_state ) MCFG_CPU_PROGRAM_MAP(fuuki32_sound_map) MCFG_CPU_IO_MAP(fuuki32_sound_io_map) - MCFG_MACHINE_START(fuuki32) - MCFG_MACHINE_RESET(fuuki32) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) @@ -615,7 +611,6 @@ static MACHINE_CONFIG_START( fuuki32, fuuki32_state ) MCFG_GFXDECODE(fuuki32) MCFG_PALETTE_LENGTH(0x4000/2) - MCFG_VIDEO_START(fuuki32) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") |