diff options
Diffstat (limited to 'src/mame/drivers/equites.c')
-rw-r--r-- | src/mame/drivers/equites.c | 108 |
1 files changed, 53 insertions, 55 deletions
diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c index 7820336fdd4..78ceaf7815b 100644 --- a/src/mame/drivers/equites.c +++ b/src/mame/drivers/equites.c @@ -1188,62 +1188,60 @@ MACHINE_CONFIG_END /******************************************************************************/ -static MACHINE_START( equites ) +MACHINE_START_MEMBER(equites_state,equites) { - equites_state *state = machine.driver_data<equites_state>(); - state->m_mcu = machine.device("mcu"); - state->m_audio_cpu = machine.device("audiocpu"); - state->m_msm = machine.device<msm5232_device>("msm"); - state->m_dac_1 = machine.device<dac_device>("dac1"); - state->m_dac_2 = machine.device<dac_device>("dac2"); - - state->save_item(NAME(state->m_fg_char_bank)); - state->save_item(NAME(state->m_bgcolor)); - state->save_item(NAME(state->m_splndrbt_bg_scrollx)); - state->save_item(NAME(state->m_splndrbt_bg_scrolly)); - state->save_item(NAME(state->m_sound_prom_address)); - state->save_item(NAME(state->m_dac_latch)); - state->save_item(NAME(state->m_eq8155_port_b)); - state->save_item(NAME(state->m_eq8155_port_a)); - state->save_item(NAME(state->m_eq8155_port_c)); - state->save_item(NAME(state->m_ay_port_a)); - state->save_item(NAME(state->m_ay_port_b)); - state->save_item(NAME(state->m_eq_cymbal_ctrl)); - state->save_item(NAME(state->m_cymvol)); - state->save_item(NAME(state->m_hihatvol)); - state->save_item(NAME(state->m_timer_count)); - state->save_item(NAME(state->m_unknown_bit)); + m_mcu = machine().device("mcu"); + m_audio_cpu = machine().device("audiocpu"); + m_msm = machine().device<msm5232_device>("msm"); + m_dac_1 = machine().device<dac_device>("dac1"); + m_dac_2 = machine().device<dac_device>("dac2"); + + save_item(NAME(m_fg_char_bank)); + save_item(NAME(m_bgcolor)); + save_item(NAME(m_splndrbt_bg_scrollx)); + save_item(NAME(m_splndrbt_bg_scrolly)); + save_item(NAME(m_sound_prom_address)); + save_item(NAME(m_dac_latch)); + save_item(NAME(m_eq8155_port_b)); + save_item(NAME(m_eq8155_port_a)); + save_item(NAME(m_eq8155_port_c)); + save_item(NAME(m_ay_port_a)); + save_item(NAME(m_ay_port_b)); + save_item(NAME(m_eq_cymbal_ctrl)); + save_item(NAME(m_cymvol)); + save_item(NAME(m_hihatvol)); + save_item(NAME(m_timer_count)); + save_item(NAME(m_unknown_bit)); #if POPDRUMKIT - state->save_item(NAME(state->m_hihat)); - state->save_item(NAME(state->m_cymbal)); + save_item(NAME(m_hihat)); + save_item(NAME(m_cymbal)); #endif } -static MACHINE_RESET( equites ) +MACHINE_RESET_MEMBER(equites_state,equites) { - equites_state *state = machine.driver_data<equites_state>(); - state->flip_screen_set(0); - - state->m_fg_char_bank = 0; - state->m_bgcolor = 0; - state->m_splndrbt_bg_scrollx = 0; - state->m_splndrbt_bg_scrolly = 0; - state->m_sound_prom_address = 0; - state->m_dac_latch = 0; - state->m_eq8155_port_b = 0; - state->m_eq8155_port_a = 0; - state->m_eq8155_port_c = 0; - state->m_ay_port_a = 0; - state->m_ay_port_b = 0; - state->m_eq_cymbal_ctrl = 0; - state->m_cymvol = 0.0; - state->m_hihatvol = 0.0; - state->m_timer_count = 0; - state->m_unknown_bit = 0; + flip_screen_set(0); + + m_fg_char_bank = 0; + m_bgcolor = 0; + m_splndrbt_bg_scrollx = 0; + m_splndrbt_bg_scrolly = 0; + m_sound_prom_address = 0; + m_dac_latch = 0; + m_eq8155_port_b = 0; + m_eq8155_port_a = 0; + m_eq8155_port_c = 0; + m_ay_port_a = 0; + m_ay_port_b = 0; + m_eq_cymbal_ctrl = 0; + m_cymvol = 0.0; + m_hihatvol = 0.0; + m_timer_count = 0; + m_unknown_bit = 0; #if POPDRUMKIT - state->m_hihat = state->m_cymbal = 0; + m_hihat = m_cymbal = 0; #endif } @@ -1269,11 +1267,11 @@ static MACHINE_CONFIG_START( equites, equites_state ) MCFG_GFXDECODE(equites) MCFG_PALETTE_LENGTH(0x180) - MCFG_PALETTE_INIT(equites) - MCFG_VIDEO_START(equites) + MCFG_PALETTE_INIT_OVERRIDE(equites_state,equites) + MCFG_VIDEO_START_OVERRIDE(equites_state,equites) - MCFG_MACHINE_START(equites) - MCFG_MACHINE_RESET(equites) + MCFG_MACHINE_START_OVERRIDE(equites_state,equites) + MCFG_MACHINE_RESET_OVERRIDE(equites_state,equites) MACHINE_CONFIG_END @@ -1306,11 +1304,11 @@ static MACHINE_CONFIG_START( splndrbt, equites_state ) MCFG_GFXDECODE(splndrbt) MCFG_PALETTE_LENGTH(0x280) - MCFG_PALETTE_INIT(splndrbt) - MCFG_VIDEO_START(splndrbt) + MCFG_PALETTE_INIT_OVERRIDE(equites_state,splndrbt) + MCFG_VIDEO_START_OVERRIDE(equites_state,splndrbt) - MCFG_MACHINE_START(equites) - MCFG_MACHINE_RESET(equites) + MCFG_MACHINE_START_OVERRIDE(equites_state,equites) + MCFG_MACHINE_RESET_OVERRIDE(equites_state,equites) MACHINE_CONFIG_END |