diff options
Diffstat (limited to 'src/emu')
-rw-r--r-- | src/emu/cpu/arm7/arm7dasm.c | 2 | ||||
-rw-r--r-- | src/emu/cpu/cp1610/cp1610.c | 2 | ||||
-rw-r--r-- | src/emu/cpu/jaguar/jaguar.c | 8 | ||||
-rw-r--r-- | src/emu/cpu/m6502/m6502.h | 2 | ||||
-rw-r--r-- | src/emu/cpu/m6502/m6509.h | 2 | ||||
-rw-r--r-- | src/emu/cpu/mips/mips3com.c | 2 | ||||
-rw-r--r-- | src/emu/cpu/sh4/sh4.c | 2 | ||||
-rw-r--r-- | src/emu/cpu/tms34010/34010ops.c | 2 | ||||
-rw-r--r-- | src/emu/cpu/tms34010/tms34010.c | 4 | ||||
-rw-r--r-- | src/emu/cpu/tms7000/tms7000.c | 2 | ||||
-rw-r--r-- | src/emu/cpuint.c | 10 | ||||
-rw-r--r-- | src/emu/cpuint.h | 4 | ||||
-rw-r--r-- | src/emu/machine/8042kbdc.c | 2 | ||||
-rw-r--r-- | src/emu/machine/8237dma.c | 2 | ||||
-rw-r--r-- | src/emu/machine/8257dma.c | 2 | ||||
-rw-r--r-- | src/emu/machine/generic.c | 60 | ||||
-rw-r--r-- | src/emu/machine/tmp68301.c | 4 | ||||
-rw-r--r-- | src/emu/machine/z80dma.c | 2 | ||||
-rw-r--r-- | src/emu/sound/scsp.c | 8 |
19 files changed, 61 insertions, 61 deletions
diff --git a/src/emu/cpu/arm7/arm7dasm.c b/src/emu/cpu/arm7/arm7dasm.c index 42890e01e09..394ba74d733 100644 --- a/src/emu/cpu/arm7/arm7dasm.c +++ b/src/emu/cpu/arm7/arm7dasm.c @@ -1200,7 +1200,7 @@ UINT32 thumb_disasm( char *pBuf, UINT32 pc, UINT16 opcode ) } break; case 0xe: /* B #offs */ - if( insn & THUMB_BLOP_LO ) + if( opcode & THUMB_BLOP_LO ) { addr = ( ( opcode & THUMB_BLOP_OFFS ) << 1 ) & 0xfffc; pBuf += sprintf( pBuf, "BLX (LO) %08x", addr ); diff --git a/src/emu/cpu/cp1610/cp1610.c b/src/emu/cpu/cp1610/cp1610.c index aa1c6485a59..a8a96a484b1 100644 --- a/src/emu/cpu/cp1610/cp1610.c +++ b/src/emu/cpu/cp1610/cp1610.c @@ -1548,7 +1548,7 @@ static void cp1610_xori(int d) static void cp1610_reset(void) { /* This is how we set the reset vector */ - cpunum_set_input_line(cpu_getactivecpu(), CP1610_RESET, PULSE_LINE); + cpunum_set_input_line(Machine, cpu_getactivecpu(), CP1610_RESET, PULSE_LINE); } /*************************************************** diff --git a/src/emu/cpu/jaguar/jaguar.c b/src/emu/cpu/jaguar/jaguar.c index afb8c57beef..d3cee108069 100644 --- a/src/emu/cpu/jaguar/jaguar.c +++ b/src/emu/cpu/jaguar/jaguar.c @@ -496,7 +496,7 @@ static int jaguargpu_execute(int cycles) /* if we're halted, we shouldn't be here */ if (!(jaguar.ctrl[G_CTRL] & 1)) { - cpunum_set_input_line(cpu_getactivecpu(), INPUT_LINE_HALT, ASSERT_LINE); + cpunum_set_input_line(Machine, cpu_getactivecpu(), INPUT_LINE_HALT, ASSERT_LINE); return cycles; } @@ -542,7 +542,7 @@ static int jaguardsp_execute(int cycles) /* if we're halted, we shouldn't be here */ if (!(jaguar.ctrl[G_CTRL] & 1)) { - cpunum_set_input_line(cpu_getactivecpu(), INPUT_LINE_HALT, ASSERT_LINE); + cpunum_set_input_line(Machine, cpu_getactivecpu(), INPUT_LINE_HALT, ASSERT_LINE); return cycles; } @@ -1362,7 +1362,7 @@ void jaguargpu_ctrl_w(int cpunum, offs_t offset, UINT32 data, UINT32 mem_mask) jaguar.ctrl[offset] = newval; if ((oldval ^ newval) & 0x01) { - cpunum_set_input_line(cpunum, INPUT_LINE_HALT, (newval & 1) ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(Machine, cpunum, INPUT_LINE_HALT, (newval & 1) ? CLEAR_LINE : ASSERT_LINE); if (cpu_getexecutingcpu() >= 0) cpu_yield(); } @@ -1477,7 +1477,7 @@ void jaguardsp_ctrl_w(int cpunum, offs_t offset, UINT32 data, UINT32 mem_mask) jaguar.ctrl[offset] = newval; if ((oldval ^ newval) & 0x01) { - cpunum_set_input_line(cpunum, INPUT_LINE_HALT, (newval & 1) ? CLEAR_LINE : ASSERT_LINE); + cpunum_set_input_line(Machine, cpunum, INPUT_LINE_HALT, (newval & 1) ? CLEAR_LINE : ASSERT_LINE); if (cpu_getexecutingcpu() >= 0) cpu_yield(); } diff --git a/src/emu/cpu/m6502/m6502.h b/src/emu/cpu/m6502/m6502.h index f3b35305887..c348176ab42 100644 --- a/src/emu/cpu/m6502/m6502.h +++ b/src/emu/cpu/m6502/m6502.h @@ -54,7 +54,7 @@ enum { }; #define M6502_IRQ_LINE 0 -/* use cpunum_set_input_line(cpu, M6502_SET_OVERFLOW, level) +/* use cpunum_set_input_line(machine, cpu, M6502_SET_OVERFLOW, level) to change level of the so input line positiv edge sets overflow flag */ #define M6502_SET_OVERFLOW 1 diff --git a/src/emu/cpu/m6502/m6509.h b/src/emu/cpu/m6502/m6509.h index 57e6240d032..8b8fd107416 100644 --- a/src/emu/cpu/m6502/m6509.h +++ b/src/emu/cpu/m6502/m6509.h @@ -31,7 +31,7 @@ enum { }; #define M6509_IRQ_LINE M6502_IRQ_LINE -/* use cpunum_set_input_line(cpu, M6509_SET_OVERFLOW, level) +/* use cpunum_set_input_line(machine, cpu, M6509_SET_OVERFLOW, level) to change level of the so input line positiv edge sets overflow flag */ #define M6509_SET_OVERFLOW 3 diff --git a/src/emu/cpu/mips/mips3com.c b/src/emu/cpu/mips/mips3com.c index e36d3b910bd..7f616251ef2 100644 --- a/src/emu/cpu/mips/mips3com.c +++ b/src/emu/cpu/mips/mips3com.c @@ -724,7 +724,7 @@ void mips3com_get_info(mips3_state *mips, UINT32 state, cpuinfo *info) static TIMER_CALLBACK( compare_int_callback ) { - cpunum_set_input_line(param, MIPS3_IRQ5, ASSERT_LINE); + cpunum_set_input_line(machine, param, MIPS3_IRQ5, ASSERT_LINE); } diff --git a/src/emu/cpu/sh4/sh4.c b/src/emu/cpu/sh4/sh4.c index c6ec56961e1..fe582b66eac 100644 --- a/src/emu/cpu/sh4/sh4.c +++ b/src/emu/cpu/sh4/sh4.c @@ -4406,7 +4406,7 @@ static void sh4_set_irln_input(int cpunum, int value) if (sh4.irln == value) return; sh4.irln = value; - cpunum_set_input_line(cpunum, SH4_IRLn, PULSE_LINE); + cpunum_set_input_line(Machine, cpunum, SH4_IRLn, PULSE_LINE); } static void set_irq_line(int irqline, int state) // set state of external interrupt line diff --git a/src/emu/cpu/tms34010/34010ops.c b/src/emu/cpu/tms34010/34010ops.c index 441f9045ae7..d7087fc96ec 100644 --- a/src/emu/cpu/tms34010/34010ops.c +++ b/src/emu/cpu/tms34010/34010ops.c @@ -97,7 +97,7 @@ static void unimpl(void) /* extra check to prevent bad things */ if (PC == 0 || opcode_table[cpu_readop16(TOBYTE(PC)) >> 4] == unimpl) { - cpunum_set_input_line(cpu_getactivecpu(), INPUT_LINE_HALT, ASSERT_LINE); + cpunum_set_input_line(Machine, cpu_getactivecpu(), INPUT_LINE_HALT, ASSERT_LINE); DEBUGGER_BREAK; } } diff --git a/src/emu/cpu/tms34010/tms34010.c b/src/emu/cpu/tms34010/tms34010.c index 43566f063dc..6a5cca67cb5 100644 --- a/src/emu/cpu/tms34010/tms34010.c +++ b/src/emu/cpu/tms34010/tms34010.c @@ -1210,7 +1210,7 @@ WRITE16_HANDLER( tms34010_io_register_w ) /* if the CPU is halting itself, stop execution right away */ if ((data & 0x8000) && !external_host_access) tms34010_ICount = 0; - cpunum_set_input_line(cpunum, INPUT_LINE_HALT, (data & 0x8000) ? ASSERT_LINE : CLEAR_LINE); + cpunum_set_input_line(Machine, cpunum, INPUT_LINE_HALT, (data & 0x8000) ? ASSERT_LINE : CLEAR_LINE); /* NMI issued? */ if (data & 0x0100) @@ -1361,7 +1361,7 @@ WRITE16_HANDLER( tms34020_io_register_w ) /* if the CPU is halting itself, stop execution right away */ if ((data & 0x8000) && !external_host_access) tms34010_ICount = 0; - cpunum_set_input_line(cpunum, INPUT_LINE_HALT, (data & 0x8000) ? ASSERT_LINE : CLEAR_LINE); + cpunum_set_input_line(Machine, cpunum, INPUT_LINE_HALT, (data & 0x8000) ? ASSERT_LINE : CLEAR_LINE); /* NMI issued? */ if (data & 0x0100) diff --git a/src/emu/cpu/tms7000/tms7000.c b/src/emu/cpu/tms7000/tms7000.c index b5f3a2d6846..16d78f889d4 100644 --- a/src/emu/cpu/tms7000/tms7000.c +++ b/src/emu/cpu/tms7000/tms7000.c @@ -561,7 +561,7 @@ static void tms7000_service_timer1( void ) if( --tms7000.t1_decrementer < 0 ) /* Decrement timer1 register and check for underflow */ { tms7000.t1_decrementer = tms7000.pf[2]; /* Reload decrementer (8 bit) */ - cpunum_set_input_line( cpu_getactivecpu(), TMS7000_IRQ2_LINE, HOLD_LINE); + cpunum_set_input_line(Machine, cpu_getactivecpu(), TMS7000_IRQ2_LINE, HOLD_LINE); //LOG( ("tms7000: trigger int2 (cycles: %d)\t%d\tdelta %d\n", activecpu_gettotalcycles(), activecpu_gettotalcycles() - tick, tms7000_cycles_per_INT2-(activecpu_gettotalcycles() - tick) ); //tick = activecpu_gettotalcycles() ); /* Also, cascade out to timer 2 - timer 2 unimplemented */ diff --git a/src/emu/cpuint.c b/src/emu/cpuint.c index a2a2f978ff8..2d8463ec375 100644 --- a/src/emu/cpuint.c +++ b/src/emu/cpuint.c @@ -121,7 +121,7 @@ void cpuint_init(running_machine *machine) { input_line_state[cpunum][line] = CLEAR_LINE; interrupt_vector[cpunum][line] = - input_line_vector[cpunum][line] = cputype_default_irq_vector(Machine->drv->cpu[cpunum].type); + input_line_vector[cpunum][line] = cputype_default_irq_vector(machine->drv->cpu[cpunum].type); input_event_index[cpunum][line] = 0; } } @@ -270,10 +270,10 @@ static TIMER_CALLBACK( cpunum_empty_event_queue ) * *************************************/ -void cpunum_set_input_line(int cpunum, int line, int state) +void cpunum_set_input_line(running_machine *machine, int cpunum, int line, int state) { int vector = (line >= 0 && line < MAX_INPUT_LINES) ? interrupt_vector[cpunum][line] : 0xff; - cpunum_set_input_line_and_vector(cpunum, line, state, vector); + cpunum_set_input_line_and_vector(machine, cpunum, line, state, vector); } @@ -289,7 +289,7 @@ void cpunum_set_input_line_vector(int cpunum, int line, int vector) } -void cpunum_set_input_line_and_vector(int cpunum, int line, int state, int vector) +void cpunum_set_input_line_and_vector(running_machine *machine, int cpunum, int line, int state, int vector) { if (line >= 0 && line < MAX_INPUT_LINES) { @@ -302,7 +302,7 @@ void cpunum_set_input_line_and_vector(int cpunum, int line, int state, int vecto if (event_index >= MAX_INPUT_EVENTS) { input_event_index[cpunum][line]--; - cpunum_empty_event_queue(Machine, NULL, cpunum | (line << 8)); + cpunum_empty_event_queue(machine, NULL, cpunum | (line << 8)); event_index = input_event_index[cpunum][line]++; logerror("Exceeded pending input line event queue on CPU %d!\n", cpunum); } diff --git a/src/emu/cpuint.h b/src/emu/cpuint.h index b1e9fd83c74..1e5057e367b 100644 --- a/src/emu/cpuint.h +++ b/src/emu/cpuint.h @@ -41,13 +41,13 @@ extern int (*const cpu_irq_callbacks[])(int); *************************************/ /* Set the logical state (ASSERT_LINE/CLEAR_LINE) of the an input line on a CPU */ -void cpunum_set_input_line(int cpunum, int line, int state); +void cpunum_set_input_line(running_machine *machine, int cpunum, int line, int state); /* Set the vector to be returned during a CPU's interrupt acknowledge cycle */ void cpunum_set_input_line_vector(int cpunum, int irqline, int vector); /* Set the logical state (ASSERT_LINE/CLEAR_LINE) of the an input line on a CPU and its associated vector */ -void cpunum_set_input_line_and_vector(int cpunum, int line, int state, int vector); +void cpunum_set_input_line_and_vector(running_machine *machine, int cpunum, int line, int state, int vector); /* Install a driver callback for IRQ acknowledge */ void cpunum_set_irq_callback(int cpunum, int (*callback)(int irqline)); diff --git a/src/emu/machine/8042kbdc.c b/src/emu/machine/8042kbdc.c index bb8b3555ab1..43ed9a0bd4f 100644 --- a/src/emu/machine/8042kbdc.c +++ b/src/emu/machine/8042kbdc.c @@ -584,7 +584,7 @@ WRITE8_HANDLER(kbdc8042_8_w) * the bits low set in the command byte. The only pulse that has * an effect currently is bit 0, which pulses the CPU's reset line */ - cpunum_set_input_line(0, INPUT_LINE_RESET, PULSE_LINE); + cpunum_set_input_line(Machine, 0, INPUT_LINE_RESET, PULSE_LINE); at_8042_set_outport(kbdc8042.outport | 0x02, 0); break; } diff --git a/src/emu/machine/8237dma.c b/src/emu/machine/8237dma.c index 43b092d3030..9e441d3f9bd 100644 --- a/src/emu/machine/8237dma.c +++ b/src/emu/machine/8237dma.c @@ -209,7 +209,7 @@ static void dma8237_update_status(int which) /* set the halt line */ if (dma[which].intf && dma[which].intf->cpunum >= 0) { - cpunum_set_input_line(dma[which].intf->cpunum, INPUT_LINE_HALT, + cpunum_set_input_line(Machine, dma[which].intf->cpunum, INPUT_LINE_HALT, pending_transfer ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/emu/machine/8257dma.c b/src/emu/machine/8257dma.c index 8f56bc965c3..187f3867d94 100644 --- a/src/emu/machine/8257dma.c +++ b/src/emu/machine/8257dma.c @@ -234,7 +234,7 @@ static void dma8257_update_status(int which) /* set the halt line */ if (dma[which].intf && dma[which].intf->cpunum >= 0) { - cpunum_set_input_line(dma[which].intf->cpunum, INPUT_LINE_HALT, + cpunum_set_input_line(Machine, dma[which].intf->cpunum, INPUT_LINE_HALT, pending_transfer ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/emu/machine/generic.c b/src/emu/machine/generic.c index 9724657d60a..eb9f6e62fb3 100644 --- a/src/emu/machine/generic.c +++ b/src/emu/machine/generic.c @@ -564,9 +564,9 @@ static TIMER_CALLBACK( clear_all_lines ) int line; /* clear NMI and all inputs */ - cpunum_set_input_line(cpunum, INPUT_LINE_NMI, CLEAR_LINE); + cpunum_set_input_line(machine, cpunum, INPUT_LINE_NMI, CLEAR_LINE); for (line = 0; line < inputcount; line++) - cpunum_set_input_line(cpunum, line, CLEAR_LINE); + cpunum_set_input_line(machine, cpunum, line, CLEAR_LINE); } @@ -624,10 +624,10 @@ READ8_HANDLER( interrupt_enable_r ) specified state on the active CPU -------------------------------------------------*/ -INLINE void irqn_line_set(int cpunum, int line, int state) +INLINE void irqn_line_set(running_machine *machine, int cpunum, int line, int state) { if (interrupt_enable[cpunum]) - cpunum_set_input_line(cpunum, line, state); + cpunum_set_input_line(machine, cpunum, line, state); } @@ -635,45 +635,45 @@ INLINE void irqn_line_set(int cpunum, int line, int state) NMI callbacks -------------------------------------------------*/ -INTERRUPT_GEN( nmi_line_pulse ) { irqn_line_set(cpunum, INPUT_LINE_NMI, PULSE_LINE); } -INTERRUPT_GEN( nmi_line_assert ) { irqn_line_set(cpunum, INPUT_LINE_NMI, ASSERT_LINE); } +INTERRUPT_GEN( nmi_line_pulse ) { irqn_line_set(machine, cpunum, INPUT_LINE_NMI, PULSE_LINE); } +INTERRUPT_GEN( nmi_line_assert ) { irqn_line_set(machine, cpunum, INPUT_LINE_NMI, ASSERT_LINE); } /*------------------------------------------------- IRQn callbacks -------------------------------------------------*/ -INTERRUPT_GEN( irq0_line_hold ) { irqn_line_set(cpunum, 0, HOLD_LINE); } -INTERRUPT_GEN( irq0_line_pulse ) { irqn_line_set(cpunum, 0, PULSE_LINE); } -INTERRUPT_GEN( irq0_line_assert ) { irqn_line_set(cpunum, 0, ASSERT_LINE); } +INTERRUPT_GEN( irq0_line_hold ) { irqn_line_set(machine, cpunum, 0, HOLD_LINE); } +INTERRUPT_GEN( irq0_line_pulse ) { irqn_line_set(machine, cpunum, 0, PULSE_LINE); } +INTERRUPT_GEN( irq0_line_assert ) { irqn_line_set(machine, cpunum, 0, ASSERT_LINE); } -INTERRUPT_GEN( irq1_line_hold ) { irqn_line_set(cpunum, 1, HOLD_LINE); } -INTERRUPT_GEN( irq1_line_pulse ) { irqn_line_set(cpunum, 1, PULSE_LINE); } -INTERRUPT_GEN( irq1_line_assert ) { irqn_line_set(cpunum, 1, ASSERT_LINE); } +INTERRUPT_GEN( irq1_line_hold ) { irqn_line_set(machine, cpunum, 1, HOLD_LINE); } +INTERRUPT_GEN( irq1_line_pulse ) { irqn_line_set(machine, cpunum, 1, PULSE_LINE); } +INTERRUPT_GEN( irq1_line_assert ) { irqn_line_set(machine, cpunum, 1, ASSERT_LINE); } -INTERRUPT_GEN( irq2_line_hold ) { irqn_line_set(cpunum, 2, HOLD_LINE); } -INTERRUPT_GEN( irq2_line_pulse ) { irqn_line_set(cpunum, 2, PULSE_LINE); } -INTERRUPT_GEN( irq2_line_assert ) { irqn_line_set(cpunum, 2, ASSERT_LINE); } +INTERRUPT_GEN( irq2_line_hold ) { irqn_line_set(machine, cpunum, 2, HOLD_LINE); } +INTERRUPT_GEN( irq2_line_pulse ) { irqn_line_set(machine, cpunum, 2, PULSE_LINE); } +INTERRUPT_GEN( irq2_line_assert ) { irqn_line_set(machine, cpunum, 2, ASSERT_LINE); } -INTERRUPT_GEN( irq3_line_hold ) { irqn_line_set(cpunum, 3, HOLD_LINE); } -INTERRUPT_GEN( irq3_line_pulse ) { irqn_line_set(cpunum, 3, PULSE_LINE); } -INTERRUPT_GEN( irq3_line_assert ) { irqn_line_set(cpunum, 3, ASSERT_LINE); } +INTERRUPT_GEN( irq3_line_hold ) { irqn_line_set(machine, cpunum, 3, HOLD_LINE); } +INTERRUPT_GEN( irq3_line_pulse ) { irqn_line_set(machine, cpunum, 3, PULSE_LINE); } +INTERRUPT_GEN( irq3_line_assert ) { irqn_line_set(machine, cpunum, 3, ASSERT_LINE); } -INTERRUPT_GEN( irq4_line_hold ) { irqn_line_set(cpunum, 4, HOLD_LINE); } -INTERRUPT_GEN( irq4_line_pulse ) { irqn_line_set(cpunum, 4, PULSE_LINE); } -INTERRUPT_GEN( irq4_line_assert ) { irqn_line_set(cpunum, 4, ASSERT_LINE); } +INTERRUPT_GEN( irq4_line_hold ) { irqn_line_set(machine, cpunum, 4, HOLD_LINE); } +INTERRUPT_GEN( irq4_line_pulse ) { irqn_line_set(machine, cpunum, 4, PULSE_LINE); } +INTERRUPT_GEN( irq4_line_assert ) { irqn_line_set(machine, cpunum, 4, ASSERT_LINE); } -INTERRUPT_GEN( irq5_line_hold ) { irqn_line_set(cpunum, 5, HOLD_LINE); } -INTERRUPT_GEN( irq5_line_pulse ) { irqn_line_set(cpunum, 5, PULSE_LINE); } -INTERRUPT_GEN( irq5_line_assert ) { irqn_line_set(cpunum, 5, ASSERT_LINE); } +INTERRUPT_GEN( irq5_line_hold ) { irqn_line_set(machine, cpunum, 5, HOLD_LINE); } +INTERRUPT_GEN( irq5_line_pulse ) { irqn_line_set(machine, cpunum, 5, PULSE_LINE); } +INTERRUPT_GEN( irq5_line_assert ) { irqn_line_set(machine, cpunum, 5, ASSERT_LINE); } -INTERRUPT_GEN( irq6_line_hold ) { irqn_line_set(cpunum, 6, HOLD_LINE); } -INTERRUPT_GEN( irq6_line_pulse ) { irqn_line_set(cpunum, 6, PULSE_LINE); } -INTERRUPT_GEN( irq6_line_assert ) { irqn_line_set(cpunum, 6, ASSERT_LINE); } +INTERRUPT_GEN( irq6_line_hold ) { irqn_line_set(machine, cpunum, 6, HOLD_LINE); } +INTERRUPT_GEN( irq6_line_pulse ) { irqn_line_set(machine, cpunum, 6, PULSE_LINE); } +INTERRUPT_GEN( irq6_line_assert ) { irqn_line_set(machine, cpunum, 6, ASSERT_LINE); } -INTERRUPT_GEN( irq7_line_hold ) { irqn_line_set(cpunum, 7, HOLD_LINE); } -INTERRUPT_GEN( irq7_line_pulse ) { irqn_line_set(cpunum, 7, PULSE_LINE); } -INTERRUPT_GEN( irq7_line_assert ) { irqn_line_set(cpunum, 7, ASSERT_LINE); } +INTERRUPT_GEN( irq7_line_hold ) { irqn_line_set(machine, cpunum, 7, HOLD_LINE); } +INTERRUPT_GEN( irq7_line_pulse ) { irqn_line_set(machine, cpunum, 7, PULSE_LINE); } +INTERRUPT_GEN( irq7_line_assert ) { irqn_line_set(machine, cpunum, 7, ASSERT_LINE); } diff --git a/src/emu/machine/tmp68301.c b/src/emu/machine/tmp68301.c index 9dc602c8ccd..e2e3cfdf700 100644 --- a/src/emu/machine/tmp68301.c +++ b/src/emu/machine/tmp68301.c @@ -47,7 +47,7 @@ static TIMER_CALLBACK( tmp68301_timer_callback ) tmp68301_irq_vector[level] = IVNR & 0x00e0; tmp68301_irq_vector[level] += 4+i; - cpunum_set_input_line(0,level,HOLD_LINE); + cpunum_set_input_line(machine, 0,level,HOLD_LINE); } if (TCR & 0x0080) // N/1 @@ -145,7 +145,7 @@ static void update_irq_state(void) tmp68301_IE[i] = 0; // Interrupts are edge triggerred - cpunum_set_input_line(0,level,HOLD_LINE); + cpunum_set_input_line(Machine, 0,level,HOLD_LINE); } } } diff --git a/src/emu/machine/z80dma.c b/src/emu/machine/z80dma.c index 4e7d6850b08..9787c70e3e7 100644 --- a/src/emu/machine/z80dma.c +++ b/src/emu/machine/z80dma.c @@ -312,7 +312,7 @@ static void z80dma_update_status(int which) if (dma[which].intf && dma[which].intf->cpunum >= 0) { //FIXME: Synchronization is done by BUSREQ! - cpunum_set_input_line(dma[which].intf->cpunum, INPUT_LINE_HALT, + cpunum_set_input_line(Machine, dma[which].intf->cpunum, INPUT_LINE_HALT, pending_transfer ? ASSERT_LINE : CLEAR_LINE); } } diff --git a/src/emu/sound/scsp.c b/src/emu/sound/scsp.c index afb7babea5b..2b7c54119b1 100644 --- a/src/emu/sound/scsp.c +++ b/src/emu/sound/scsp.c @@ -42,7 +42,7 @@ #define EG_SHIFT 16 #define FM_DELAY 0 // delay in number of slots processed before samples are written to the FM ring buffer // driver code indicates should be 4, but sounds distorted then - + // include the LFO handling code #include "scsplfo.c" @@ -1044,7 +1044,7 @@ INLINE INT32 SCSP_UpdateSlot(struct _SCSP *SCSP, struct _SLOT *slot) case 3: //ping-pong if(*addr[addr_select]>=LEA(slot)) //reached end, reverse till start { - rem_addr = *slot_addr[addr_select] - (LEA(slot)<<SHIFT); + rem_addr = *slot_addr[addr_select] - (LEA(slot)<<SHIFT); *slot_addr[addr_select]=(LEA(slot)<<SHIFT) - rem_addr; slot->Backwards=1; } @@ -1192,7 +1192,7 @@ static void dma_scsp(struct _SCSP *SCSP) /*Job done,request a dma end irq*/ if(scsp_regs[0x1e/2] & 0x10) - cpunum_set_input_line(2,dma_transfer_end,HOLD_LINE); + cpunum_set_input_line(Machine, 2,dma_transfer_end,HOLD_LINE); } #ifdef UNUSED_FUNCTION @@ -1307,7 +1307,7 @@ WRITE16_HANDLER( SCSP_0_w ) case 0x42a: if(stv_scu && !(stv_scu[40] & 0x40) /*&& scsp_regs[0x42c/2] & 0x20*/)/*Main CPU allow sound irq*/ { - cpunum_set_input_line_and_vector(0, 9, HOLD_LINE , 0x46); + cpunum_set_input_line_and_vector(Machine, 0, 9, HOLD_LINE , 0x46); logerror("SCSP: Main CPU interrupt\n"); } break; |