diff options
Diffstat (limited to 'src/mame/machine/namcos2.c')
-rw-r--r-- | src/mame/machine/namcos2.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/mame/machine/namcos2.c b/src/mame/machine/namcos2.c index 321420c7083..73a834e28e1 100644 --- a/src/mame/machine/namcos2.c +++ b/src/mame/machine/namcos2.c @@ -501,7 +501,7 @@ ReadWriteC148( address_space *space, offs_t offset, UINT16 data, int bWrite ) // If writing an IRQ priority register, clear any pending IRQs. // Dirt Fox and Winning Run require this behaviour if (reg < 8) - device_set_input_line(&space->device(), pC148Reg[reg], CLEAR_LINE); + space->device().execute().set_input_line(pC148Reg[reg], CLEAR_LINE); pC148Reg[reg] = data & 0x0007; } @@ -525,7 +525,7 @@ ReadWriteC148( address_space *space, offs_t offset, UINT16 data, int bWrite ) // mame_printf_debug( "cpu(%d) RAM[0x%06x] = 0x%x\n", cpu, addr, data ); /* Dubious to assert IRQ for other CPU here, but Starblade seems to rely on it. It fails to show large polygons otherwise. */ - device_set_input_line(altcpu, pC148RegAlt[NAMCOS2_C148_CPUIRQ], ASSERT_LINE); + altcpu->execute().set_input_line(pC148RegAlt[NAMCOS2_C148_CPUIRQ], ASSERT_LINE); } break; @@ -536,7 +536,7 @@ ReadWriteC148( address_space *space, offs_t offset, UINT16 data, int bWrite ) { // mame_printf_debug( "cpu(%d) RAM[0x%06x] = 0x%x\n", cpu, addr, data ); /* Dubious to assert IRQ for other CPU here: Rolling Thunder 2 and Fine Hour break. */ - // device_set_input_line(altcpu, pC148RegAlt[NAMCOS2_C148_CPUIRQ], ASSERT_LINE); + // altcpu->execute().set_input_line(pC148RegAlt[NAMCOS2_C148_CPUIRQ], ASSERT_LINE); } break; @@ -544,26 +544,26 @@ ReadWriteC148( address_space *space, offs_t offset, UINT16 data, int bWrite ) /* IRQ ack */ case 0x1d6000: /* NAMCOS2_C148_CPUIRQ */ // if( bWrite ) mame_printf_debug( "cpu(%d) RAM[0x%06x] = 0x%x\n", cpu, addr, data ); - device_set_input_line(&space->device(), pC148Reg[NAMCOS2_C148_CPUIRQ], CLEAR_LINE); + space->device().execute().set_input_line(pC148Reg[NAMCOS2_C148_CPUIRQ], CLEAR_LINE); break; case 0x1d8000: /* NAMCOS2_C148_EXIRQ */ // if( bWrite ) mame_printf_debug( "cpu(%d) RAM[0x%06x] = 0x%x\n", cpu, addr, data ); - device_set_input_line(&space->device(), pC148Reg[NAMCOS2_C148_EXIRQ], CLEAR_LINE); + space->device().execute().set_input_line(pC148Reg[NAMCOS2_C148_EXIRQ], CLEAR_LINE); break; case 0x1da000: /* NAMCOS2_C148_POSIRQ */ // if( bWrite ) mame_printf_debug( "cpu(%d) RAM[0x%06x] = 0x%x\n", cpu, addr, data ); - device_set_input_line(&space->device(), pC148Reg[NAMCOS2_C148_POSIRQ], CLEAR_LINE); + space->device().execute().set_input_line(pC148Reg[NAMCOS2_C148_POSIRQ], CLEAR_LINE); break; case 0x1dc000: /* NAMCOS2_C148_SERIRQ */ // if( bWrite ) mame_printf_debug( "cpu(%d) RAM[0x%06x] = 0x%x\n", cpu, addr, data ); - device_set_input_line(&space->device(), pC148Reg[NAMCOS2_C148_SERIRQ], CLEAR_LINE); + space->device().execute().set_input_line(pC148Reg[NAMCOS2_C148_SERIRQ], CLEAR_LINE); break; case 0x1de000: /* NAMCOS2_C148_VBLANKIRQ */ - device_set_input_line(&space->device(), pC148Reg[NAMCOS2_C148_VBLANKIRQ], CLEAR_LINE); + space->device().execute().set_input_line(pC148Reg[NAMCOS2_C148_VBLANKIRQ], CLEAR_LINE); break; @@ -578,7 +578,7 @@ ReadWriteC148( address_space *space, offs_t offset, UINT16 data, int bWrite ) { /* Resume execution */ space->machine().device("audiocpu")->execute().set_input_line(INPUT_LINE_RESET, CLEAR_LINE); - device_yield(&space->device()); + space->device().execute().yield(); } else { @@ -603,7 +603,7 @@ ReadWriteC148( address_space *space, offs_t offset, UINT16 data, int bWrite ) { /* Resume execution */ ResetAllSubCPUs(space->machine(), CLEAR_LINE); /* Give the new CPU an immediate slice of the action */ - device_yield(&space->device()); + space->device().execute().yield(); } else { /* Suspend execution */ @@ -687,14 +687,14 @@ INTERRUPT_GEN( namcos2_68k_master_vblank ) { namcos2_shared_state *state = device->machine().driver_data<namcos2_shared_state>(); if (!state->is_system21()) namcos2_adjust_posirq_timer(device->machine(), GetPosIRQScanline(device->machine())); - device_set_input_line(device, namcos2_68k_master_C148[NAMCOS2_C148_VBLANKIRQ], HOLD_LINE); + device->execute().set_input_line(namcos2_68k_master_C148[NAMCOS2_C148_VBLANKIRQ], HOLD_LINE); } INTERRUPT_GEN( namcos2_68k_slave_vblank ) { namcos2_shared_state *state = device->machine().driver_data<namcos2_shared_state>(); if (!state->is_system21()) namcos2_adjust_posirq_timer(device->machine(), GetPosIRQScanline(device->machine())); - device_set_input_line(device, namcos2_68k_slave_C148[NAMCOS2_C148_VBLANKIRQ], HOLD_LINE); + device->execute().set_input_line(namcos2_68k_slave_C148[NAMCOS2_C148_VBLANKIRQ], HOLD_LINE); } INTERRUPT_GEN( namcos2_68k_gpu_vblank ) @@ -705,7 +705,7 @@ INTERRUPT_GEN( namcos2_68k_gpu_vblank ) //printf( "namcos2_68k_gpu_vblank(%d)\n",namcos2_68k_gpu_C148[NAMCOS2_C148_POSIRQ] ); namcos2_adjust_posirq_timer(device->machine(), scanline); - device_set_input_line(device, namcos2_68k_gpu_C148[NAMCOS2_C148_VBLANKIRQ], HOLD_LINE); + device->execute().set_input_line(namcos2_68k_gpu_C148[NAMCOS2_C148_VBLANKIRQ], HOLD_LINE); } /**************************************************************/ |