summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/kchamp.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/kchamp.c')
-rw-r--r--src/mame/drivers/kchamp.c37
1 files changed, 14 insertions, 23 deletions
diff --git a/src/mame/drivers/kchamp.c b/src/mame/drivers/kchamp.c
index ea018b2093f..347db748c3d 100644
--- a/src/mame/drivers/kchamp.c
+++ b/src/mame/drivers/kchamp.c
@@ -383,33 +383,30 @@ static INTERRUPT_GEN( sound_int )
}
-static MACHINE_START( kchamp )
+MACHINE_START_MEMBER(kchamp_state,kchamp)
{
- kchamp_state *state = machine.driver_data<kchamp_state>();
- state->m_audiocpu = machine.device<cpu_device>("audiocpu");
+ m_audiocpu = machine().device<cpu_device>("audiocpu");
- state->save_item(NAME(state->m_nmi_enable));
- state->save_item(NAME(state->m_sound_nmi_enable));
+ save_item(NAME(m_nmi_enable));
+ save_item(NAME(m_sound_nmi_enable));
}
-static MACHINE_START( kchampvs )
+MACHINE_START_MEMBER(kchamp_state,kchampvs)
{
- kchamp_state *state = machine.driver_data<kchamp_state>();
- MACHINE_START_CALL(kchamp);
+ MACHINE_START_CALL_MEMBER(kchamp);
- state->save_item(NAME(state->m_msm_data));
- state->save_item(NAME(state->m_msm_play_lo_nibble));
- state->save_item(NAME(state->m_counter));
+ save_item(NAME(m_msm_data));
+ save_item(NAME(m_msm_play_lo_nibble));
+ save_item(NAME(m_counter));
}
-static MACHINE_RESET( kchamp )
+void kchamp_state::machine_reset()
{
- kchamp_state *state = machine.driver_data<kchamp_state>();
- state->m_nmi_enable = 0;
- state->m_sound_nmi_enable = 0;
+ m_nmi_enable = 0;
+ m_sound_nmi_enable = 0;
}
static MACHINE_CONFIG_START( kchampvs, kchamp_state )
@@ -425,8 +422,7 @@ static MACHINE_CONFIG_START( kchampvs, kchamp_state )
MCFG_CPU_IO_MAP(kchampvs_sound_io_map) /* irq's triggered from main cpu */
/* nmi's from msm5205 */
- MCFG_MACHINE_START(kchampvs)
- MCFG_MACHINE_RESET(kchamp)
+ MCFG_MACHINE_START_OVERRIDE(kchamp_state,kchampvs)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -439,8 +435,6 @@ static MACHINE_CONFIG_START( kchampvs, kchamp_state )
MCFG_GFXDECODE(kchamp)
MCFG_PALETTE_LENGTH(256)
- MCFG_PALETTE_INIT(kchamp)
- MCFG_VIDEO_START(kchamp)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -475,8 +469,7 @@ static MACHINE_CONFIG_START( kchamp, kchamp_state )
/* irq's triggered from main cpu */
/* nmi's from 125 Hz clock */
- MCFG_MACHINE_START(kchamp)
- MCFG_MACHINE_RESET(kchamp)
+ MCFG_MACHINE_START_OVERRIDE(kchamp_state,kchamp)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -489,8 +482,6 @@ static MACHINE_CONFIG_START( kchamp, kchamp_state )
MCFG_GFXDECODE(kchamp)
MCFG_PALETTE_LENGTH(256)
- MCFG_PALETTE_INIT(kchamp)
- MCFG_VIDEO_START(kchamp)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")