diff options
Diffstat (limited to 'src/mame/drivers/gladiatr.c')
-rw-r--r-- | src/mame/drivers/gladiatr.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c index 5eba32bee0d..a05e5ff1ca8 100644 --- a/src/mame/drivers/gladiatr.c +++ b/src/mame/drivers/gladiatr.c @@ -251,14 +251,14 @@ static const struct TAITO8741interface gladiator_8741interface= {gladiator_dsw1_r,gladiator_dsw2_r,gladiator_button3_r,gladiator_controls_r} /* port handler */ }; -static MACHINE_RESET( gladiator ) +MACHINE_RESET_MEMBER(gladiatr_state,gladiator) { TAITO8741_start(&gladiator_8741interface); /* 6809 bank memory set */ { - UINT8 *rom = machine.root_device().memregion("audiocpu")->base() + 0x10000; - machine.root_device().membank("bank2")->set_base(rom); - machine.device("audiocpu")->reset(); + UINT8 *rom = machine().root_device().memregion("audiocpu")->base() + 0x10000; + machine().root_device().membank("bank2")->set_base(rom); + machine().device("audiocpu")->reset(); } } @@ -364,11 +364,10 @@ READ8_MEMBER(gladiatr_state::qx1_r) return m_flag1; } -static MACHINE_RESET( ppking ) +MACHINE_RESET_MEMBER(gladiatr_state,ppking) { - gladiatr_state *state = machine.driver_data<gladiatr_state>(); - state->m_data1 = state->m_data2 = 0; - state->m_flag1 = state->m_flag2 = 1; + m_data1 = m_data2 = 0; + m_flag1 = m_flag2 = 1; } static ADDRESS_MAP_START( ppking_cpu1_map, AS_PROGRAM, 8, gladiatr_state ) @@ -679,7 +678,7 @@ static MACHINE_CONFIG_START( ppking, gladiatr_state ) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) - MCFG_MACHINE_RESET(ppking) + MCFG_MACHINE_RESET_OVERRIDE(gladiatr_state,ppking) MCFG_NVRAM_ADD_0FILL("nvram") /* video hardware */ @@ -693,7 +692,7 @@ static MACHINE_CONFIG_START( ppking, gladiatr_state ) MCFG_GFXDECODE(ppking) MCFG_PALETTE_LENGTH(1024) - MCFG_VIDEO_START(ppking) + MCFG_VIDEO_START_OVERRIDE(gladiatr_state,ppking) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") @@ -727,7 +726,7 @@ static MACHINE_CONFIG_START( gladiatr, gladiatr_state ) MCFG_QUANTUM_TIME(attotime::from_hz(600)) - MCFG_MACHINE_RESET(gladiator) + MCFG_MACHINE_RESET_OVERRIDE(gladiatr_state,gladiator) MCFG_NVRAM_ADD_0FILL("nvram") /* video hardware */ @@ -741,7 +740,7 @@ static MACHINE_CONFIG_START( gladiatr, gladiatr_state ) MCFG_GFXDECODE(gladiatr) MCFG_PALETTE_LENGTH(1024) - MCFG_VIDEO_START(gladiatr) + MCFG_VIDEO_START_OVERRIDE(gladiatr_state,gladiatr) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") |