Remaining regressions.

This commit is contained in:
Aaron Giles 2010-09-04 19:15:28 +00:00
parent c97d6bcfe0
commit 53b7d019e2
4 changed files with 16 additions and 25 deletions

View File

@ -423,6 +423,7 @@ static TIMER_DEVICE_CALLBACK( multijump_timer )
static WRITE_LINE_DEVICE_HANDLER( ctc_interrupt ) static WRITE_LINE_DEVICE_HANDLER( ctc_interrupt )
{ {
laserdisc_state *ld = ldcore_get_safe_token(device->owner()); laserdisc_state *ld = ldcore_get_safe_token(device->owner());
if (ld->player->cpu != NULL)
cpu_set_input_line(ld->player->cpu, 0, state ? ASSERT_LINE : CLEAR_LINE); cpu_set_input_line(ld->player->cpu, 0, state ? ASSERT_LINE : CLEAR_LINE);
} }

View File

@ -27,16 +27,18 @@ class deco156_state : public driver_device
public: public:
deco156_state(running_machine &machine, const driver_device_config_base &config) deco156_state(running_machine &machine, const driver_device_config_base &config)
: driver_device(machine, config), : driver_device(machine, config),
oki2(machine.device<okim6295_device>("oki2")) { } maincpu(*this, "maincpu"),
deco16ic(*this, "deco_custom"),
oki2(*this, "oki2") { }
/* memory pointers */ /* memory pointers */
UINT16 * pf1_rowscroll; UINT16 * pf1_rowscroll;
UINT16 * pf2_rowscroll; UINT16 * pf2_rowscroll;
/* devices */ /* devices */
cpu_device *maincpu; required_device<arm_device> maincpu;
deco16ic_device *deco16ic; required_device<deco16ic_device> deco16ic;
okim6295_device *oki2; optional_device<okim6295_device> oki2;
}; };
@ -399,14 +401,6 @@ static const deco16ic_interface deco156_deco16ic_intf =
NULL NULL
}; };
static MACHINE_START( deco156 )
{
deco156_state *state = machine->driver_data<deco156_state>();
state->maincpu = machine->device<cpu_device>("maincpu");
state->deco16ic = machine->device<deco16ic_device>("deco_custom");
}
static MACHINE_CONFIG_START( hvysmsh, deco156_state ) static MACHINE_CONFIG_START( hvysmsh, deco156_state )
/* basic machine hardware */ /* basic machine hardware */
@ -416,8 +410,6 @@ static MACHINE_CONFIG_START( hvysmsh, deco156_state )
MDRV_EEPROM_93C46_ADD("eeprom") MDRV_EEPROM_93C46_ADD("eeprom")
MDRV_MACHINE_START(deco156)
/* video hardware */ /* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM ) MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM )
@ -457,8 +449,6 @@ static MACHINE_CONFIG_START( wcvol95, deco156_state )
MDRV_EEPROM_93C46_ADD("eeprom") MDRV_EEPROM_93C46_ADD("eeprom")
MDRV_MACHINE_START(deco156)
/* video hardware */ /* video hardware */
MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM ) MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM )

View File

@ -22,10 +22,10 @@ class mosaicf2_state : public driver_device
public: public:
mosaicf2_state(running_machine &machine, const driver_device_config_base &config) mosaicf2_state(running_machine &machine, const driver_device_config_base &config)
: driver_device(machine, config), : driver_device(machine, config),
maincpu(machine.device<cpu_device>("maincpu")) { } maincpu(*this, "maincpu") { }
/* memory pointers */ /* memory pointers */
cpu_device * maincpu; required_device<e132xn_device> maincpu;
UINT32 * videoram; UINT32 * videoram;
}; };

View File

@ -130,9 +130,9 @@ class gstream_state : public driver_device
public: public:
gstream_state(running_machine &machine, const driver_device_config_base &config) gstream_state(running_machine &machine, const driver_device_config_base &config)
: driver_device(machine, config), : driver_device(machine, config),
maincpu(machine.device<cpu_device>("maincpu")), maincpu(*this, "maincpu"),
oki_1(machine.device<okim6295_device>("oki1")), oki_1(*this, "oki1"),
oki_2(machine.device<okim6295_device>("oki2")) { } oki_2(*this, "oki2") { }
/* memory pointers */ /* memory pointers */
UINT32 * vram; UINT32 * vram;
@ -149,9 +149,9 @@ public:
int oki_bank_0, oki_bank_1; int oki_bank_0, oki_bank_1;
/* devices */ /* devices */
cpu_device *maincpu; required_device<e132xt_device> maincpu;
okim6295_device *oki_1; required_device<okim6295_device> oki_1;
okim6295_device *oki_2; required_device<okim6295_device> oki_2;
}; };