Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-24 05:17:04 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Closeout on old macros. Retired cputag_set_input_line

Browse Source 
and cputag_set_input_line_and_vector, replacing them
with machine.device("tag")->execute().set_input_line[_and_vector].
[Aaron Giles]
This commit is contained in:
Aaron Giles 2012-09-12 03:35:06 +00:00
parent cd5dcbacd9
commit 0ef1e6deb4
713 changed files with 2209 additions and 2214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emu/cpu/psx/irq.c
View File

@ -61,12 +61,12 @@ void psxirq_device::psx_irq_update( void )
if( ( n_irqdata & n_irqmask ) != 0 )
{
verboselog( machine(), 2, "psx irq assert\n" );
cputag_set_input_line( machine(), "maincpu", PSXCPU_IRQ0, ASSERT_LINE );
machine().device("maincpu")->execute().set_input_line(PSXCPU_IRQ0, ASSERT_LINE );
}
else
{
verboselog( machine(), 2, "psx irq clear\n" );
cputag_set_input_line( machine(), "maincpu", PSXCPU_IRQ0, CLEAR_LINE );
machine().device("maincpu")->execute().set_input_line(PSXCPU_IRQ0, CLEAR_LINE );
}
}

5
src/emu/devcpu.h
View File

@ -292,11 +292,6 @@ const device_type name = &legacy_device_creator<basename##_device>
#define CPU_EXPORT_STRING_CALL(name) CPU_EXPORT_STRING_NAME(name)(device, entry, string)
// helpers for using machine/cputag instead of cpu objects
#define cputag_set_input_line(mach, tag, line, state) device_execute((mach).device(tag))->set_input_line(line, state)
#define cputag_set_input_line_and_vector(mach, tag, line, state, vec) device_execute((mach).device(tag))->set_input_line_and_vector(line, state, vec)
// this template function creates a stub which constructs a device
template<class _DeviceClass>
device_t *legacy_device_creator(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)

8
src/emu/machine/s3c24xx.c
View File

@ -1191,7 +1191,7 @@ static void s3c24xx_check_pending_irq( device_t *device)
if (s3c24xx->irq.line_irq != ASSERT_LINE)
{
verboselog( device->machine(), 5, "ARM7_IRQ_LINE -> ASSERT_LINE\n");
cputag_set_input_line( device->machine(), "maincpu", ARM7_IRQ_LINE, ASSERT_LINE);
device->machine().device("maincpu")->execute().set_input_line(ARM7_IRQ_LINE, ASSERT_LINE);
s3c24xx->irq.line_irq = ASSERT_LINE;
}
}
@ -1201,7 +1201,7 @@ static void s3c24xx_check_pending_irq( device_t *device)
{
verboselog( device->machine(), 5, "srcpnd %08X intmsk %08X intmod %08X\n", s3c24xx->irq.regs.srcpnd, s3c24xx->irq.regs.intmsk, s3c24xx->irq.regs.intmod);
verboselog( device->machine(), 5, "ARM7_IRQ_LINE -> CLEAR_LINE\n");
cputag_set_input_line( device->machine(), "maincpu", ARM7_IRQ_LINE, CLEAR_LINE);
device->machine().device("maincpu")->execute().set_input_line(ARM7_IRQ_LINE, CLEAR_LINE);
s3c24xx->irq.line_irq = CLEAR_LINE;
}
}
@ -1220,7 +1220,7 @@ static void s3c24xx_check_pending_irq( device_t *device)
if (s3c24xx->irq.line_fiq != ASSERT_LINE)
{
verboselog( device->machine(), 5, "ARM7_FIRQ_LINE -> ASSERT_LINE\n");
cputag_set_input_line( device->machine(), "maincpu", ARM7_FIRQ_LINE, ASSERT_LINE);
device->machine().device("maincpu")->execute().set_input_line(ARM7_FIRQ_LINE, ASSERT_LINE);
s3c24xx->irq.line_fiq = ASSERT_LINE;
}
}
@ -1229,7 +1229,7 @@ static void s3c24xx_check_pending_irq( device_t *device)
if (s3c24xx->irq.line_fiq != CLEAR_LINE)
{
verboselog( device->machine(), 5, "ARM7_FIRQ_LINE -> CLEAR_LINE\n");
cputag_set_input_line( device->machine(), "maincpu", ARM7_FIRQ_LINE, CLEAR_LINE);
device->machine().device("maincpu")->execute().set_input_line(ARM7_FIRQ_LINE, CLEAR_LINE);
s3c24xx->irq.line_fiq = CLEAR_LINE;
}
}

2
src/mame/audio/aztarac.c
View File

@ -22,7 +22,7 @@ WRITE16_MEMBER(aztarac_state::aztarac_sound_w)
soundlatch_byte_w(space, offset, data);
m_sound_status ^= 0x21;
if (m_sound_status & 0x20)
cputag_set_input_line(machine(), "audiocpu", 0, HOLD_LINE);
machine().device("audiocpu")->execute().set_input_line(0, HOLD_LINE);
}
}

2
src/mame/audio/beezer.c
View File

@ -138,7 +138,7 @@ INLINE beezer_sound_state *get_safe_token(device_t *device)
/*static WRITE_LINE_DEVICE_HANDLER( update_irq_state )
{
beezer_sound_state *sndstate = get_safe_token(device);
cputag_set_input_line(device->machine(), "audiocpu", M6809_IRQ_LINE, (sndstate->ptm_irq_state) ? ASSERT_LINE : CLEAR_LINE);
device->machine().device("audiocpu")->execute().set_input_line(M6809_IRQ_LINE, (sndstate->ptm_irq_state) ? ASSERT_LINE : CLEAR_LINE);
}*/

2
src/mame/audio/carnival.c
View File

@ -236,7 +236,7 @@ WRITE8_HANDLER( carnival_audio_2_w )
if ( bitsGoneHigh & OUT_PORT_2_MUSIC_RESET )
/* reset output is no longer asserted active low */
cputag_set_input_line(space->machine(), "audiocpu", INPUT_LINE_RESET, PULSE_LINE );
space->machine().device("audiocpu")->execute().set_input_line(INPUT_LINE_RESET, PULSE_LINE );
}

4
src/mame/audio/cchasm.c
View File

@ -47,7 +47,7 @@ WRITE8_MEMBER(cchasm_state::cchasm_soundlatch4_w)
{
m_sound_flags |= 0x40;
soundlatch4_byte_w(space, offset, data);
cputag_set_input_line(machine(), "maincpu", 1, HOLD_LINE);
machine().device("maincpu")->execute().set_input_line(1, HOLD_LINE);
}
WRITE16_MEMBER(cchasm_state::cchasm_io_w)
@ -66,7 +66,7 @@ WRITE16_MEMBER(cchasm_state::cchasm_io_w)
m_sound_flags |= 0x80;
soundlatch2_byte_w(space, offset, data);
m_ctc->trg2(1);
cputag_set_input_line(machine(), "audiocpu", INPUT_LINE_NMI, PULSE_LINE);
machine().device("audiocpu")->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
break;
case 2:
//led = data;

6
src/mame/audio/cyberbal.c
View File

@ -59,7 +59,7 @@ WRITE8_MEMBER(cyberbal_state::cyberbal_sound_bank_select_w)
membank("soundbank")->set_base(&m_bank_base[0x1000 * ((data >> 6) & 3)]);
coin_counter_w(machine(), 1, (data >> 5) & 1);
coin_counter_w(machine(), 0, (data >> 4) & 1);
cputag_set_input_line(machine(), "dac", INPUT_LINE_RESET, (data & 0x08) ? CLEAR_LINE : ASSERT_LINE);
machine().device("dac")->execute().set_input_line(INPUT_LINE_RESET, (data & 0x08) ? CLEAR_LINE : ASSERT_LINE);
if (!(data & 0x01)) devtag_reset(machine(), "ymsnd");
}
@ -95,8 +95,8 @@ WRITE8_MEMBER(cyberbal_state::cyberbal_sound_68k_6502_w)
static void update_sound_68k_interrupts(running_machine &machine)
{
cyberbal_state *state = machine.driver_data<cyberbal_state>();
cputag_set_input_line(machine, "dac", 6, state->m_fast_68k_int ? ASSERT_LINE : CLEAR_LINE);
cputag_set_input_line(machine, "dac", 2, state->m_io_68k_int ? ASSERT_LINE : CLEAR_LINE);
machine.device("dac")->execute().set_input_line(6, state->m_fast_68k_int ? ASSERT_LINE : CLEAR_LINE);
machine.device("dac")->execute().set_input_line(2, state->m_io_68k_int ? ASSERT_LINE : CLEAR_LINE);
}

4
src/mame/audio/dkong.c
View File

@ -1273,9 +1273,9 @@ static WRITE8_DEVICE_HANDLER( dkong_p1_w )
WRITE8_MEMBER(dkong_state::dkong_audio_irq_w)
{
if (data)
cputag_set_input_line(machine(), "soundcpu", 0, ASSERT_LINE);
machine().device("soundcpu")->execute().set_input_line(0, ASSERT_LINE);
else
cputag_set_input_line(machine(), "soundcpu", 0, CLEAR_LINE);
machine().device("soundcpu")->execute().set_input_line(0, CLEAR_LINE);
}

4
src/mame/audio/exidy.c
View File

@ -132,7 +132,7 @@ INLINE exidy_sound_state *get_safe_token(device_t *device)
static WRITE_LINE_DEVICE_HANDLER( update_irq_state )
{
exidy_sound_state *sndstate = get_safe_token(device);
cputag_set_input_line(device->machine(), "audiocpu", M6502_IRQ_LINE, (sndstate->m_pia1->irq_b_state() | sndstate->m_riot_irq_state) ? ASSERT_LINE : CLEAR_LINE);
device->machine().device("audiocpu")->execute().set_input_line(M6502_IRQ_LINE, (sndstate->m_pia1->irq_b_state() | sndstate->m_riot_irq_state) ? ASSERT_LINE : CLEAR_LINE);
}
@ -529,7 +529,7 @@ static WRITE8_DEVICE_HANDLER( r6532_porta_w )
{
exidy_sound_state *state = get_safe_token(device);
if (state->m_cvsd != NULL)
cputag_set_input_line(device->machine(), "cvsdcpu", INPUT_LINE_RESET, (data & 0x10) ? CLEAR_LINE : ASSERT_LINE);
device->machine().device("cvsdcpu")->execute().set_input_line(INPUT_LINE_RESET, (data & 0x10) ? CLEAR_LINE : ASSERT_LINE);
if (state->m_tms != NULL)
{

6
src/mame/audio/exidy440.c
View File

@ -377,7 +377,7 @@ static READ8_DEVICE_HANDLER( sound_command_r )
{
exidy440_audio_state *state = get_safe_token(device);
/* clear the FIRQ that got us here and acknowledge the read to the main CPU */
cputag_set_input_line(device->machine(), "audiocpu", 1, CLEAR_LINE);
device->machine().device("audiocpu")->execute().set_input_line(1, CLEAR_LINE);
state->sound_command_ack = 1;
return state->sound_command;
@ -389,7 +389,7 @@ void exidy440_sound_command(device_t *device, UINT8 param)
exidy440_audio_state *state = get_safe_token(device);
state->sound_command = param;
state->sound_command_ack = 0;
cputag_set_input_line(device->machine(), "audiocpu", INPUT_LINE_IRQ1, ASSERT_LINE);
device->machine().device("audiocpu")->execute().set_input_line(INPUT_LINE_IRQ1, ASSERT_LINE);
}
@ -436,7 +436,7 @@ static WRITE8_DEVICE_HANDLER( sound_volume_w )
static WRITE8_DEVICE_HANDLER( sound_interrupt_clear_w )
{
cputag_set_input_line(device->machine(), "audiocpu", 0, CLEAR_LINE);
device->machine().device("audiocpu")->execute().set_input_line(0, CLEAR_LINE);
}

6
src/mame/audio/irem.c
View File

@ -68,7 +68,7 @@ WRITE8_HANDLER( irem_sound_cmd_w )
if ((data & 0x80) == 0)
drvstate->soundlatch_byte_w(*space, 0, data & 0x7f);
else
cputag_set_input_line(space->machine(), "iremsound", 0, ASSERT_LINE);
space->machine().device("iremsound")->execute().set_input_line(0, ASSERT_LINE);
}
@ -182,7 +182,7 @@ static WRITE8_DEVICE_HANDLER( ay8910_1_porta_w )
static WRITE8_HANDLER( sound_irq_ack_w )
{
cputag_set_input_line(space->machine(), "iremsound", 0, CLEAR_LINE);
space->machine().device("iremsound")->execute().set_input_line(0, CLEAR_LINE);
}
@ -223,7 +223,7 @@ static void adpcm_int(device_t *device)
{
device_t *adpcm2 = device->machine().device("msm2");
cputag_set_input_line(device->machine(), "iremsound", INPUT_LINE_NMI, PULSE_LINE);
device->machine().device("iremsound")->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
/* the first MSM5205 clocks the second */
if (adpcm2 != NULL)

4
src/mame/audio/jedi.c
View File

@ -60,7 +60,7 @@ static SOUND_RESET( jedi )
WRITE8_MEMBER(jedi_state::irq_ack_w)
{
cputag_set_input_line(machine(), "audiocpu", M6502_IRQ_LINE, CLEAR_LINE);
machine().device("audiocpu")->execute().set_input_line(M6502_IRQ_LINE, CLEAR_LINE);
}
@ -73,7 +73,7 @@ WRITE8_MEMBER(jedi_state::irq_ack_w)
WRITE8_MEMBER(jedi_state::jedi_audio_reset_w)
{
cputag_set_input_line(machine(), "audiocpu", INPUT_LINE_RESET, (data & 1) ? CLEAR_LINE : ASSERT_LINE);
machine().device("audiocpu")->execute().set_input_line(INPUT_LINE_RESET, (data & 1) ? CLEAR_LINE : ASSERT_LINE);
}

6
src/mame/audio/leland.c
View File

@ -888,7 +888,7 @@ generate_int:
/* generate the appropriate interrupt */
state->m_i80186.intr.poll_status = 0x8000 | new_vector;
if (!state->m_i80186.intr.pending)
cputag_set_input_line(machine, "audiocpu", 0, ASSERT_LINE);
machine.device("audiocpu")->execute().set_input_line(0, ASSERT_LINE);
state->m_i80186.intr.pending = 1;
if (LOG_INTERRUPTS) logerror("(%f) **** Requesting interrupt vector %02X\n", machine.time().as_double(), new_vector);
}
@ -1840,14 +1840,14 @@ WRITE8_DEVICE_HANDLER( leland_80186_control_w )
}
/* /RESET */
cputag_set_input_line(device->machine(), "audiocpu", INPUT_LINE_RESET, data & 0x80 ? CLEAR_LINE : ASSERT_LINE);
device->machine().device("audiocpu")->execute().set_input_line(INPUT_LINE_RESET, data & 0x80 ? CLEAR_LINE : ASSERT_LINE);
/* /NMI */
/* If the master CPU doesn't get a response by the time it's ready to send
the next command, it uses an NMI to force the issue; unfortunately, this
seems to really screw up the sound system. It turns out it's better to
just wait for the original interrupt to occur naturally */
/* cputag_set_input_line(device->machine(), "audiocpu", INPUT_LINE_NMI, data & 0x40 ? CLEAR_LINE : ASSERT_LINE);*/
/* device->machine().device("audiocpu")->execute().set_input_line(INPUT_LINE_NMI, data & 0x40 ? CLEAR_LINE : ASSERT_LINE);*/
/* INT0 */
if (data & 0x20)

2
src/mame/audio/m72.c
View File

@ -117,7 +117,7 @@ static TIMER_CALLBACK( setvector_callback )
if (state->irqvector == 0)
logerror("You didn't call m72_init_sound()\n");
cputag_set_input_line_and_vector(machine, "soundcpu", 0, (state->irqvector == 0xff) ? CLEAR_LINE : ASSERT_LINE, state->irqvector);
machine.device("soundcpu")->execute().set_input_line_and_vector(0, (state->irqvector == 0xff) ? CLEAR_LINE : ASSERT_LINE, state->irqvector);
}
static DEVICE_START( m72_audio )

8
src/mame/audio/mario.c
View File

@ -400,7 +400,7 @@ static void set_ea(address_space &space, int ea)
{
mario_state *state = space.machine().driver_data<mario_state>();
//printf("ea: %d\n", ea);
//cputag_set_input_line(machine, "audiocpu", MCS48_INPUT_EA, (ea) ? ASSERT_LINE : CLEAR_LINE);
//machine.device("audiocpu")->execute().set_input_line(MCS48_INPUT_EA, (ea) ? ASSERT_LINE : CLEAR_LINE);
if (state->m_eabank != NULL)
state->membank(state->m_eabank)->set_entry(ea);
}
@ -520,7 +520,7 @@ WRITE8_MEMBER(mario_state::masao_sh_irqtrigger_w)
if (m_last == 1 && data == 0)
{
/* setting bit 0 high then low triggers IRQ on the sound CPU */
cputag_set_input_line_and_vector(machine(), "audiocpu", 0, HOLD_LINE, 0xff);
machine().device("audiocpu")->execute().set_input_line_and_vector(0, HOLD_LINE, 0xff);
}
m_last = data;
@ -553,9 +553,9 @@ WRITE8_MEMBER(mario_state::mario_sh3_w)
{
case 0: /* death */
if (data)
cputag_set_input_line(machine(), "audiocpu",0,ASSERT_LINE);
machine().device("audiocpu")->execute().set_input_line(0,ASSERT_LINE);
else
cputag_set_input_line(machine(), "audiocpu",0,CLEAR_LINE);
machine().device("audiocpu")->execute().set_input_line(0,CLEAR_LINE);
break;
case 1: /* get coin */
I8035_T_W_AH(space, 0,data & 1);

4
src/mame/audio/qix.c
View File

@ -133,7 +133,7 @@ static WRITE_LINE_DEVICE_HANDLER( qix_pia_dint )
int combined_state = pia->irq_a_state() | pia->irq_b_state();
/* DINT is connected to the data CPU's IRQ line */
cputag_set_input_line(device->machine(), "maincpu", M6809_IRQ_LINE, combined_state ? ASSERT_LINE : CLEAR_LINE);
device->machine().device("maincpu")->execute().set_input_line(M6809_IRQ_LINE, combined_state ? ASSERT_LINE : CLEAR_LINE);
}
@ -143,7 +143,7 @@ static WRITE_LINE_DEVICE_HANDLER( qix_pia_sint )
int combined_state = pia->irq_a_state() | pia->irq_b_state();
/* SINT is connected to the sound CPU's IRQ line */
cputag_set_input_line(device->machine(), "audiocpu", M6800_IRQ_LINE, combined_state ? ASSERT_LINE : CLEAR_LINE);
device->machine().device("audiocpu")->execute().set_input_line(M6800_IRQ_LINE, combined_state ? ASSERT_LINE : CLEAR_LINE);
}

6
src/mame/audio/redalert.c
View File

@ -70,7 +70,7 @@ WRITE8_MEMBER(redalert_state::redalert_audio_command_w)
/* D7 is also connected to the NMI input of the CPU -
the NMI is actually toggled by a 74121 */
if ((data & 0x80) == 0x00)
cputag_set_input_line(machine(), "audiocpu", INPUT_LINE_NMI, PULSE_LINE);
machine().device("audiocpu")->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
@ -155,7 +155,7 @@ static SOUND_START( redalert_audio )
WRITE8_MEMBER(redalert_state::redalert_voice_command_w)
{
soundlatch2_byte_w(space, 0, (data & 0x78) >> 3);
cputag_set_input_line(machine(), "voice", I8085_RST75_LINE, (~data & 0x80) ? ASSERT_LINE : CLEAR_LINE);
machine().device("voice")->execute().set_input_line(I8085_RST75_LINE, (~data & 0x80) ? ASSERT_LINE : CLEAR_LINE);
}
@ -282,7 +282,7 @@ WRITE8_MEMBER(redalert_state::demoneye_audio_command_w)
{
/* the byte is connected to port A of the AY8910 */
soundlatch_byte_w(space, 0, data);
cputag_set_input_line(machine(), "audiocpu", INPUT_LINE_NMI, PULSE_LINE);
machine().device("audiocpu")->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}

6
src/mame/audio/scramble.c
View File

@ -115,18 +115,18 @@ WRITE_LINE_DEVICE_HANDLER( scramble_sh_7474_q_callback )
/* the Q bar is connected to the Z80's INT line. But since INT is complemented, */
/* we need to complement Q bar */
if (device->machine().device("audiocpu"))
cputag_set_input_line(device->machine(), "audiocpu", 0, !state ? ASSERT_LINE : CLEAR_LINE);
device->machine().device("audiocpu")->execute().set_input_line(0, !state ? ASSERT_LINE : CLEAR_LINE);
}
WRITE8_MEMBER(scramble_state::hotshock_sh_irqtrigger_w)
{
cputag_set_input_line(machine(), "audiocpu", 0, ASSERT_LINE);
machine().device("audiocpu")->execute().set_input_line(0, ASSERT_LINE);
}
READ8_DEVICE_HANDLER( hotshock_soundlatch_r )
{
driver_device *drvstate = device->machine().driver_data<driver_device>();
cputag_set_input_line(device->machine(), "audiocpu", 0, CLEAR_LINE);
device->machine().device("audiocpu")->execute().set_input_line(0, CLEAR_LINE);
return drvstate->soundlatch_byte_r(*device->machine().device("audiocpu")->memory().space(AS_PROGRAM),0);
}

2
src/mame/audio/segag80r.c
View File

@ -973,7 +973,7 @@ static WRITE8_DEVICE_HANDLER( n7751_command_w )
D3 = /INT line
*/
state->m_n7751_command = data & 0x07;
cputag_set_input_line(device->machine(), "audiocpu", 0, ((data & 0x08) == 0) ? ASSERT_LINE : CLEAR_LINE);
device->machine().device("audiocpu")->execute().set_input_line(0, ((data & 0x08) == 0) ? ASSERT_LINE : CLEAR_LINE);
device->machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(100));
}

2
src/mame/audio/segasnd.c
View File

@ -308,7 +308,7 @@ static TIMER_CALLBACK( delayed_speech_w )
state->latch = data;
/* the high bit goes directly to the INT line */
cputag_set_input_line(machine, "audiocpu", 0, (data & 0x80) ? CLEAR_LINE : ASSERT_LINE);
machine.device("audiocpu")->execute().set_input_line(0, (data & 0x80) ? CLEAR_LINE : ASSERT_LINE);
/* a clock on the high bit clocks a 1 into T0 */
if (!(old & 0x80) && (data & 0x80))

2
src/mame/audio/spacefb.c
View File

@ -33,7 +33,7 @@ WRITE8_MEMBER(spacefb_state::spacefb_port_1_w)
{
samples_device *samples = machine().device<samples_device>("samples");
cputag_set_input_line(machine(), "audiocpu", 0, (data & 0x02) ? CLEAR_LINE : ASSERT_LINE);
machine().device("audiocpu")->execute().set_input_line(0, (data & 0x02) ? CLEAR_LINE : ASSERT_LINE);
/* enemy killed */
if (!(data & 0x01) && (m_sound_latch & 0x01)) samples->start(0,0);

4
src/mame/audio/starwars.c
View File

@ -59,7 +59,7 @@ static WRITE8_DEVICE_HANDLER( r6532_porta_w )
static WRITE_LINE_DEVICE_HANDLER( snd_interrupt )
{
cputag_set_input_line(device->machine(), "audiocpu", M6809_IRQ_LINE, state);
device->machine().device("audiocpu")->execute().set_input_line(M6809_IRQ_LINE, state);
}
@ -144,5 +144,5 @@ WRITE8_MEMBER(starwars_state::starwars_soundrst_w)
riot6532_porta_in_set(m_riot, 0x00, 0xc0);
/* reset sound CPU here */
cputag_set_input_line(machine(), "audiocpu", INPUT_LINE_RESET, PULSE_LINE);
machine().device("audiocpu")->execute().set_input_line(INPUT_LINE_RESET, PULSE_LINE);
}

2
src/mame/audio/taito_en.c
View File

@ -234,7 +234,7 @@ SOUND_RESET( taito_en_soundsystem_reset )
/* reset CPU to catch any banking of startup vectors */
machine.device("audiocpu")->reset();
//cputag_set_input_line(machine, "audiocpu", INPUT_LINE_RESET, ASSERT_LINE);
//machine.device("audiocpu")->execute().set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
snd_shared_ram = (UINT32 *)machine.root_device().memshare("snd_shared")->ptr();
}

4
src/mame/drivers/1942.c
View File

@ -79,10 +79,10 @@ static TIMER_DEVICE_CALLBACK( c1942_scanline )
int scanline = param;
if(scanline == 240) // vblank-out irq
cputag_set_input_line_and_vector(timer.machine(), "maincpu", 0, HOLD_LINE, 0xd7); /* RST 10h - vblank */
timer.machine().device("maincpu")->execute().set_input_line_and_vector(0, HOLD_LINE, 0xd7); /* RST 10h - vblank */
if(scanline == 0) // unknown irq event, presumably vblank-in or a periodic one (writes to the soundlatch and drives freeze dip-switch)
cputag_set_input_line_and_vector(timer.machine(), "maincpu", 0, HOLD_LINE, 0xcf); /* RST 08h */
timer.machine().device("maincpu")->execute().set_input_line_and_vector(0, HOLD_LINE, 0xcf); /* RST 08h */
}

4
src/mame/drivers/2mindril.c
View File

@ -186,10 +186,10 @@ WRITE16_MEMBER(_2mindril_state::drill_irq_w)
---- ---- -??- -??? connected to the other levels?
*/
if(((irq_reg & 8) == 0) && data & 8)
cputag_set_input_line(machine(), "maincpu", 4, CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(4, CLEAR_LINE);
if(((irq_reg & 0x10) == 0) && data & 0x10)
cputag_set_input_line(machine(), "maincpu", 5, CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(5, CLEAR_LINE);
if(data & 0xffe7)
printf("%04x\n",data);

4
src/mame/drivers/39in1.c
View File

@ -724,8 +724,8 @@ static void pxa255_update_interrupts(running_machine& machine)
intc_regs->icfp = (intc_regs->icpr & intc_regs->icmr) & intc_regs->iclr;
intc_regs->icip = (intc_regs->icpr & intc_regs->icmr) & (~intc_regs->iclr);
cputag_set_input_line(machine, "maincpu", ARM7_FIRQ_LINE, intc_regs->icfp ? ASSERT_LINE : CLEAR_LINE);
cputag_set_input_line(machine, "maincpu", ARM7_IRQ_LINE, intc_regs->icip ? ASSERT_LINE : CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(ARM7_FIRQ_LINE, intc_regs->icfp ? ASSERT_LINE : CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(ARM7_IRQ_LINE, intc_regs->icip ? ASSERT_LINE : CLEAR_LINE);
}
static void pxa255_set_irq_line(running_machine& machine, UINT32 line, int irq_state)

2
src/mame/drivers/40love.c
View File

@ -1034,7 +1034,7 @@ static MACHINE_RESET( common )
static MACHINE_RESET( 40love )
{
cputag_set_input_line(machine, "mcu", 0, CLEAR_LINE);
machine.device("mcu")->execute().set_input_line(0, CLEAR_LINE);
MACHINE_RESET_CALL(common);
}

4
src/mame/drivers/5clown.c
View File

@ -641,12 +641,12 @@ WRITE8_MEMBER(_5clown_state::trigsnd_w)
if ( (data & 0x0f) == 0x07 )
{
cputag_set_input_line(machine(), "audiocpu", INPUT_LINE_NMI, ASSERT_LINE );
machine().device("audiocpu")->execute().set_input_line(INPUT_LINE_NMI, ASSERT_LINE );
}
else
{
cputag_set_input_line(machine(), "audiocpu", INPUT_LINE_NMI, CLEAR_LINE );
machine().device("audiocpu")->execute().set_input_line(INPUT_LINE_NMI, CLEAR_LINE );
}
}

2
src/mame/drivers/acefruit.c
View File

@ -55,7 +55,7 @@ static void acefruit_update_irq(running_machine &machine, int vpos )
switch( color )
{
case 0x0c:
cputag_set_input_line(machine, "maincpu", 0, HOLD_LINE );
machine.device("maincpu")->execute().set_input_line(0, HOLD_LINE );
break;
}
}

4
src/mame/drivers/acommand.c
View File

@ -590,10 +590,10 @@ static TIMER_DEVICE_CALLBACK( acommand_scanline )
int scanline = param;
if(scanline == 240) // vblank-out irq
cputag_set_input_line(timer.machine(), "maincpu", 2, HOLD_LINE);
timer.machine().device("maincpu")->execute().set_input_line(2, HOLD_LINE);
if(scanline == 0) // vblank-in irq? (update palette and layers)
cputag_set_input_line(timer.machine(), "maincpu", 3, HOLD_LINE);
timer.machine().device("maincpu")->execute().set_input_line(3, HOLD_LINE);
}
static MACHINE_CONFIG_START( acommand, acommand_state )

2
src/mame/drivers/aeroboto.c
View File

@ -51,7 +51,7 @@ static INTERRUPT_GEN( aeroboto_interrupt )
READ8_MEMBER(aeroboto_state::aeroboto_irq_ack_r)
{
cputag_set_input_line(machine(),"maincpu", 0, CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(0, CLEAR_LINE);
return 0xff;
}

4
src/mame/drivers/airbustr.c
View File

@ -553,11 +553,11 @@ static TIMER_DEVICE_CALLBACK( airbustr_scanline )
int scanline = param;
if(scanline == 240) // vblank-out irq
cputag_set_input_line_and_vector(timer.machine(), "master", 0, HOLD_LINE, 0xff);
timer.machine().device("master")->execute().set_input_line_and_vector(0, HOLD_LINE, 0xff);
/* Pandora "sprite end dma" irq? TODO: timing is likely off */
if(scanline == 64)
cputag_set_input_line_and_vector(timer.machine(), "master", 0, HOLD_LINE, 0xfd);
timer.machine().device("master")->execute().set_input_line_and_vector(0, HOLD_LINE, 0xfd);
}
/* Sub Z80 uses IM2 too, but 0xff irq routine just contains an irq ack in it */

2
src/mame/drivers/alien.c
View File

@ -74,7 +74,7 @@ INPUT_PORTS_END
void alien_state::machine_reset()
{
//cputag_set_input_line(machine(), "maincpu", INPUT_LINE_HALT, ASSERT_LINE);
//machine().device("maincpu")->execute().set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
}
static MACHINE_CONFIG_START( alien, alien_state )

4
src/mame/drivers/arabian.c
View File

@ -81,8 +81,8 @@ WRITE8_MEMBER(arabian_state::ay8910_portb_w)
bit 0 = coin 1 counter
*/
cputag_set_input_line(machine(), "mcu", MB88_IRQ_LINE, data & 0x20 ? CLEAR_LINE : ASSERT_LINE);
cputag_set_input_line(machine(), "mcu", INPUT_LINE_RESET, data & 0x10 ? CLEAR_LINE : ASSERT_LINE);
machine().device("mcu")->execute().set_input_line(MB88_IRQ_LINE, data & 0x20 ? CLEAR_LINE : ASSERT_LINE);
machine().device("mcu")->execute().set_input_line(INPUT_LINE_RESET, data & 0x10 ? CLEAR_LINE : ASSERT_LINE);
/* clock the coin counters */
coin_counter_w(machine(), 1, ~data & 0x02);

2
src/mame/drivers/arcadecl.c
View File

@ -85,7 +85,7 @@
static void update_interrupts(running_machine &machine)
{
arcadecl_state *state = machine.driver_data<arcadecl_state>();
cputag_set_input_line(machine, "maincpu", 4, state->m_scanline_int_state ? ASSERT_LINE : CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(4, state->m_scanline_int_state ? ASSERT_LINE : CLEAR_LINE);
}

10
src/mame/drivers/argus.c
View File

@ -134,10 +134,10 @@ static TIMER_DEVICE_CALLBACK( argus_scanline )
int scanline = param;
if(scanline == 240) // vblank-out irq
cputag_set_input_line_and_vector(timer.machine(), "maincpu", 0, HOLD_LINE,0xd7); /* RST 10h */
timer.machine().device("maincpu")->execute().set_input_line_and_vector(0, HOLD_LINE,0xd7); /* RST 10h */
if(scanline == 16) // vblank-in irq
cputag_set_input_line_and_vector(timer.machine(), "maincpu", 0, HOLD_LINE,0xcf); /* RST 08h */
timer.machine().device("maincpu")->execute().set_input_line_and_vector(0, HOLD_LINE,0xcf); /* RST 08h */
}
static TIMER_DEVICE_CALLBACK( butasan_scanline )
@ -145,16 +145,16 @@ static TIMER_DEVICE_CALLBACK( butasan_scanline )
int scanline = param;
if(scanline == 248) // vblank-out irq
cputag_set_input_line_and_vector(timer.machine(), "maincpu", 0, HOLD_LINE,0xd7); /* RST 10h */
timer.machine().device("maincpu")->execute().set_input_line_and_vector(0, HOLD_LINE,0xd7); /* RST 10h */
if(scanline == 8) // vblank-in irq
cputag_set_input_line_and_vector(timer.machine(), "maincpu", 0, HOLD_LINE,0xcf); /* RST 08h */
timer.machine().device("maincpu")->execute().set_input_line_and_vector(0, HOLD_LINE,0xcf); /* RST 08h */
}
/* Handler called by the YM2203 emulator when the internal timers cause an IRQ */
static void irqhandler(device_t *device, int irq)
{
cputag_set_input_line(device->machine(), "audiocpu", 0, irq ? ASSERT_LINE : CLEAR_LINE);
device->machine().device("audiocpu")->execute().set_input_line(0, irq ? ASSERT_LINE : CLEAR_LINE);
}
static const ym2203_interface ym2203_config =

4
src/mame/drivers/aristmk4.c
View File

@ -1521,7 +1521,7 @@ static const ay8910_interface ay8910_config2 =
WRITE8_MEMBER(aristmk4_state::firq)
{
cputag_set_input_line(machine(), "maincpu", M6809_FIRQ_LINE, data ? ASSERT_LINE : CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(M6809_FIRQ_LINE, data ? ASSERT_LINE : CLEAR_LINE);
}
static const via6522_interface via_interface =
@ -1672,7 +1672,7 @@ static TIMER_DEVICE_CALLBACK( aristmk4_pf )
if(timer.machine().root_device().ioport("powerfail")->read()) // send NMI signal if L pressed
{
cputag_set_input_line( timer.machine(), "maincpu", INPUT_LINE_NMI, ASSERT_LINE );
timer.machine().device("maincpu")->execute().set_input_line(INPUT_LINE_NMI, ASSERT_LINE );
}
}

2
src/mame/drivers/aristmk5.c
View File

@ -182,7 +182,7 @@ READ32_MEMBER(aristmk5_state::Ns5x58)
// reset 2KHz timer
m_mk5_2KHz_timer->adjust(attotime::from_hz(1953.125));
ioc_regs[IRQ_STATUS_A] &= ~0x01;
cputag_set_input_line(machine(), "maincpu", ARM_IRQ_LINE, CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(ARM_IRQ_LINE, CLEAR_LINE);
return 0xffffffff;
}

6
src/mame/drivers/armedf.c
View File

@ -332,7 +332,7 @@ WRITE16_MEMBER(armedf_state::terrafb_io_w)
{
if(data & 0x4000 && ((m_vreg & 0x4000) == 0)) //0 -> 1 transition
cputag_set_input_line(machine(), "extra", 0, HOLD_LINE);
machine().device("extra")->execute().set_input_line(0, HOLD_LINE);
COMBINE_DATA(&m_vreg);
@ -372,12 +372,12 @@ READ8_MEMBER(armedf_state::soundlatch_clear_r)
WRITE16_MEMBER(armedf_state::irq_lv1_ack_w)
{
cputag_set_input_line(machine(), "maincpu", 1, CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(1, CLEAR_LINE);
}
WRITE16_MEMBER(armedf_state::irq_lv2_ack_w)
{
cputag_set_input_line(machine(), "maincpu", 2, CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(2, CLEAR_LINE);
}

4
src/mame/drivers/artmagic.c
View File

@ -45,8 +45,8 @@
static void update_irq_state(running_machine &machine)
{
artmagic_state *state = machine.driver_data<artmagic_state>();
cputag_set_input_line(machine, "maincpu", 4, state->m_tms_irq ? ASSERT_LINE : CLEAR_LINE);
cputag_set_input_line(machine, "maincpu", 5, state->m_hack_irq ? ASSERT_LINE : CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(4, state->m_tms_irq ? ASSERT_LINE : CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(5, state->m_hack_irq ? ASSERT_LINE : CLEAR_LINE);
}

2
src/mame/drivers/astrocde.c
View File

@ -522,7 +522,7 @@ static const ay8910_interface ay8912_interface =
WRITE8_MEMBER(astrocde_state::tenpindx_sound_w)
{
soundlatch_byte_w(space, offset, data);
cputag_set_input_line(machine(), "sub", INPUT_LINE_NMI, PULSE_LINE);
machine().device("sub")->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}

4
src/mame/drivers/astrocorp.c
View File

@ -513,10 +513,10 @@ static TIMER_DEVICE_CALLBACK( skilldrp_scanline )
int scanline = param;
if(scanline == 240) // vblank-out irq. controls sprites, sound, i/o
cputag_set_input_line(timer.machine(), "maincpu", 4, HOLD_LINE);
timer.machine().device("maincpu")->execute().set_input_line(4, HOLD_LINE);
if(scanline == 0) // vblank-in? controls palette
cputag_set_input_line(timer.machine(), "maincpu", 2, HOLD_LINE);
timer.machine().device("maincpu")->execute().set_input_line(2, HOLD_LINE);
}
static MACHINE_CONFIG_START( skilldrp, astrocorp_state )

2
src/mame/drivers/asuka.c
View File

@ -771,7 +771,7 @@ GFXDECODE_END
static void irq_handler(device_t *device, int irq)
{
cputag_set_input_line(device->machine(), "audiocpu", 0, irq ? ASSERT_LINE : CLEAR_LINE);
device->machine().device("audiocpu")->execute().set_input_line(0, irq ? ASSERT_LINE : CLEAR_LINE);
}
static const ym2610_interface ym2610_config =

4
src/mame/drivers/atarig1.c
View File

@ -35,8 +35,8 @@
static void update_interrupts(running_machine &machine)
{
atarig1_state *state = machine.driver_data<atarig1_state>();
cputag_set_input_line(machine, "maincpu", 1, state->m_video_int_state ? ASSERT_LINE : CLEAR_LINE);
cputag_set_input_line(machine, "maincpu", 2, state->m_sound_int_state ? ASSERT_LINE : CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(1, state->m_video_int_state ? ASSERT_LINE : CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(2, state->m_sound_int_state ? ASSERT_LINE : CLEAR_LINE);
}

6
src/mame/drivers/atarig42.c
View File

@ -34,8 +34,8 @@
static void update_interrupts(running_machine &machine)
{
atarig42_state *state = machine.driver_data<atarig42_state>();
cputag_set_input_line(machine, "maincpu", 4, state->m_video_int_state ? ASSERT_LINE : CLEAR_LINE);
cputag_set_input_line(machine, "maincpu", 5, state->m_sound_int_state ? ASSERT_LINE : CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(4, state->m_video_int_state ? ASSERT_LINE : CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(5, state->m_sound_int_state ? ASSERT_LINE : CLEAR_LINE);
}
@ -111,7 +111,7 @@ WRITE16_MEMBER(atarig42_state::io_latch_w)
if (ACCESSING_BITS_0_7)
{
/* bit 4 resets the sound CPU */
cputag_set_input_line(machine(), "jsa", INPUT_LINE_RESET, (data & 0x10) ? CLEAR_LINE : ASSERT_LINE);
machine().device("jsa")->execute().set_input_line(INPUT_LINE_RESET, (data & 0x10) ? CLEAR_LINE : ASSERT_LINE);
if (!(data & 0x10)) atarijsa_reset();
/* bit 5 is /XRESET, probably related to the ASIC */

6
src/mame/drivers/atarigt.c
View File

@ -50,9 +50,9 @@ static void cage_irq_callback(running_machine &machine, int reason);
static void update_interrupts(running_machine &machine)
{
atarigt_state *state = machine.driver_data<atarigt_state>();
cputag_set_input_line(machine, "maincpu", 3, state->m_sound_int_state ? ASSERT_LINE : CLEAR_LINE);
cputag_set_input_line(machine, "maincpu", 4, state->m_video_int_state ? ASSERT_LINE : CLEAR_LINE);
cputag_set_input_line(machine, "maincpu", 6, state->m_scanline_int_state ? ASSERT_LINE : CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(3, state->m_sound_int_state ? ASSERT_LINE : CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(4, state->m_video_int_state ? ASSERT_LINE : CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(6, state->m_scanline_int_state ? ASSERT_LINE : CLEAR_LINE);
}

6
src/mame/drivers/atarigx2.c
View File

@ -36,8 +36,8 @@
static void update_interrupts(running_machine &machine)
{
atarigx2_state *state = machine.driver_data<atarigx2_state>();
cputag_set_input_line(machine, "maincpu", 4, state->m_video_int_state ? ASSERT_LINE : CLEAR_LINE);
cputag_set_input_line(machine, "maincpu", 5, state->m_sound_int_state ? ASSERT_LINE : CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(4, state->m_video_int_state ? ASSERT_LINE : CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(5, state->m_sound_int_state ? ASSERT_LINE : CLEAR_LINE);
}
@ -123,7 +123,7 @@ WRITE32_MEMBER(atarigx2_state::latch_w)
/* lower byte */
if (ACCESSING_BITS_16_23)
cputag_set_input_line(machine(), "jsa", INPUT_LINE_RESET, (data & 0x100000) ? CLEAR_LINE : ASSERT_LINE);
machine().device("jsa")->execute().set_input_line(INPUT_LINE_RESET, (data & 0x100000) ? CLEAR_LINE : ASSERT_LINE);
}

8
src/mame/drivers/atarisy1.c
View File

@ -210,10 +210,10 @@ RoadBlasters (aka Future Vette):005*
static void update_interrupts(running_machine &machine)
{
atarisy1_state *state = machine.driver_data<atarisy1_state>();
cputag_set_input_line(machine, "maincpu", 2, state->m_joystick_int && state->m_joystick_int_enable ? ASSERT_LINE : CLEAR_LINE);
cputag_set_input_line(machine, "maincpu", 3, state->m_scanline_int_state ? ASSERT_LINE : CLEAR_LINE);
cputag_set_input_line(machine, "maincpu", 4, state->m_video_int_state ? ASSERT_LINE : CLEAR_LINE);
cputag_set_input_line(machine, "maincpu", 6, state->m_sound_int_state ? ASSERT_LINE : CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(2, state->m_joystick_int && state->m_joystick_int_enable ? ASSERT_LINE : CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(3, state->m_scanline_int_state ? ASSERT_LINE : CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(4, state->m_video_int_state ? ASSERT_LINE : CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(6, state->m_sound_int_state ? ASSERT_LINE : CLEAR_LINE);
}

18
src/mame/drivers/atarisy2.c
View File

@ -160,24 +160,24 @@ static void update_interrupts(running_machine &machine)
atarisy2_state *state = machine.driver_data<atarisy2_state>();
if (state->m_video_int_state)
cputag_set_input_line(machine, "maincpu", 3, ASSERT_LINE);
machine.device("maincpu")->execute().set_input_line(3, ASSERT_LINE);
else
cputag_set_input_line(machine, "maincpu", 3, CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(3, CLEAR_LINE);
if (state->m_scanline_int_state)
cputag_set_input_line(machine, "maincpu", 2, ASSERT_LINE);
machine.device("maincpu")->execute().set_input_line(2, ASSERT_LINE);
else
cputag_set_input_line(machine, "maincpu", 2, CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(2, CLEAR_LINE);
if (state->m_p2portwr_state)
cputag_set_input_line(machine, "maincpu", 1, ASSERT_LINE);
machine.device("maincpu")->execute().set_input_line(1, ASSERT_LINE);
else
cputag_set_input_line(machine, "maincpu", 1, CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(1, CLEAR_LINE);
if (state->m_p2portrd_state)
cputag_set_input_line(machine, "maincpu", 0, ASSERT_LINE);
machine.device("maincpu")->execute().set_input_line(0, ASSERT_LINE);
else
cputag_set_input_line(machine, "maincpu", 0, CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(0, CLEAR_LINE);
}
@ -283,7 +283,7 @@ WRITE16_MEMBER(atarisy2_state::int1_ack_w)
{
/* reset sound CPU */
if (ACCESSING_BITS_0_7)
cputag_set_input_line(machine(), "soundcpu", INPUT_LINE_RESET, (data & 1) ? ASSERT_LINE : CLEAR_LINE);
machine().device("soundcpu")->execute().set_input_line(INPUT_LINE_RESET, (data & 1) ? ASSERT_LINE : CLEAR_LINE);
}

18
src/mame/drivers/atarisy4.c
View File

@ -482,7 +482,7 @@ WRITE16_MEMBER(atarisy4_state::gpu_w)
gpu.mcr = data;
if (~data & 0x08)
cputag_set_input_line(machine(), "maincpu", 6, CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(6, CLEAR_LINE);
break;
}
@ -517,7 +517,7 @@ READ16_MEMBER(atarisy4_state::gpu_r)
static INTERRUPT_GEN( vblank_int )
{
if (gpu.mcr & 0x08)
cputag_set_input_line(device->machine(), "maincpu", 6, ASSERT_LINE);
device->machine().device("maincpu")->execute().set_input_line(6, ASSERT_LINE);
}
@ -562,8 +562,8 @@ READ16_MEMBER(atarisy4_state::dsp0_status_r)
WRITE16_MEMBER(atarisy4_state::dsp0_control_w)
{
cputag_set_input_line(machine(), "dsp0", INPUT_LINE_RESET, data & 0x01 ? CLEAR_LINE : ASSERT_LINE);
cputag_set_input_line(machine(), "dsp0", 0, data & 0x02 ? ASSERT_LINE : CLEAR_LINE);
machine().device("dsp0")->execute().set_input_line(INPUT_LINE_RESET, data & 0x01 ? CLEAR_LINE : ASSERT_LINE);
machine().device("dsp0")->execute().set_input_line(0, data & 0x02 ? ASSERT_LINE : CLEAR_LINE);
m_csr[0] = data;
}
@ -596,8 +596,8 @@ READ16_MEMBER(atarisy4_state::dsp1_status_r)
WRITE16_MEMBER(atarisy4_state::dsp1_control_w)
{
cputag_set_input_line(machine(), "dsp1", INPUT_LINE_RESET, data & 0x01 ? CLEAR_LINE : ASSERT_LINE);
cputag_set_input_line(machine(), "dsp1", 0, data & 0x02 ? ASSERT_LINE : CLEAR_LINE);
machine().device("dsp1")->execute().set_input_line(INPUT_LINE_RESET, data & 0x01 ? CLEAR_LINE : ASSERT_LINE);
machine().device("dsp1")->execute().set_input_line(0, data & 0x02 ? ASSERT_LINE : CLEAR_LINE);
m_csr[1] = data;
}
@ -1001,13 +1001,13 @@ DRIVER_INIT_MEMBER(atarisy4_state,airrace)
static MACHINE_RESET( atarisy4 )
{
cputag_set_input_line(machine, "dsp0", INPUT_LINE_RESET, ASSERT_LINE);
machine.device("dsp0")->execute().set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
}
static MACHINE_RESET( airrace )
{
cputag_set_input_line(machine, "dsp0", INPUT_LINE_RESET, ASSERT_LINE);
cputag_set_input_line(machine, "dsp1", INPUT_LINE_RESET, ASSERT_LINE);
machine.device("dsp0")->execute().set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
machine.device("dsp1")->execute().set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
}

4
src/mame/drivers/atetris.c
View File

@ -72,7 +72,7 @@ static TIMER_CALLBACK( interrupt_gen )
int scanline = param;
/* assert/deassert the interrupt */
cputag_set_input_line(machine, "maincpu", 0, (scanline & 32) ? ASSERT_LINE : CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(0, (scanline & 32) ? ASSERT_LINE : CLEAR_LINE);
/* set the next timer */
scanline += 32;
@ -84,7 +84,7 @@ static TIMER_CALLBACK( interrupt_gen )
WRITE8_MEMBER(atetris_state::irq_ack_w)
{
cputag_set_input_line(machine(), "maincpu", 0, CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(0, CLEAR_LINE);
}

6
src/mame/drivers/badlands.c
View File

@ -180,8 +180,8 @@ Measurements -
static void update_interrupts(running_machine &machine)
{
badlands_state *state = machine.driver_data<badlands_state>();
cputag_set_input_line(machine, "maincpu", 1, state->m_video_int_state ? ASSERT_LINE : CLEAR_LINE);
cputag_set_input_line(machine, "maincpu", 2, state->m_sound_int_state ? ASSERT_LINE : CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(1, state->m_video_int_state ? ASSERT_LINE : CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(2, state->m_sound_int_state ? ASSERT_LINE : CLEAR_LINE);
}
@ -678,7 +678,7 @@ GFXDECODE_END
static void update_interrupts_bootleg(running_machine &machine)
{
badlands_state *state = machine.driver_data<badlands_state>();
cputag_set_input_line(machine, "maincpu", 1, state->m_video_int_state ? ASSERT_LINE : CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(1, state->m_video_int_state ? ASSERT_LINE : CLEAR_LINE);
}

2
src/mame/drivers/baraduke.c
View File

@ -155,7 +155,7 @@ WRITE8_MEMBER(baraduke_state::baraduke_lamps_w)
WRITE8_MEMBER(baraduke_state::baraduke_irq_ack_w)
{
cputag_set_input_line(machine(), "maincpu", 0, CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(0, CLEAR_LINE);
}

8
src/mame/drivers/batman.c
View File

@ -34,8 +34,8 @@
static void update_interrupts(running_machine &machine)
{
batman_state *state = machine.driver_data<batman_state>();
cputag_set_input_line(machine, "maincpu", 4, state->m_scanline_int_state ? ASSERT_LINE : CLEAR_LINE);
cputag_set_input_line(machine, "maincpu", 6, state->m_sound_int_state ? ASSERT_LINE : CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(4, state->m_scanline_int_state ? ASSERT_LINE : CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(6, state->m_sound_int_state ? ASSERT_LINE : CLEAR_LINE);
}
@ -103,9 +103,9 @@ WRITE16_MEMBER(batman_state::latch_w)
/* bit 4 is connected to the /RESET pin on the 6502 */
if (m_latch_data & 0x0010)
cputag_set_input_line(machine(), "jsa", INPUT_LINE_RESET, CLEAR_LINE);
machine().device("jsa")->execute().set_input_line(INPUT_LINE_RESET, CLEAR_LINE);
else
cputag_set_input_line(machine(), "jsa", INPUT_LINE_RESET, ASSERT_LINE);
machine().device("jsa")->execute().set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
/* alpha bank is selected by the upper 4 bits */
if ((oldword ^ m_latch_data) & 0x7000)

4
src/mame/drivers/battlera.c
View File

@ -36,7 +36,7 @@ WRITE8_MEMBER(battlera_state::battlera_sound_w)
if (offset == 0)
{
soundlatch_byte_w(space,0,data);
cputag_set_input_line(machine(), "audiocpu", 0, HOLD_LINE);
machine().device("audiocpu")->execute().set_input_line(0, HOLD_LINE);
}
}
@ -92,7 +92,7 @@ static void battlera_adpcm_int(device_t *device)
state->m_toggle = 1 - state->m_toggle;
if (state->m_toggle)
cputag_set_input_line(device->machine(), "audiocpu", 1, HOLD_LINE);
device->machine().device("audiocpu")->execute().set_input_line(1, HOLD_LINE);
}
WRITE8_MEMBER(battlera_state::battlera_adpcm_data_w)

2
src/mame/drivers/battlex.c
View File

@ -60,7 +60,7 @@ CUSTOM_INPUT_MEMBER(battlex_state::battlex_in0_b4_r)
UINT32 ret = m_in0_b4;
if (m_in0_b4)
{
cputag_set_input_line(machine(), "maincpu", 0, CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(0, CLEAR_LINE);
m_in0_b4 = 0;
}

4
src/mame/drivers/bbusters.c
View File

@ -254,7 +254,7 @@ WRITE16_MEMBER(bbusters_state::sound_cpu_w)
if (ACCESSING_BITS_0_7)
{
soundlatch_byte_w(space, 0, data&0xff);
cputag_set_input_line(machine(), "audiocpu", INPUT_LINE_NMI, PULSE_LINE);
machine().device("audiocpu")->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
}
@ -639,7 +639,7 @@ GFXDECODE_END
static void sound_irq( device_t *device, int irq )
{
cputag_set_input_line(device->machine(), "audiocpu", 0, irq ? ASSERT_LINE : CLEAR_LINE);
device->machine().device("audiocpu")->execute().set_input_line(0, irq ? ASSERT_LINE : CLEAR_LINE);
}
static const ym2608_interface ym2608_config =

6
src/mame/drivers/beathead.c
View File

@ -154,7 +154,7 @@ static TIMER_DEVICE_CALLBACK( scanline_callback )
/* on scanline zero, clear any halt condition */
if (scanline == 0)
cputag_set_input_line(timer.machine(), "maincpu", INPUT_LINE_HALT, CLEAR_LINE);
timer.machine().device("maincpu")->execute().set_input_line(INPUT_LINE_HALT, CLEAR_LINE);
/* wrap around at 262 */
scanline++;
@ -222,7 +222,7 @@ void beathead_state::update_interrupts()
{
m_irq_line_state = gen_int;
//if (m_irq_line_state != CLEAR_LINE)
cputag_set_input_line(machine(), "maincpu", ASAP_IRQ0, m_irq_line_state);
machine().device("maincpu")->execute().set_input_line(ASAP_IRQ0, m_irq_line_state);
//else
//asap_set_irq_line(ASAP_IRQ0, m_irq_line_state);
}
@ -317,7 +317,7 @@ WRITE32_MEMBER( beathead_state::sound_data_w )
WRITE32_MEMBER( beathead_state::sound_reset_w )
{
logerror("Sound reset = %d\n", !offset);
cputag_set_input_line(machine(), "jsa", INPUT_LINE_RESET, offset ? CLEAR_LINE : ASSERT_LINE);
machine().device("jsa")->execute().set_input_line(INPUT_LINE_RESET, offset ? CLEAR_LINE : ASSERT_LINE);
}

4
src/mame/drivers/berzerk.c
View File

@ -188,7 +188,7 @@ static TIMER_CALLBACK( irq_callback )
/* set the IRQ line if enabled */
if (state->m_irq_enabled)
cputag_set_input_line_and_vector(machine, "maincpu", 0, HOLD_LINE, 0xfc);
machine.device("maincpu")->execute().set_input_line_and_vector(0, HOLD_LINE, 0xfc);
/* set up for next interrupt */
next_irq_number = (irq_number + 1) % IRQS_PER_FRAME;
@ -268,7 +268,7 @@ static TIMER_CALLBACK( nmi_callback )
/* pulse the NMI line if enabled */
if (state->m_nmi_enabled)
cputag_set_input_line(machine, "maincpu", INPUT_LINE_NMI, PULSE_LINE);
machine.device("maincpu")->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
/* set up for next interrupt */
next_nmi_number = (nmi_number + 1) % NMIS_PER_FRAME;

4
src/mame/drivers/bfcobra.c
View File

@ -879,7 +879,7 @@ static void update_irqs(running_machine &machine)
if (newstate != state->m_irq_state)
{
state->m_irq_state = newstate;
cputag_set_input_line(machine, "maincpu", 0, state->m_irq_state ? ASSERT_LINE : CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(0, state->m_irq_state ? ASSERT_LINE : CLEAR_LINE);
}
}
@ -1657,7 +1657,7 @@ WRITE_LINE_MEMBER(bfcobra_state::m6809_acia_tx_w)
WRITE_LINE_MEMBER(bfcobra_state::m6809_data_irq)
{
cputag_set_input_line(machine(), "audiocpu", M6809_IRQ_LINE, state ? CLEAR_LINE : ASSERT_LINE);
machine().device("audiocpu")->execute().set_input_line(M6809_IRQ_LINE, state ? CLEAR_LINE : ASSERT_LINE);
}
static ACIA6850_INTERFACE( m6809_acia_if )

2
src/mame/drivers/bfm_sc1.c
View File

@ -611,7 +611,7 @@ WRITE8_MEMBER(bfm_sc1_state::nec_latch_w)
WRITE8_MEMBER(bfm_sc1_state::vid_uart_tx_w)
{
adder2_send(data);
cputag_set_input_line(machine(), "adder2", M6809_IRQ_LINE, ASSERT_LINE );//HOLD_LINE);// trigger IRQ
machine().device("adder2")->execute().set_input_line(M6809_IRQ_LINE, ASSERT_LINE );//HOLD_LINE);// trigger IRQ
}
///////////////////////////////////////////////////////////////////////////

4
src/mame/drivers/bfm_sc2.c
View File

@ -620,7 +620,7 @@ WRITE8_MEMBER(bfm_sc2_state::mmtr_w)
MechMtr_update(i, data & (1 << i) );
}
}
if ( data & 0x1F ) cputag_set_input_line(machine(), "maincpu", M6809_FIRQ_LINE, ASSERT_LINE );
if ( data & 0x1F ) machine().device("maincpu")->execute().set_input_line(M6809_FIRQ_LINE, ASSERT_LINE );
}
///////////////////////////////////////////////////////////////////////////
@ -1036,7 +1036,7 @@ WRITE8_MEMBER(bfm_sc2_state::uart2data_w)
WRITE8_MEMBER(bfm_sc2_state::vid_uart_tx_w)
{
adder2_send(data);
cputag_set_input_line(machine(), "adder2", M6809_IRQ_LINE, HOLD_LINE );
machine().device("adder2")->execute().set_input_line(M6809_IRQ_LINE, HOLD_LINE );
LOG_SERIAL(("sadder %02X (%c)\n",data, data ));
}

2
src/mame/drivers/big10.c
View File

@ -86,7 +86,7 @@ public:
static void big10_vdp_interrupt(device_t *, v99x8_device &device, int i)
{
cputag_set_input_line (device.machine(), "maincpu", 0, (i ? ASSERT_LINE : CLEAR_LINE));
device.machine().device("maincpu")->execute().set_input_line(0, (i ? ASSERT_LINE : CLEAR_LINE));
}
static TIMER_DEVICE_CALLBACK( big10_interrupt )

2
src/mame/drivers/bingoc.c
View File

@ -91,7 +91,7 @@ READ8_MEMBER(bingoc_state::sound_test_r)
WRITE16_MEMBER(bingoc_state::main_sound_latch_w)
{
soundlatch_byte_w(space,0,data&0xff);
cputag_set_input_line(machine(), "soundcpu", INPUT_LINE_NMI, PULSE_LINE);
machine().device("soundcpu")->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
#endif

4
src/mame/drivers/bionicc.c
View File

@ -128,10 +128,10 @@ static TIMER_DEVICE_CALLBACK( bionicc_scanline )
int scanline = param;
if(scanline == 240) // vblank-out irq
cputag_set_input_line(timer.machine(), "maincpu", 2, HOLD_LINE);
timer.machine().device("maincpu")->execute().set_input_line(2, HOLD_LINE);
if(scanline == 0) // vblank-in or i8751 related irq
cputag_set_input_line(timer.machine(), "maincpu", 4, HOLD_LINE);
timer.machine().device("maincpu")->execute().set_input_line(4, HOLD_LINE);
}

4
src/mame/drivers/bishi.c
View File

@ -114,10 +114,10 @@ static TIMER_DEVICE_CALLBACK( bishi_scanline )
if (state->m_cur_control & 0x800)
{
if(scanline == 240) // vblank-out irq
cputag_set_input_line(timer.machine(), "maincpu", M68K_IRQ_3, HOLD_LINE);
timer.machine().device("maincpu")->execute().set_input_line(M68K_IRQ_3, HOLD_LINE);
if(scanline == 0) // vblank-in irq
cputag_set_input_line(timer.machine(), "maincpu", M68K_IRQ_4, HOLD_LINE);
timer.machine().device("maincpu")->execute().set_input_line(M68K_IRQ_4, HOLD_LINE);
}
}

4
src/mame/drivers/bking.c
View File

@ -169,7 +169,7 @@ WRITE8_MEMBER(bking_state::bking3_68705_port_b_w)
if (~data & 0x02)
{
m_port_a_in = from_main;
if (main_sent) cputag_set_input_line(machine(), "mcu", 0, CLEAR_LINE);
if (main_sent) machine().device("mcu")->execute().set_input_line(0, CLEAR_LINE);
main_sent = 0;
}
@ -457,7 +457,7 @@ static MACHINE_RESET( bking3 )
{
bking_state *state = machine.driver_data<bking_state>();
cputag_set_input_line(machine, "mcu", 0, CLEAR_LINE);
machine.device("mcu")->execute().set_input_line(0, CLEAR_LINE);
MACHINE_RESET_CALL(bking);

4
src/mame/drivers/bladestl.c
View File

@ -42,10 +42,10 @@ static TIMER_DEVICE_CALLBACK( bladestl_scanline )
int scanline = param;
if(scanline == 240 && k007342_is_int_enabled(state->m_k007342)) // vblank-out irq
cputag_set_input_line(timer.machine(), "maincpu", HD6309_FIRQ_LINE, HOLD_LINE);
timer.machine().device("maincpu")->execute().set_input_line(HD6309_FIRQ_LINE, HOLD_LINE);
if(scanline == 0) // vblank-in or timer irq
cputag_set_input_line(timer.machine(), "maincpu", INPUT_LINE_NMI, PULSE_LINE);
timer.machine().device("maincpu")->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
/*************************************

8
src/mame/drivers/blitz68k.c
View File

@ -581,7 +581,7 @@ READ16_MEMBER(blitz68k_state::test_r)
WRITE16_MEMBER(blitz68k_state::irq_callback_w)
{
// popmessage("%02x",data);
cputag_set_input_line(machine(), "maincpu", 3, HOLD_LINE );
machine().device("maincpu")->execute().set_input_line(3, HOLD_LINE );
}
WRITE16_MEMBER(blitz68k_state::sound_write_w)
@ -1647,17 +1647,17 @@ static MC6845_ON_UPDATE_ADDR_CHANGED(crtc_addr)
WRITE_LINE_MEMBER(blitz68k_state::crtc_vsync_irq1)
{
cputag_set_input_line(machine(), "maincpu", 1, state ? ASSERT_LINE : CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(1, state ? ASSERT_LINE : CLEAR_LINE);
}
WRITE_LINE_MEMBER(blitz68k_state::crtc_vsync_irq3)
{
cputag_set_input_line(machine(), "maincpu", 3, state ? ASSERT_LINE : CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(3, state ? ASSERT_LINE : CLEAR_LINE);
}
WRITE_LINE_MEMBER(blitz68k_state::crtc_vsync_irq5)
{
cputag_set_input_line(machine(), "maincpu", 5, state ? ASSERT_LINE : CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(5, state ? ASSERT_LINE : CLEAR_LINE);
}
const mc6845_interface mc6845_intf_irq1 =

6
src/mame/drivers/blstroid.c
View File

@ -35,9 +35,9 @@
static void update_interrupts(running_machine &machine)
{
blstroid_state *state = machine.driver_data<blstroid_state>();
cputag_set_input_line(machine, "maincpu", 1, state->m_scanline_int_state ? ASSERT_LINE : CLEAR_LINE);
cputag_set_input_line(machine, "maincpu", 2, state->m_video_int_state ? ASSERT_LINE : CLEAR_LINE);
cputag_set_input_line(machine, "maincpu", 4, state->m_sound_int_state ? ASSERT_LINE : CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(1, state->m_scanline_int_state ? ASSERT_LINE : CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(2, state->m_video_int_state ? ASSERT_LINE : CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(4, state->m_sound_int_state ? ASSERT_LINE : CLEAR_LINE);
}

2
src/mame/drivers/bmcbowl.c
View File

@ -260,7 +260,7 @@ WRITE8_MEMBER(bmcbowl_state::via_ca2_out)
WRITE8_MEMBER(bmcbowl_state::via_irq)
{
cputag_set_input_line(machine(), "maincpu", 4, data ? ASSERT_LINE : CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(4, data ? ASSERT_LINE : CLEAR_LINE);
}

4
src/mame/drivers/bnstars.c
View File

@ -1338,7 +1338,7 @@ static void irq_init(running_machine &machine)
{
bnstars_state *state = machine.driver_data<bnstars_state>();
state->m_irqreq = 0;
cputag_set_input_line(machine, "maincpu", 0, CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(0, CLEAR_LINE);
device_set_irq_callback(machine.device("maincpu"), irq_callback);
}
@ -1346,7 +1346,7 @@ static void irq_raise(running_machine &machine, int level)
{
bnstars_state *state = machine.driver_data<bnstars_state>();
state->m_irqreq |= (1<<level);
cputag_set_input_line(machine, "maincpu", 0, ASSERT_LINE);
machine.device("maincpu")->execute().set_input_line(0, ASSERT_LINE);
}
/* TODO: fix this arrangement (derived from old deprecat lib) */

2
src/mame/drivers/buggychl.c
View File

@ -379,7 +379,7 @@ static MACHINE_RESET( buggychl )
{
buggychl_state *state = machine.driver_data<buggychl_state>();
cputag_set_input_line(machine, "mcu", 0, CLEAR_LINE);
machine.device("mcu")->execute().set_input_line(0, CLEAR_LINE);
state->m_sound_nmi_enable = 0;
state->m_pending_nmi = 0;

2
src/mame/drivers/bwidow.c
View File

@ -343,7 +343,7 @@ WRITE8_MEMBER(bwidow_state::bwidow_misc_w)
WRITE8_MEMBER(bwidow_state::irq_ack_w)
{
cputag_set_input_line(machine(), "maincpu", 0, CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(0, CLEAR_LINE);
}

4
src/mame/drivers/bwing.c
View File

@ -193,12 +193,12 @@ ADDRESS_MAP_END
INPUT_CHANGED_MEMBER(bwing_state::coin_inserted)
{
cputag_set_input_line(machine(), "maincpu", INPUT_LINE_NMI, newval ? CLEAR_LINE : ASSERT_LINE);
machine().device("maincpu")->execute().set_input_line(INPUT_LINE_NMI, newval ? CLEAR_LINE : ASSERT_LINE);
}
INPUT_CHANGED_MEMBER(bwing_state::tilt_pressed)
{
cputag_set_input_line(machine(), "maincpu", M6809_FIRQ_LINE, newval ? ASSERT_LINE : CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(M6809_FIRQ_LINE, newval ? ASSERT_LINE : CLEAR_LINE);
}
static INPUT_PORTS_START( bwing )

2
src/mame/drivers/byvid.c
View File

@ -103,7 +103,7 @@ INPUT_PORTS_END
WRITE_LINE_MEMBER(by133_state::vdp_interrupt)
{
cputag_set_input_line(machine(), "videocpu", M6809_IRQ_LINE, state ? ASSERT_LINE : CLEAR_LINE);
machine().device("videocpu")->execute().set_input_line(M6809_IRQ_LINE, state ? ASSERT_LINE : CLEAR_LINE);
}
static TMS9928A_INTERFACE(byvid_tms9928a_interface)

4
src/mame/drivers/cabal.c
View File

@ -111,7 +111,7 @@ WRITE16_MEMBER(cabal_state::cabal_sound_irq_trigger_word_w)
WRITE16_MEMBER(cabal_state::cabalbl_sound_irq_trigger_word_w)
{
cputag_set_input_line(machine(), "audiocpu", INPUT_LINE_NMI, PULSE_LINE );
machine().device("audiocpu")->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE );
}
@ -468,7 +468,7 @@ GFXDECODE_END
static void irqhandler(device_t *device, int irq)
{
cputag_set_input_line(device->machine(), "audiocpu", 0, irq ? ASSERT_LINE : CLEAR_LINE);
device->machine().device("audiocpu")->execute().set_input_line(0, irq ? ASSERT_LINE : CLEAR_LINE);
}
static const ym2151_interface cabalbl_ym2151_interface =

6
src/mame/drivers/calchase.c
View File

@ -236,7 +236,7 @@ WRITE8_MEMBER(calchase_state::at_page8_w)
WRITE_LINE_MEMBER(calchase_state::pc_dma_hrq_changed)
{
cputag_set_input_line(machine(), "maincpu", INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE);
/* Assert HLDA */
i8237_hlda_w( m_dma8237_1, state );
@ -824,7 +824,7 @@ static MACHINE_START(calchase)
WRITE_LINE_MEMBER(calchase_state::calchase_pic8259_1_set_int_line)
{
cputag_set_input_line(machine(), "maincpu", 0, state ? HOLD_LINE : CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(0, state ? HOLD_LINE : CLEAR_LINE);
}
READ8_MEMBER(calchase_state::get_slave_ack)
@ -885,7 +885,7 @@ static MACHINE_RESET(calchase)
static void set_gate_a20(running_machine &machine, int a20)
{
cputag_set_input_line(machine, "maincpu", INPUT_LINE_A20, a20);
machine.device("maincpu")->execute().set_input_line(INPUT_LINE_A20, a20);
}
static void keyboard_interrupt(running_machine &machine, int state)

2
src/mame/drivers/cave.c
View File

@ -1829,7 +1829,7 @@ static const ymz280b_interface ymz280b_intf =
static void irqhandler(device_t *device, int irq)
{
cputag_set_input_line(device->machine(), "audiocpu", 0, irq ? ASSERT_LINE : CLEAR_LINE);
device->machine().device("audiocpu")->execute().set_input_line(0, irq ? ASSERT_LINE : CLEAR_LINE);
}
static const ym2151_interface ym2151_config =

2
src/mame/drivers/ccastles.c
View File

@ -229,7 +229,7 @@ static MACHINE_START( ccastles )
static MACHINE_RESET( ccastles )
{
ccastles_state *state = machine.driver_data<ccastles_state>();
cputag_set_input_line(machine, "maincpu", 0, CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(0, CLEAR_LINE);
state->m_irq_state = 0;
}

2
src/mame/drivers/cchasm.c
View File

@ -69,7 +69,7 @@ ADDRESS_MAP_END
WRITE_LINE_MEMBER(cchasm_state::cchasm_6840_irq)
{
cputag_set_input_line(machine(), "maincpu", 4, state ? ASSERT_LINE : CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(4, state ? ASSERT_LINE : CLEAR_LINE);
}
static const ptm6840_interface cchasm_6840_intf =

2
src/mame/drivers/cclimber.c
View File

@ -217,7 +217,7 @@ Dip location verified from manual for: cclimber, guzzler, swimmer
WRITE8_MEMBER(cclimber_state::swimmer_sh_soundlatch_w)
{
soundlatch_byte_w(space,offset,data);
cputag_set_input_line_and_vector(machine(), "audiocpu", 0, HOLD_LINE, 0xff);
machine().device("audiocpu")->execute().set_input_line_and_vector(0, HOLD_LINE, 0xff);
}

6
src/mame/drivers/centiped.c
View File

@ -447,7 +447,7 @@ static TIMER_DEVICE_CALLBACK( generate_interrupt )
/* IRQ is clocked on the rising edge of 16V, equal to the previous 32V */
if (scanline & 16)
cputag_set_input_line(timer.machine(), "maincpu", 0, ((scanline - 1) & 32) ? ASSERT_LINE : CLEAR_LINE);
timer.machine().device("maincpu")->execute().set_input_line(0, ((scanline - 1) & 32) ? ASSERT_LINE : CLEAR_LINE);
/* do a partial update now to handle sprite multiplexing (Maze Invaders) */
timer.machine().primary_screen->update_partial(scanline);
@ -469,7 +469,7 @@ static MACHINE_RESET( centiped )
{
centiped_state *state = machine.driver_data<centiped_state>();
cputag_set_input_line(machine, "maincpu", 0, CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(0, CLEAR_LINE);
state->m_dsw_select = 0;
state->m_control_select = 0;
state->m_prg_bank = 0;
@ -489,7 +489,7 @@ static MACHINE_RESET( magworm )
WRITE8_MEMBER(centiped_state::irq_ack_w)
{
cputag_set_input_line(machine(), "maincpu", 0, CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(0, CLEAR_LINE);
}

2
src/mame/drivers/cham24.c
View File

@ -280,7 +280,7 @@ static PALETTE_INIT( cham24 )
static void ppu_irq( device_t *device, int *ppu_regs )
{
cputag_set_input_line(device->machine(), "maincpu", INPUT_LINE_NMI, PULSE_LINE);
device->machine().device("maincpu")->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
/* our ppu interface */

4
src/mame/drivers/changela.c
View File

@ -407,9 +407,9 @@ TIMER_DEVICE_CALLBACK( changela_scanline )
int scanline = param;
if(scanline == 256) // vblank irq
cputag_set_input_line_and_vector(timer.machine(), "maincpu", 0, HOLD_LINE,0xdf);
timer.machine().device("maincpu")->execute().set_input_line_and_vector(0, HOLD_LINE,0xdf);
else if(((scanline % 64) == 0)) // timer irq, 3 times per given vblank field
cputag_set_input_line_and_vector(timer.machine(), "maincpu", 0, HOLD_LINE,0xcf);
timer.machine().device("maincpu")->execute().set_input_line_and_vector(0, HOLD_LINE,0xcf);
}
static INTERRUPT_GEN( chl_mcu_irq )

2
src/mame/drivers/chihiro.c
View File

@ -1553,7 +1553,7 @@ int ide_baseboard_device::write_sector(UINT32 lba, const void *buffer)
static WRITE_LINE_DEVICE_HANDLER( chihiro_pic8259_1_set_int_line )
{
cputag_set_input_line(device->machine(), "maincpu", 0, state ? HOLD_LINE : CLEAR_LINE);
device->machine().device("maincpu")->execute().set_input_line(0, state ? HOLD_LINE : CLEAR_LINE);
}
static READ8_DEVICE_HANDLER( get_slave_ack )

4
src/mame/drivers/chqflag.c
View File

@ -32,9 +32,9 @@ static TIMER_DEVICE_CALLBACK( chqflag_scanline )
int scanline = param;
if(scanline == 240 && k051960_is_irq_enabled(state->m_k051960)) // vblank irq
cputag_set_input_line(timer.machine(), "maincpu", KONAMI_IRQ_LINE, HOLD_LINE);
timer.machine().device("maincpu")->execute().set_input_line(KONAMI_IRQ_LINE, HOLD_LINE);
else if(((scanline % 32) == 0) && (k051960_is_nmi_enabled(state->m_k051960))) // timer irq
cputag_set_input_line(timer.machine(), "maincpu", INPUT_LINE_NMI, PULSE_LINE);
timer.machine().device("maincpu")->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
WRITE8_MEMBER(chqflag_state::chqflag_bankswitch_w)

2
src/mame/drivers/cidelsa.c
View File

@ -278,7 +278,7 @@ CUSTOM_INPUT_MEMBER(cidelsa_state::cdp1869_pcb_r)
INPUT_CHANGED_MEMBER(cidelsa_state::ef_w)
{
cputag_set_input_line(machine(), CDP1802_TAG, (int)(FPTR)param, newval);
machine().device(CDP1802_TAG)->execute().set_input_line((int)(FPTR)param, newval);
}
static INPUT_PORTS_START( destryer )

4
src/mame/drivers/circus.c
View File

@ -53,7 +53,7 @@ D000 Paddle Position and Interrupt Reset (where applicable)
READ8_MEMBER(circus_state::circus_paddle_r)
{
// also clears irq
cputag_set_input_line(machine(), "maincpu", 0, CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(0, CLEAR_LINE);
return ioport("PADDLE")->read();
}
@ -360,7 +360,7 @@ static TIMER_DEVICE_CALLBACK( crash_scanline )
int scanline = param;
if(scanline == 256 || scanline == 0) // vblank-out / in irq
cputag_set_input_line(timer.machine(), "maincpu", 0, ASSERT_LINE);
timer.machine().device("maincpu")->execute().set_input_line(0, ASSERT_LINE);
}
static MACHINE_CONFIG_START( crash, circus_state )

14
src/mame/drivers/cischeat.c
View File

@ -1538,13 +1538,13 @@ static TIMER_DEVICE_CALLBACK( bigrun_scanline )
int scanline = param;
if(scanline == 240) // vblank-out irq
cputag_set_input_line(timer.machine(), "cpu1", 4, HOLD_LINE);
timer.machine().device("cpu1")->execute().set_input_line(4, HOLD_LINE);
if(scanline == 154)
cputag_set_input_line(timer.machine(), "cpu1", 2, HOLD_LINE);
timer.machine().device("cpu1")->execute().set_input_line(2, HOLD_LINE);
if(scanline == 69)
cputag_set_input_line(timer.machine(), "cpu1", 1, HOLD_LINE);
timer.machine().device("cpu1")->execute().set_input_line(1, HOLD_LINE);
}
@ -1696,10 +1696,10 @@ static TIMER_DEVICE_CALLBACK( scudhamm_scanline )
int scanline = param;
if(scanline == 240) // vblank-out irq
cputag_set_input_line(timer.machine(), "maincpu", 3, HOLD_LINE);
timer.machine().device("maincpu")->execute().set_input_line(3, HOLD_LINE);
if(scanline == 120) // timer irq (clears a flag, presumably sprite DMA end)
cputag_set_input_line(timer.machine(), "maincpu", 2, HOLD_LINE);
timer.machine().device("maincpu")->execute().set_input_line(2, HOLD_LINE);
}
static MACHINE_CONFIG_START( scudhamm, cischeat_state )
@ -1746,10 +1746,10 @@ static TIMER_DEVICE_CALLBACK( armchamp2_scanline )
int scanline = param;
if(scanline == 240) // vblank-out irq
cputag_set_input_line(timer.machine(), "maincpu", 2, HOLD_LINE);
timer.machine().device("maincpu")->execute().set_input_line(2, HOLD_LINE);
if(scanline == 120) // timer irq (TODO: timing)
cputag_set_input_line(timer.machine(), "maincpu", 4, HOLD_LINE);
timer.machine().device("maincpu")->execute().set_input_line(4, HOLD_LINE);
}
static MACHINE_CONFIG_DERIVED( armchmp2, scudhamm )

6
src/mame/drivers/cliffhgr.c
View File

@ -161,7 +161,7 @@ WRITE8_MEMBER(cliffhgr_state::cliff_coin_counter_w)
READ8_MEMBER(cliffhgr_state::cliff_irq_ack_r)
{
/* deassert IRQ on the CPU */
cputag_set_input_line(machine(), "maincpu", 0, CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(0, CLEAR_LINE);
return 0x00;
}
@ -206,7 +206,7 @@ static TIMER_CALLBACK( cliff_irq_callback )
if (state->m_phillips_code & 0x800000)
{
// printf("%2d:code = %06X\n", param, phillips_code);
cputag_set_input_line(machine, "maincpu", 0, ASSERT_LINE);
machine.device("maincpu")->execute().set_input_line(0, ASSERT_LINE);
}
state->m_irq_timer->adjust(machine.primary_screen->time_until_pos(param * 2), param);
@ -214,7 +214,7 @@ static TIMER_CALLBACK( cliff_irq_callback )
WRITE_LINE_MEMBER(cliffhgr_state::vdp_interrupt)
{
cputag_set_input_line(machine(), "maincpu", INPUT_LINE_NMI, state ? ASSERT_LINE : CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(INPUT_LINE_NMI, state ? ASSERT_LINE : CLEAR_LINE);
}

4
src/mame/drivers/cloak.c
View File

@ -142,12 +142,12 @@ WRITE8_MEMBER(cloak_state::cloak_custom_w)
WRITE8_MEMBER(cloak_state::cloak_irq_reset_0_w)
{
cputag_set_input_line(machine(), "maincpu", 0, CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(0, CLEAR_LINE);
}
WRITE8_MEMBER(cloak_state::cloak_irq_reset_1_w)
{
cputag_set_input_line(machine(), "slave", 0, CLEAR_LINE);
machine().device("slave")->execute().set_input_line(0, CLEAR_LINE);
}
WRITE8_MEMBER(cloak_state::cloak_nvram_enable_w)

2
src/mame/drivers/cloud9.c
View File

@ -194,7 +194,7 @@ static MACHINE_START( cloud9 )
static MACHINE_RESET( cloud9 )
{
cloud9_state *state = machine.driver_data<cloud9_state>();
cputag_set_input_line(machine, "maincpu", 0, CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(0, CLEAR_LINE);
state->m_irq_state = 0;
}

16
src/mame/drivers/cobra.c
View File

@ -1231,7 +1231,7 @@ void cobra_state::m2sfifo_event_callback(cobra_fifo::EventType event)
{
case cobra_fifo::EVENT_EMPTY:
{
cputag_set_input_line(machine(), "subcpu", INPUT_LINE_IRQ0, CLEAR_LINE);
machine().device("subcpu")->execute().set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE);
// give sub cpu a bit more time to stabilize on the current fifo status
device_spin_until_time(machine().device("maincpu"), attotime::from_usec(1));
@ -1241,7 +1241,7 @@ void cobra_state::m2sfifo_event_callback(cobra_fifo::EventType event)
if (!m_m2s_int_mode)
m_main_int_active |= MAIN_INT_M2S;
cputag_set_input_line(machine(), "maincpu", INPUT_LINE_IRQ0, ASSERT_LINE);
machine().device("maincpu")->execute().set_input_line(INPUT_LINE_IRQ0, ASSERT_LINE);
}
// EXISR needs to update for the *next* instruction during FIFO tests
@ -1427,7 +1427,7 @@ WRITE64_MEMBER(cobra_state::main_fifo_w)
if (!m_m2s_int_mode)
m_main_int_active &= ~MAIN_INT_M2S;
cputag_set_input_line(space.machine(), "subcpu", INPUT_LINE_IRQ0, ASSERT_LINE);
space.machine().device("subcpu")->execute().set_input_line(INPUT_LINE_IRQ0, ASSERT_LINE);
// EXISR needs to update for the *next* instruction during FIFO tests
// TODO: try to abort the timeslice before the next instruction?
@ -1484,7 +1484,7 @@ WRITE64_MEMBER(cobra_state::main_fifo_w)
if ((m_vblank_enable & 0x80) == 0)
{
// clear the interrupt
cputag_set_input_line(space.machine(), "maincpu", INPUT_LINE_IRQ0, CLEAR_LINE);
space.machine().device("maincpu")->execute().set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE);
}
}
if (ACCESSING_BITS_16_23)
@ -1503,7 +1503,7 @@ WRITE64_MEMBER(cobra_state::main_fifo_w)
m_main_int_active &= ~MAIN_INT_S2M;
// clear the interrupt
cputag_set_input_line(space.machine(), "maincpu", INPUT_LINE_IRQ0, CLEAR_LINE);
space.machine().device("maincpu")->execute().set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE);
}
}
if (ACCESSING_BITS_8_15)
@ -1529,7 +1529,7 @@ WRITE64_MEMBER(cobra_state::main_fifo_w)
m_main_int_active &= ~MAIN_INT_M2S;
// clear the interrupt
cputag_set_input_line(space.machine(), "maincpu", INPUT_LINE_IRQ0, CLEAR_LINE);
space.machine().device("maincpu")->execute().set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE);
}
}
@ -1722,7 +1722,7 @@ WRITE32_MEMBER(cobra_state::sub_mainbd_w)
// fire off an interrupt if enabled
if (m_s2m_int_enable & 0x80)
{
cputag_set_input_line(space.machine(), "maincpu", INPUT_LINE_IRQ0, ASSERT_LINE);
space.machine().device("maincpu")->execute().set_input_line(INPUT_LINE_IRQ0, ASSERT_LINE);
}
}
if (ACCESSING_BITS_16_23)
@ -3192,7 +3192,7 @@ static INTERRUPT_GEN( cobra_vblank )
if (cobra->m_vblank_enable & 0x80)
{
cputag_set_input_line(device->machine(), "maincpu", INPUT_LINE_IRQ0, ASSERT_LINE);
device->machine().device("maincpu")->execute().set_input_line(INPUT_LINE_IRQ0, ASSERT_LINE);
cobra->m_gfx_unk_flag = 0x80;
}
}

2
src/mame/drivers/compgolf.c
View File

@ -200,7 +200,7 @@ GFXDECODE_END
static void sound_irq(device_t *device, int linestate)
{
cputag_set_input_line(device->machine(), "maincpu", 0, linestate);
device->machine().device("maincpu")->execute().set_input_line(0, linestate);
}
static const ym2203_interface ym2203_config =

14
src/mame/drivers/coolpool.c
View File

@ -225,7 +225,7 @@ WRITE16_MEMBER(coolpool_state::amerdart_misc_w)
/* bits 10-15 are counted down over time */
cputag_set_input_line(machine(), "dsp", INPUT_LINE_RESET, (data & 0x0400) ? ASSERT_LINE : CLEAR_LINE);
machine().device("dsp")->execute().set_input_line(INPUT_LINE_RESET, (data & 0x0400) ? ASSERT_LINE : CLEAR_LINE);
}
READ16_MEMBER(coolpool_state::amerdart_dsp_bio_line_r)
@ -251,7 +251,7 @@ READ16_MEMBER(coolpool_state::amerdart_iop_r)
{
// logerror("%08x:IOP read %04x\n",space.device().safe_pc(),m_iop_answer);
cputag_set_input_line(machine(), "maincpu", 1, CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(1, CLEAR_LINE);
return m_iop_answer;
}
@ -277,7 +277,7 @@ WRITE16_MEMBER(coolpool_state::amerdart_dsp_answer_w)
// logerror("%08x:DSP answer %04x\n", space.device().safe_pc(), data);
m_iop_answer = data;
cputag_set_input_line(machine(), "maincpu", 1, ASSERT_LINE);
machine().device("maincpu")->execute().set_input_line(1, ASSERT_LINE);
}
@ -444,7 +444,7 @@ WRITE16_MEMBER(coolpool_state::coolpool_misc_w)
coin_counter_w(machine(), 0, ~data & 0x0001);
coin_counter_w(machine(), 1, ~data & 0x0002);
cputag_set_input_line(machine(), "dsp", INPUT_LINE_RESET, (data & 0x0400) ? ASSERT_LINE : CLEAR_LINE);
machine().device("dsp")->execute().set_input_line(INPUT_LINE_RESET, (data & 0x0400) ? ASSERT_LINE : CLEAR_LINE);
}
@ -462,7 +462,7 @@ static TIMER_CALLBACK( deferred_iop_w )
state->m_iop_cmd = param;
state->m_cmd_pending = 1;
cputag_set_input_line(machine, "dsp", 0, HOLD_LINE); /* ??? I have no idea who should generate this! */
machine.device("dsp")->execute().set_input_line(0, HOLD_LINE); /* ??? I have no idea who should generate this! */
/* the DSP polls the status bit so it isn't strictly */
/* necessary to also have an IRQ */
machine.scheduler().boost_interleave(attotime::zero, attotime::from_usec(50));
@ -480,7 +480,7 @@ READ16_MEMBER(coolpool_state::coolpool_iop_r)
{
logerror("%08x:IOP read %04x\n",space.device().safe_pc(),m_iop_answer);
cputag_set_input_line(machine(), "maincpu", 1, CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(1, CLEAR_LINE);
return m_iop_answer;
}
@ -508,7 +508,7 @@ WRITE16_MEMBER(coolpool_state::dsp_answer_w)
logerror("%08x:IOP answer %04x\n", space.device().safe_pc(), data);
m_iop_answer = data;
cputag_set_input_line(machine(), "maincpu", 1, ASSERT_LINE);
machine().device("maincpu")->execute().set_input_line(1, ASSERT_LINE);
}

4
src/mame/drivers/coolridr.c
View File

@ -1157,8 +1157,8 @@ static TIMER_DEVICE_CALLBACK( system_h1_sub )
static MACHINE_RESET ( coolridr )
{
// cputag_set_input_line(machine, "maincpu", INPUT_LINE_HALT, ASSERT_LINE);
cputag_set_input_line(machine, "soundcpu", INPUT_LINE_HALT, ASSERT_LINE);
// machine.device("maincpu")->execute().set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
machine.device("soundcpu")->execute().set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
}
static MACHINE_CONFIG_START( coolridr, coolridr_state )

4
src/mame/drivers/corona.c
View File

@ -490,12 +490,12 @@ static SCREEN_UPDATE_IND16(luckyrlt)
WRITE8_MEMBER(corona_state::sound_latch_w)
{
soundlatch_byte_w(space, 0, data & 0xff);
cputag_set_input_line(machine(), "soundcpu", 0, ASSERT_LINE);
machine().device("soundcpu")->execute().set_input_line(0, ASSERT_LINE);
}
READ8_MEMBER(corona_state::sound_latch_r)
{
cputag_set_input_line(machine(), "soundcpu", 0, CLEAR_LINE);
machine().device("soundcpu")->execute().set_input_line(0, CLEAR_LINE);
return soundlatch_byte_r(space, 0);
}

12
src/mame/drivers/cosmic.c
View File

@ -472,7 +472,7 @@ INPUT_PORTS_END
INPUT_CHANGED_MEMBER(cosmic_state::cosmica_coin_inserted)
{
cputag_set_input_line(machine(), "maincpu", INPUT_LINE_NMI, newval ? ASSERT_LINE : CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(INPUT_LINE_NMI, newval ? ASSERT_LINE : CLEAR_LINE);
}
static INPUT_PORTS_START( cosmica )
@ -527,7 +527,7 @@ INPUT_PORTS_END
INPUT_CHANGED_MEMBER(cosmic_state::cosmicg_coin_inserted)
{
cputag_set_input_line_and_vector(machine(), "maincpu", 0, newval ? ASSERT_LINE : CLEAR_LINE, 6);
machine().device("maincpu")->execute().set_input_line_and_vector(0, newval ? ASSERT_LINE : CLEAR_LINE, 6);
}
static INPUT_PORTS_START( cosmicg )
@ -574,12 +574,12 @@ INPUT_PORTS_END
INPUT_CHANGED_MEMBER(cosmic_state::coin_inserted_irq0)
{
cputag_set_input_line(machine(), "maincpu", 0, newval ? HOLD_LINE : CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(0, newval ? HOLD_LINE : CLEAR_LINE);
}
INPUT_CHANGED_MEMBER(cosmic_state::coin_inserted_nmi)
{
cputag_set_input_line(machine(), "maincpu", INPUT_LINE_NMI, newval ? ASSERT_LINE : CLEAR_LINE);
machine().device("maincpu")->execute().set_input_line(INPUT_LINE_NMI, newval ? ASSERT_LINE : CLEAR_LINE);
}
static INPUT_PORTS_START( magspot )
@ -1007,10 +1007,10 @@ static TIMER_DEVICE_CALLBACK( panic_scanline )
int scanline = param;
if(scanline == 224) // vblank-out irq
cputag_set_input_line_and_vector(timer.machine(), "maincpu", 0, HOLD_LINE,0xd7); /* RST 10h */
timer.machine().device("maincpu")->execute().set_input_line_and_vector(0, HOLD_LINE,0xd7); /* RST 10h */
if(scanline == 0) // vblank-in irq
cputag_set_input_line_and_vector(timer.machine(), "maincpu", 0, HOLD_LINE,0xcf); /* RST 08h */
timer.machine().device("maincpu")->execute().set_input_line_and_vector(0, HOLD_LINE,0xcf); /* RST 08h */
}

Some files were not shown because too many files have changed in this diff Show More