Whoops, broke some stuff.

This commit is contained in:
Aaron Giles 2012-04-10 22:08:28 +00:00
parent 53aca4fb0c
commit 3bdeec4ad3
7 changed files with 45 additions and 6 deletions

View File

@ -530,3 +530,42 @@ CUSTOM_INPUT_MEMBER( driver_device::custom_port_read )
const char *tag = (const char *)param;
return input_port_read(machine(), tag);
}
void generic_pulse_irq_line(device_t *device, int irqline, int cycles) { device->machine().driver_data()->generic_pulse_irq_line(device->execute(), irqline, cycles); }
void generic_pulse_irq_line_and_vector(device_t *device, int irqline, int vector, int cycles) { device->machine().driver_data()->generic_pulse_irq_line_and_vector(device->execute(), irqline, vector, cycles); }
INTERRUPT_GEN( nmi_line_pulse ) { device->machine().driver_data()->nmi_line_pulse(*device); }
INTERRUPT_GEN( nmi_line_assert ) { device->machine().driver_data()->nmi_line_assert(*device); }
INTERRUPT_GEN( irq0_line_hold ) { device->machine().driver_data()->irq0_line_hold(*device); }
INTERRUPT_GEN( irq0_line_pulse ) { device->machine().driver_data()->irq0_line_pulse(*device); }
INTERRUPT_GEN( irq0_line_assert ) { device->machine().driver_data()->irq0_line_assert(*device); }
INTERRUPT_GEN( irq1_line_hold ) { device->machine().driver_data()->irq1_line_hold(*device); }
INTERRUPT_GEN( irq1_line_pulse ) { device->machine().driver_data()->irq1_line_pulse(*device); }
INTERRUPT_GEN( irq1_line_assert ) { device->machine().driver_data()->irq1_line_assert(*device); }
INTERRUPT_GEN( irq2_line_hold ) { device->machine().driver_data()->irq2_line_hold(*device); }
INTERRUPT_GEN( irq2_line_pulse ) { device->machine().driver_data()->irq2_line_pulse(*device); }
INTERRUPT_GEN( irq2_line_assert ) { device->machine().driver_data()->irq2_line_assert(*device); }
INTERRUPT_GEN( irq3_line_hold ) { device->machine().driver_data()->irq3_line_hold(*device); }
INTERRUPT_GEN( irq3_line_pulse ) { device->machine().driver_data()->irq3_line_pulse(*device); }
INTERRUPT_GEN( irq3_line_assert ) { device->machine().driver_data()->irq3_line_assert(*device); }
INTERRUPT_GEN( irq4_line_hold ) { device->machine().driver_data()->irq4_line_hold(*device); }
INTERRUPT_GEN( irq4_line_pulse ) { device->machine().driver_data()->irq4_line_pulse(*device); }
INTERRUPT_GEN( irq4_line_assert ) { device->machine().driver_data()->irq4_line_assert(*device); }
INTERRUPT_GEN( irq5_line_hold ) { device->machine().driver_data()->irq5_line_hold(*device); }
INTERRUPT_GEN( irq5_line_pulse ) { device->machine().driver_data()->irq5_line_pulse(*device); }
INTERRUPT_GEN( irq5_line_assert ) { device->machine().driver_data()->irq5_line_assert(*device); }
INTERRUPT_GEN( irq6_line_hold ) { device->machine().driver_data()->irq6_line_hold(*device); }
INTERRUPT_GEN( irq6_line_pulse ) { device->machine().driver_data()->irq6_line_pulse(*device); }
INTERRUPT_GEN( irq6_line_assert ) { device->machine().driver_data()->irq6_line_assert(*device); }
INTERRUPT_GEN( irq7_line_hold ) { device->machine().driver_data()->irq7_line_hold(*device); }
INTERRUPT_GEN( irq7_line_pulse ) { device->machine().driver_data()->irq7_line_pulse(*device); }
INTERRUPT_GEN( irq7_line_assert ) { device->machine().driver_data()->irq7_line_assert(*device); }

View File

@ -1403,7 +1403,7 @@ WRITE8_MEMBER(bfcobra_state::meter_w)
if (changed & (1 << i))
{
MechMtr_update(i, data & (1 << i) );
generic_pulse_irq_line(&space.device(), M6809_FIRQ_LINE, 1);
generic_pulse_irq_line(space.device().execute(), M6809_FIRQ_LINE, 1);
}
}
}

View File

@ -303,7 +303,7 @@ WRITE8_MEMBER(bfm_sc1_state::mmtr_w)
if ( changed & (1 << i) )
{
MechMtr_update(i, data & (1 << i) );
generic_pulse_irq_line(machine().device("maincpu"), M6809_FIRQ_LINE, 1);
generic_pulse_irq_line(machine().device("maincpu")->execute(), M6809_FIRQ_LINE, 1);
}
}
}

View File

@ -245,7 +245,7 @@ WRITE8_MEMBER(bfmsys85_state::mmtr_w)
for (i=0; i<8; i++)
if ( changed & (1 << i) ) MechMtr_update(i, data & (1 << i) );
if ( data ) generic_pulse_irq_line(machine().device("maincpu"), M6809_FIRQ_LINE, 1);
if ( data ) generic_pulse_irq_line(machine().device("maincpu")->execute(), M6809_FIRQ_LINE, 1);
}
///////////////////////////////////////////////////////////////////////////

View File

@ -435,7 +435,7 @@ WRITE8_MEMBER(equites_state::equites_c0f8_w)
case 1: // c0f9: RST75 trigger (written by NMI handler)
// Note: solder pad CP3 on the pcb would allow to disable this
generic_pulse_irq_line(m_audio_cpu, I8085_RST75_LINE, 1);
generic_pulse_irq_line(m_audio_cpu->execute(), I8085_RST75_LINE, 1);
break;
case 2: // c0fa: INTR trigger (written by NMI handler)

View File

@ -50,7 +50,7 @@ static INPUT_CHANGED( coin_inserted )
WRITE8_MEMBER(lasso_state::sound_command_w)
{
soundlatch_byte_w(space, offset, data);
generic_pulse_irq_line(m_audiocpu, 0, 1);
generic_pulse_irq_line(m_audiocpu->execute(), 0, 1);
}
WRITE8_MEMBER(lasso_state::pinbo_sound_command_w)

View File

@ -2690,7 +2690,7 @@ READ8_MEMBER(namcos22_state::propcycle_mcu_adc_r)
int i;
for (i = 0; i < 16; i++)
{
generic_pulse_irq_line(machine().device("mcu"), M37710_LINE_TIMERA3TICK, 1);
generic_pulse_irq_line(machine().device("mcu")->execute(), M37710_LINE_TIMERA3TICK, 1);
}
}