diff options
Diffstat (limited to 'src/mame/drivers/taito_b.c')
-rw-r--r-- | src/mame/drivers/taito_b.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c index e650ceaf039..7fe7a11c92a 100644 --- a/src/mame/drivers/taito_b.c +++ b/src/mame/drivers/taito_b.c @@ -199,137 +199,137 @@ WRITE8_MEMBER(taitob_state::bankswitch_w) static TIMER_CALLBACK( rsaga2_interrupt2 ) { taitob_state *state = machine.driver_data<taitob_state>(); - device_set_input_line(state->m_maincpu, 2, HOLD_LINE); + state->m_maincpu->set_input_line(2, HOLD_LINE); } static INTERRUPT_GEN( rastansaga2_interrupt ) { device->machine().scheduler().timer_set(downcast<cpu_device *>(device)->cycles_to_attotime(5000), FUNC(rsaga2_interrupt2)); - device_set_input_line(device, 4, HOLD_LINE); + device->execute().set_input_line(4, HOLD_LINE); } static TIMER_CALLBACK( crimec_interrupt3 ) { taitob_state *state = machine.driver_data<taitob_state>(); - device_set_input_line(state->m_maincpu, 3, HOLD_LINE); + state->m_maincpu->set_input_line(3, HOLD_LINE); } static INTERRUPT_GEN( crimec_interrupt ) { device->machine().scheduler().timer_set(downcast<cpu_device *>(device)->cycles_to_attotime(5000), FUNC(crimec_interrupt3)); - device_set_input_line(device, 5, HOLD_LINE); + device->execute().set_input_line(5, HOLD_LINE); } static TIMER_CALLBACK( hitice_interrupt6 ) { taitob_state *state = machine.driver_data<taitob_state>(); - device_set_input_line(state->m_maincpu, 6, HOLD_LINE); + state->m_maincpu->set_input_line(6, HOLD_LINE); } static INTERRUPT_GEN( hitice_interrupt ) { device->machine().scheduler().timer_set(downcast<cpu_device *>(device)->cycles_to_attotime(5000), FUNC(hitice_interrupt6)); - device_set_input_line(device, 4, HOLD_LINE); + device->execute().set_input_line(4, HOLD_LINE); } static TIMER_CALLBACK( rambo3_interrupt1 ) { taitob_state *state = machine.driver_data<taitob_state>(); - device_set_input_line(state->m_maincpu, 1, HOLD_LINE); + state->m_maincpu->set_input_line(1, HOLD_LINE); } static INTERRUPT_GEN( rambo3_interrupt ) { device->machine().scheduler().timer_set(downcast<cpu_device *>(device)->cycles_to_attotime(5000), FUNC(rambo3_interrupt1)); - device_set_input_line(device, 6, HOLD_LINE); + device->execute().set_input_line(6, HOLD_LINE); } static TIMER_CALLBACK( pbobble_interrupt5 ) { taitob_state *state = machine.driver_data<taitob_state>(); - device_set_input_line(state->m_maincpu, 5, HOLD_LINE); + state->m_maincpu->set_input_line(5, HOLD_LINE); } static INTERRUPT_GEN( pbobble_interrupt ) { device->machine().scheduler().timer_set(downcast<cpu_device *>(device)->cycles_to_attotime(5000), FUNC(pbobble_interrupt5)); - device_set_input_line(device, 3, HOLD_LINE); + device->execute().set_input_line(3, HOLD_LINE); } static TIMER_CALLBACK( viofight_interrupt1 ) { taitob_state *state = machine.driver_data<taitob_state>(); - device_set_input_line(state->m_maincpu, 1, HOLD_LINE); + state->m_maincpu->set_input_line(1, HOLD_LINE); } static INTERRUPT_GEN( viofight_interrupt ) { device->machine().scheduler().timer_set(downcast<cpu_device *>(device)->cycles_to_attotime(5000), FUNC(viofight_interrupt1)); - device_set_input_line(device, 4, HOLD_LINE); + device->execute().set_input_line(4, HOLD_LINE); } static TIMER_CALLBACK( masterw_interrupt4 ) { taitob_state *state = machine.driver_data<taitob_state>(); - device_set_input_line(state->m_maincpu, 4, HOLD_LINE); + state->m_maincpu->set_input_line(4, HOLD_LINE); } static INTERRUPT_GEN( masterw_interrupt ) { device->machine().scheduler().timer_set(downcast<cpu_device *>(device)->cycles_to_attotime(5000), FUNC(masterw_interrupt4)); - device_set_input_line(device, 5, HOLD_LINE); + device->execute().set_input_line(5, HOLD_LINE); } static TIMER_CALLBACK( silentd_interrupt4 ) { taitob_state *state = machine.driver_data<taitob_state>(); - device_set_input_line(state->m_maincpu, 4, HOLD_LINE); + state->m_maincpu->set_input_line(4, HOLD_LINE); } static INTERRUPT_GEN( silentd_interrupt ) { device->machine().scheduler().timer_set(downcast<cpu_device *>(device)->cycles_to_attotime(5000), FUNC(silentd_interrupt4)); - device_set_input_line(device, 6, HOLD_LINE); + device->execute().set_input_line(6, HOLD_LINE); } static TIMER_CALLBACK( selfeena_interrupt4 ) { taitob_state *state = machine.driver_data<taitob_state>(); - device_set_input_line(state->m_maincpu, 4, HOLD_LINE); + state->m_maincpu->set_input_line(4, HOLD_LINE); } static INTERRUPT_GEN( selfeena_interrupt ) { device->machine().scheduler().timer_set(downcast<cpu_device *>(device)->cycles_to_attotime(5000), FUNC(selfeena_interrupt4)); - device_set_input_line(device, 6, HOLD_LINE); + device->execute().set_input_line(6, HOLD_LINE); } static TIMER_CALLBACK( sbm_interrupt5 )//4 { taitob_state *state = machine.driver_data<taitob_state>(); - device_set_input_line(state->m_maincpu, 5, HOLD_LINE); + state->m_maincpu->set_input_line(5, HOLD_LINE); } static INTERRUPT_GEN( sbm_interrupt )//5 { device->machine().scheduler().timer_set(downcast<cpu_device *>(device)->cycles_to_attotime(10000), FUNC(sbm_interrupt5)); - device_set_input_line(device, 4, HOLD_LINE); + device->execute().set_input_line(4, HOLD_LINE); } static TIMER_CALLBACK( realpunc_interrupt3 )//3 { taitob_state *state = machine.driver_data<taitob_state>(); - device_set_input_line(state->m_maincpu, 3, HOLD_LINE); + state->m_maincpu->set_input_line(3, HOLD_LINE); } static INTERRUPT_GEN( realpunc_interrupt )//2 { device->machine().scheduler().timer_set(downcast<cpu_device *>(device)->cycles_to_attotime(10000), FUNC(realpunc_interrupt3)); - device_set_input_line(device, 2, HOLD_LINE); + device->execute().set_input_line(2, HOLD_LINE); } @@ -394,7 +394,7 @@ WRITE16_MEMBER(taitob_state::gain_control_w) INPUT_CHANGED_MEMBER(taitob_state::realpunc_sensor) { - device_set_input_line(m_maincpu, 4, HOLD_LINE); + m_maincpu->set_input_line(4, HOLD_LINE); } /*************************************************************************** @@ -1906,7 +1906,7 @@ GFXDECODE_END static void irqhandler( device_t *device, int irq ) { taitob_state *state = device->machine().driver_data<taitob_state>(); - device_set_input_line(state->m_audiocpu, 0, irq ? ASSERT_LINE : CLEAR_LINE); + state->m_audiocpu->set_input_line(0, irq ? ASSERT_LINE : CLEAR_LINE); } static const ym2610_interface ym2610_config = @@ -2017,8 +2017,8 @@ static MACHINE_START( taitob ) { taitob_state *state = machine.driver_data<taitob_state>(); - state->m_maincpu = machine.device("maincpu"); - state->m_audiocpu = machine.device("audiocpu"); + state->m_maincpu = machine.device<cpu_device>("maincpu"); + state->m_audiocpu = machine.device<cpu_device>("audiocpu"); state->m_mb87078 = machine.device("mb87078"); state->m_ym = machine.device("ymsnd"); state->m_tc0180vcu = machine.device("tc0180vcu"); |