diff options
Diffstat (limited to 'src/mame/drivers/xexex.c')
-rw-r--r-- | src/mame/drivers/xexex.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c index c4f4b1495a5..1c3e566c84d 100644 --- a/src/mame/drivers/xexex.c +++ b/src/mame/drivers/xexex.c @@ -165,7 +165,7 @@ READ16_MEMBER(xexex_state::xexex_waitskip_r) if (space.device().safe_pc() == 0x1158) { - device_spin_until_trigger(&space.device(), m_resume_trigger); + space.device().execute().spin_until_trigger(m_resume_trigger); m_suspension_active = 1; } @@ -226,7 +226,7 @@ WRITE16_MEMBER(xexex_state::sound_cmd2_w) WRITE16_MEMBER(xexex_state::sound_irq_w) { - device_set_input_line(m_audiocpu, 0, HOLD_LINE); + m_audiocpu->set_input_line(0, HOLD_LINE); } READ16_MEMBER(xexex_state::sound_status_r) @@ -270,7 +270,7 @@ static TIMER_CALLBACK( dmaend_callback ) // IRQ 5 is the "object DMA end interrupt" and shouldn't be triggered // if object data isn't ready for DMA within the frame. - device_set_input_line(state->m_maincpu, 5, HOLD_LINE); + state->m_maincpu->set_input_line(5, HOLD_LINE); } } @@ -289,7 +289,7 @@ static TIMER_DEVICE_CALLBACK( xexex_interrupt ) { // IRQ 6 is for test mode only if (state->m_cur_control2 & 0x0020) - device_set_input_line(state->m_maincpu, 6, HOLD_LINE); + state->m_maincpu->set_input_line(6, HOLD_LINE); } /* TODO: vblank is at 256! (enable CCU then have fun in fixing offsetted layers) */ @@ -307,7 +307,7 @@ static TIMER_DEVICE_CALLBACK( xexex_interrupt ) // IRQ 4 is the V-blank interrupt. It controls color, sound and // vital game logics that shouldn't be interfered by frame-drop. if (state->m_cur_control2 & 0x0800) - device_set_input_line(state->m_maincpu, 4, HOLD_LINE); + state->m_maincpu->set_input_line(4, HOLD_LINE); } } @@ -461,8 +461,8 @@ static MACHINE_START( xexex ) state->membank("bank2")->configure_entries(0, 8, &ROM[0x10000], 0x4000); state->membank("bank2")->set_entry(0); - 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_k053246 = machine.device("k053246"); state->m_k053250 = machine.device<k053250_t>("k053250"); state->m_k053251 = machine.device("k053251"); |