nothing precious about r3000 irq numbers (nw)

This commit is contained in:
Patrick Mackinlay 2018-11-05 19:03:23 +07:00
parent 53b63cef9d
commit ec8e3a038f
8 changed files with 14 additions and 14 deletions

View File

@ -100,5 +100,5 @@ void iop_intc_device::update_interrupts()
{
bool active = (m_enabled && (m_status & m_mask));
//printf("iop_intc: %d && (%08x & %08x) = %d\n", m_enabled, m_status, m_mask, active);
m_iop->set_input_line(R3000_IRQ0, active ? ASSERT_LINE : CLEAR_LINE);
m_iop->set_input_line(INPUT_LINE_IRQ0, active ? ASSERT_LINE : CLEAR_LINE);
}

View File

@ -305,7 +305,7 @@ WRITE32_MEMBER(decstation_state::cfb_w)
WRITE_LINE_MEMBER(decstation_state::ioga_irq_w)
{
// not sure this is correct
m_maincpu->set_input_line(R3000_IRQ3, state);
m_maincpu->set_input_line(INPUT_LINE_IRQ3, state);
}
void decstation_state::machine_start()

View File

@ -102,7 +102,7 @@ PC5380-9651 5380-JY3306A 5380-N1045503A
WRITE_LINE_MEMBER(policetr_state::vblank)
{
m_maincpu->set_input_line(state ? R3000_IRQ4 : R3000_IRQ5, ASSERT_LINE);
m_maincpu->set_input_line(state ? INPUT_LINE_IRQ4 : INPUT_LINE_IRQ5, ASSERT_LINE);
}
/*************************************

View File

@ -264,7 +264,7 @@ READ32_MEMBER(speglsht_state::cop_r)
READ32_MEMBER(speglsht_state::irq_ack_clear)
{
m_subcpu->set_input_line(R3000_IRQ4, CLEAR_LINE);
m_subcpu->set_input_line(INPUT_LINE_IRQ4, CLEAR_LINE);
return 0;
}

View File

@ -362,7 +362,7 @@ WRITE32_MEMBER(srmp5_state::srmp5_vidregs_w)
READ32_MEMBER(srmp5_state::irq_ack_clear)
{
m_maincpu->set_input_line(R3000_IRQ4, CLEAR_LINE);
m_maincpu->set_input_line(INPUT_LINE_IRQ4, CLEAR_LINE);
return 0;
}

View File

@ -253,7 +253,7 @@ uint32_t turrett_state::update_inputs(void)
}
// Update IRQ state
m_maincpu->set_input_line(R3000_IRQ1, m_inputs_active ? ASSERT_LINE : CLEAR_LINE);
m_maincpu->set_input_line(INPUT_LINE_IRQ1, m_inputs_active ? ASSERT_LINE : CLEAR_LINE);
return val;
}
@ -270,13 +270,13 @@ INPUT_CHANGED_MEMBER( turrett_state::ipt_change )
if (newval == 0)
{
m_inputs_active |= p;
m_maincpu->set_input_line(R3000_IRQ1, ASSERT_LINE);
m_maincpu->set_input_line(INPUT_LINE_IRQ1, ASSERT_LINE);
}
}
else
{
m_inputs_active |= p;
m_maincpu->set_input_line(R3000_IRQ1, ASSERT_LINE);
m_maincpu->set_input_line(INPUT_LINE_IRQ1, ASSERT_LINE);
}
}
}
@ -297,7 +297,7 @@ INTERRUPT_GEN_MEMBER( turrett_state::vblank )
m_inputs_active |= 0x02000000;
m_frame ^= 1;
m_maincpu->set_input_line(R3000_IRQ1, ASSERT_LINE);
m_maincpu->set_input_line(INPUT_LINE_IRQ1, ASSERT_LINE);
}
@ -309,7 +309,7 @@ INTERRUPT_GEN_MEMBER( turrett_state::adc )
m_inputs_active |= 0x00000002;
m_adc ^= 1;
m_maincpu->set_input_line(R3000_IRQ1, ASSERT_LINE);
m_maincpu->set_input_line(INPUT_LINE_IRQ1, ASSERT_LINE);
}
/*************************************

View File

@ -270,9 +270,9 @@ inline bool jaguar_state::adjust_object_timer(int vc)
void jaguar_state::update_cpu_irq()
{
if ((m_cpu_irq_state & m_gpu_regs[INT1] & 0x1f) != 0)
m_maincpu->set_input_line(m_is_r3000 ? R3000_IRQ4 : M68K_IRQ_6, ASSERT_LINE);
m_maincpu->set_input_line(m_is_r3000 ? INPUT_LINE_IRQ4 : M68K_IRQ_6, ASSERT_LINE);
else
m_maincpu->set_input_line(m_is_r3000 ? R3000_IRQ4 : M68K_IRQ_6, CLEAR_LINE);
m_maincpu->set_input_line(m_is_r3000 ? INPUT_LINE_IRQ4 : M68K_IRQ_6, CLEAR_LINE);
}

View File

@ -226,12 +226,12 @@ WRITE32_MEMBER(policetr_state::video_w)
/* latch 0x50 clears IRQ4 */
case 0x50:
m_maincpu->set_input_line(R3000_IRQ4, CLEAR_LINE);
m_maincpu->set_input_line(INPUT_LINE_IRQ4, CLEAR_LINE);
break;
/* latch 0x60 clears IRQ5 */
case 0x60:
m_maincpu->set_input_line(R3000_IRQ5, CLEAR_LINE);
m_maincpu->set_input_line(INPUT_LINE_IRQ5, CLEAR_LINE);
break;
/* log anything else */