summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/jack.c
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2012-09-13 11:15:32 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2012-09-13 11:15:32 +0000
commit219e664785890f52079bae7e74543920d638796a (patch)
tree774d1ab1e7d87ae4d2c1ef335dcef24a28a7d7e8 /src/mame/drivers/jack.c
parentaf9a5e817d3eefdda79e801056b29167ecbcdef9 (diff)
Massive change, MACHINE_START\RESET, VIDEO_START\RESET and PALETTE_INIT changed to be members of state classes (no whatsnew)
Diffstat (limited to 'src/mame/drivers/jack.c')
-rw-r--r--src/mame/drivers/jack.c35
1 files changed, 15 insertions, 20 deletions
diff --git a/src/mame/drivers/jack.c b/src/mame/drivers/jack.c
index f9edc0f3f55..cb8f12a2fa0 100644
--- a/src/mame/drivers/jack.c
+++ b/src/mame/drivers/jack.c
@@ -785,29 +785,27 @@ static const ay8910_interface ay8910_config =
*
*************************************/
-static MACHINE_START( jack )
+void jack_state::machine_start()
{
- jack_state *state = machine.driver_data<jack_state>();
- state->m_audiocpu = machine.device<cpu_device>("audiocpu");
+ m_audiocpu = machine().device<cpu_device>("audiocpu");
- state->save_item(NAME(state->m_joinem_snd_bit));
- state->save_item(NAME(state->m_question_address));
- state->save_item(NAME(state->m_question_rom));
- state->save_item(NAME(state->m_remap_address));
+ save_item(NAME(m_joinem_snd_bit));
+ save_item(NAME(m_question_address));
+ save_item(NAME(m_question_rom));
+ save_item(NAME(m_remap_address));
}
-static MACHINE_RESET( jack )
+void jack_state::machine_reset()
{
- jack_state *state = machine.driver_data<jack_state>();
int i;
- state->m_joinem_snd_bit = 0;
- state->m_question_address = 0;
- state->m_question_rom = 0;
+ m_joinem_snd_bit = 0;
+ m_question_address = 0;
+ m_question_rom = 0;
for (i = 0; i < 16; i++)
- state->m_remap_address[i] = 0;
+ m_remap_address[i] = 0;
}
static MACHINE_CONFIG_START( jack, jack_state )
@@ -821,8 +819,6 @@ static MACHINE_CONFIG_START( jack, jack_state )
MCFG_CPU_PROGRAM_MAP(sound_map)
MCFG_CPU_IO_MAP(sound_io_map)
- MCFG_MACHINE_START(jack)
- MCFG_MACHINE_RESET(jack)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -835,7 +831,6 @@ static MACHINE_CONFIG_START( jack, jack_state )
MCFG_GFXDECODE(jack)
MCFG_PALETTE_LENGTH(32)
- MCFG_VIDEO_START(jack)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -874,8 +869,8 @@ static MACHINE_CONFIG_DERIVED( joinem, jack )
MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_STATIC(joinem)
- MCFG_PALETTE_INIT(joinem)
- MCFG_VIDEO_START(joinem)
+ MCFG_PALETTE_INIT_OVERRIDE(jack_state,joinem)
+ MCFG_VIDEO_START_OVERRIDE(jack_state,joinem)
MACHINE_CONFIG_END
@@ -893,8 +888,8 @@ static MACHINE_CONFIG_DERIVED( loverboy, jack )
MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_STATIC(joinem)
- MCFG_PALETTE_INIT(joinem)
- MCFG_VIDEO_START(joinem)
+ MCFG_PALETTE_INIT_OVERRIDE(jack_state,joinem)
+ MCFG_VIDEO_START_OVERRIDE(jack_state,joinem)
MACHINE_CONFIG_END
/*************************************