summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/dlair.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/dlair.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/dlair.c')
-rw-r--r--src/mame/drivers/dlair.c30
1 files changed, 16 insertions, 14 deletions
diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c
index bce5a08f913..f9a0200d99f 100644
--- a/src/mame/drivers/dlair.c
+++ b/src/mame/drivers/dlair.c
@@ -110,6 +110,9 @@ public:
DECLARE_CUSTOM_INPUT_MEMBER(laserdisc_command_r);
DECLARE_DRIVER_INIT(fixed);
DECLARE_DRIVER_INIT(variable);
+ DECLARE_MACHINE_START(dlair);
+ DECLARE_MACHINE_RESET(dlair);
+ DECLARE_PALETTE_INIT(dleuro);
};
@@ -204,14 +207,14 @@ static const z80_daisy_config dleuro_daisy_chain[] =
*
*************************************/
-static PALETTE_INIT( dleuro )
+PALETTE_INIT_MEMBER(dlair_state,dleuro)
{
int i;
for (i = 0; i < 8; i++)
{
- palette_set_color(machine, 2 * i + 0, MAKE_RGB(0, 0, 0));
- palette_set_color_rgb(machine, 2 * i + 1, pal1bit(i >> 0), pal1bit(i >> 1), pal1bit(i >> 2));
+ palette_set_color(machine(), 2 * i + 0, MAKE_RGB(0, 0, 0));
+ palette_set_color_rgb(machine(), 2 * i + 1, pal1bit(i >> 0), pal1bit(i >> 1), pal1bit(i >> 2));
}
}
@@ -248,21 +251,20 @@ static SCREEN_UPDATE_IND16( dleuro )
*
*************************************/
-static MACHINE_START( dlair )
+MACHINE_START_MEMBER(dlair_state,dlair)
{
}
-static MACHINE_RESET( dlair )
+MACHINE_RESET_MEMBER(dlair_state,dlair)
{
#if 0
- dlair_state *state = machine.driver_data<dlair_state>();
/* determine the laserdisc player from the DIP switches */
- if (state->m_laserdisc_type == LASERDISC_TYPE_VARIABLE)
+ if (m_laserdisc_type == LASERDISC_TYPE_VARIABLE)
{
- int newtype = (state->ioport("DSW2")->read() & 0x08) ? LASERDISC_TYPE_PIONEER_LDV1000 : LASERDISC_TYPE_PIONEER_PR7820;
- laserdisc_set_type(state->m_laserdisc, newtype);
+ int newtype = (ioport("DSW2")->read() & 0x08) ? LASERDISC_TYPE_PIONEER_LDV1000 : LASERDISC_TYPE_PIONEER_PR7820;
+ laserdisc_set_type(m_laserdisc, newtype);
}
#endif
}
@@ -724,8 +726,8 @@ static MACHINE_CONFIG_START( dlair_base, dlair_state )
MCFG_CPU_VBLANK_INT("screen", vblank_callback)
MCFG_CPU_PERIODIC_INT(irq0_line_hold, (double)MASTER_CLOCK_US/8/16/16/16/16)
- MCFG_MACHINE_START(dlair)
- MCFG_MACHINE_RESET(dlair)
+ MCFG_MACHINE_START_OVERRIDE(dlair_state,dlair)
+ MCFG_MACHINE_RESET_OVERRIDE(dlair_state,dlair)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@@ -766,8 +768,8 @@ static MACHINE_CONFIG_START( dleuro, dlair_state )
MCFG_WATCHDOG_TIME_INIT(attotime::from_hz(MASTER_CLOCK_EURO/(16*16*16*16*16*8)))
- MCFG_MACHINE_START(dlair)
- MCFG_MACHINE_RESET(dlair)
+ MCFG_MACHINE_START_OVERRIDE(dlair_state,dlair)
+ MCFG_MACHINE_RESET_OVERRIDE(dlair_state,dlair)
MCFG_LASERDISC_22VP932_ADD("ld_22vp932")
MCFG_LASERDISC_OVERLAY_STATIC(256, 256, dleuro)
@@ -778,7 +780,7 @@ static MACHINE_CONFIG_START( dleuro, dlair_state )
MCFG_GFXDECODE(dlair)
MCFG_PALETTE_LENGTH(16)
- MCFG_PALETTE_INIT(dleuro)
+ MCFG_PALETTE_INIT_OVERRIDE(dlair_state,dleuro)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")