summaryrefslogtreecommitdiffstats
path: root/src/mame
diff options
context:
space:
mode:
authorGravatarGravatar AJR <ajrhacker@users.noreply.github.com>2016-07-08 16:55:52 -0400
committerGravatarGravatar AJR <ajrhacker@users.noreply.github.com>2016-07-08 16:55:52 -0400
commite720f794816677762e1d35864d6946499faab520 (patch) (github)
tree9ca63a45e59046a1910f33de15f62fd40ed14d83 /src/mame
parentaaa3090dd3a40587f3d4cd7ab8016bcd96131e08 (diff)
downloadmame-e720f794816677762e1d35864d6946499faab520.tar.bz2
mame-e720f794816677762e1d35864d6946499faab520.zip
Further IRQ passthrough cleanup
- Remove irq_line methods from M6502, M6800, M6809, S2600 and replace uses with DEVCB_INPUTLINE - Remove a few IRQ passthroughs from spiders.cpp - Add several aliases for M6800_IRQ_LINE
Diffstat (limited to 'src/mame')
-rw-r--r--src/mame/audio/midway.cpp2
-rw-r--r--src/mame/audio/qix.cpp2
-rw-r--r--src/mame/audio/s11c_bg.cpp4
-rw-r--r--src/mame/audio/zaccaria.cpp4
-rw-r--r--src/mame/drivers/a6809.cpp2
-rw-r--r--src/mame/drivers/aim65.cpp4
-rw-r--r--src/mame/drivers/allied.cpp20
-rw-r--r--src/mame/drivers/apf.cpp4
-rw-r--r--src/mame/drivers/aristmk4.cpp2
-rw-r--r--src/mame/drivers/atom.cpp4
-rw-r--r--src/mame/drivers/battlane.cpp2
-rw-r--r--src/mame/drivers/beezer.cpp4
-rw-r--r--src/mame/drivers/brkthru.cpp4
-rw-r--r--src/mame/drivers/by17.cpp8
-rw-r--r--src/mame/drivers/by35.cpp8
-rw-r--r--src/mame/drivers/by6803.cpp4
-rw-r--r--src/mame/drivers/byvid.cpp16
-rw-r--r--src/mame/drivers/clcd.cpp2
-rw-r--r--src/mame/drivers/d6800.cpp4
-rw-r--r--src/mame/drivers/dec8.cpp12
-rw-r--r--src/mame/drivers/didact.cpp4
-rw-r--r--src/mame/drivers/eacc.cpp6
-rw-r--r--src/mame/drivers/enmirage.cpp4
-rw-r--r--src/mame/drivers/eti660.cpp4
-rw-r--r--src/mame/drivers/galaxold.cpp2
-rw-r--r--src/mame/drivers/goupil.cpp4
-rw-r--r--src/mame/drivers/gts3.cpp4
-rw-r--r--src/mame/drivers/gts3a.cpp4
-rw-r--r--src/mame/drivers/hankin.cpp12
-rw-r--r--src/mame/drivers/hx20.cpp2
-rw-r--r--src/mame/drivers/icecold.cpp12
-rw-r--r--src/mame/drivers/itech32.cpp2
-rw-r--r--src/mame/drivers/itech8.cpp2
-rw-r--r--src/mame/drivers/karnov.cpp4
-rw-r--r--src/mame/drivers/lazercmd.cpp2
-rw-r--r--src/mame/drivers/ltd.cpp2
-rw-r--r--src/mame/drivers/matmania.cpp2
-rw-r--r--src/mame/drivers/meadows.cpp4
-rw-r--r--src/mame/drivers/mekd2.cpp8
-rw-r--r--src/mame/drivers/metlclsh.cpp2
-rw-r--r--src/mame/drivers/microkit.cpp2
-rw-r--r--src/mame/drivers/mkit09.cpp8
-rw-r--r--src/mame/drivers/mpu3.cpp2
-rw-r--r--src/mame/drivers/nyny.cpp4
-rw-r--r--src/mame/drivers/pegasus.cpp8
-rw-r--r--src/mame/drivers/pipbug.cpp2
-rw-r--r--src/mame/drivers/poly.cpp8
-rw-r--r--src/mame/drivers/proteus3.cpp2
-rw-r--r--src/mame/drivers/r2dtank.cpp2
-rw-r--r--src/mame/drivers/renegade.cpp2
-rw-r--r--src/mame/drivers/s11.cpp14
-rw-r--r--src/mame/drivers/s11a.cpp8
-rw-r--r--src/mame/drivers/s11b.cpp8
-rw-r--r--src/mame/drivers/s11c.cpp4
-rw-r--r--src/mame/drivers/s3.cpp20
-rw-r--r--src/mame/drivers/s4.cpp20
-rw-r--r--src/mame/drivers/s6.cpp8
-rw-r--r--src/mame/drivers/s6a.cpp8
-rw-r--r--src/mame/drivers/s7.cpp12
-rw-r--r--src/mame/drivers/s8.cpp8
-rw-r--r--src/mame/drivers/s8a.cpp8
-rw-r--r--src/mame/drivers/s9.cpp8
-rw-r--r--src/mame/drivers/sidepckt.cpp2
-rw-r--r--src/mame/drivers/spiders.cpp16
-rw-r--r--src/mame/drivers/st_mp100.cpp8
-rw-r--r--src/mame/drivers/st_mp200.cpp8
-rw-r--r--src/mame/drivers/swtpc09.cpp2
-rw-r--r--src/mame/drivers/sym1.cpp6
-rw-r--r--src/mame/drivers/taito.cpp8
-rw-r--r--src/mame/drivers/tavernie.cpp4
-rw-r--r--src/mame/drivers/v6809.cpp8
-rw-r--r--src/mame/drivers/vic20.cpp4
-rw-r--r--src/mame/includes/spiders.h2
-rw-r--r--src/mame/machine/decopincpu.cpp6
-rw-r--r--src/mame/machine/williams.cpp4
75 files changed, 214 insertions, 228 deletions
diff --git a/src/mame/audio/midway.cpp b/src/mame/audio/midway.cpp
index daae8982b37..dfc75c84f3e 100644
--- a/src/mame/audio/midway.cpp
+++ b/src/mame/audio/midway.cpp
@@ -1126,7 +1126,7 @@ WRITE8_MEMBER(midway_squawk_n_talk_device::portb2_w)
WRITE_LINE_MEMBER(midway_squawk_n_talk_device::irq_w)
{
int combined_state = m_pia0->irq_a_state() | m_pia0->irq_b_state() | m_pia1->irq_a_state() | m_pia1->irq_b_state();
- m_cpu->set_input_line(M6800_IRQ_LINE, combined_state ? ASSERT_LINE : CLEAR_LINE);
+ m_cpu->set_input_line(M6802_IRQ_LINE, combined_state ? ASSERT_LINE : CLEAR_LINE);
}
diff --git a/src/mame/audio/qix.cpp b/src/mame/audio/qix.cpp
index a7e0bb55a0b..70f9371d4ea 100644
--- a/src/mame/audio/qix.cpp
+++ b/src/mame/audio/qix.cpp
@@ -142,7 +142,7 @@ WRITE_LINE_MEMBER(qix_state::qix_pia_sint)
int combined_state = m_sndpia1->irq_a_state() | m_sndpia1->irq_b_state();
/* SINT is connected to the sound CPU's IRQ line */
- m_audiocpu->set_input_line(M6800_IRQ_LINE, combined_state ? ASSERT_LINE : CLEAR_LINE);
+ m_audiocpu->set_input_line(M6802_IRQ_LINE, combined_state ? ASSERT_LINE : CLEAR_LINE);
}
diff --git a/src/mame/audio/s11c_bg.cpp b/src/mame/audio/s11c_bg.cpp
index bc5a10566d0..fc45e1b222e 100644
--- a/src/mame/audio/s11c_bg.cpp
+++ b/src/mame/audio/s11c_bg.cpp
@@ -85,8 +85,8 @@ MACHINE_CONFIG_FRAGMENT( s11c_bg )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11c_bg_device, pia40_pb_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(s11c_bg_device, pia40_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(s11c_bg_device, pia40_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("bgcpu", m6809e_device, firq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("bgcpu", m6809e_device, nmi_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("bgcpu", M6809_FIRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("bgcpu", INPUT_LINE_NMI))
MACHINE_CONFIG_END
machine_config_constructor s11c_bg_device::device_mconfig_additions() const
diff --git a/src/mame/audio/zaccaria.cpp b/src/mame/audio/zaccaria.cpp
index 0df34d1d626..99a732b6626 100644
--- a/src/mame/audio/zaccaria.cpp
+++ b/src/mame/audio/zaccaria.cpp
@@ -154,8 +154,8 @@ MACHINE_CONFIG_FRAGMENT(zac1b111xx_base_config)
MCFG_PIA_READPA_HANDLER(READ8(zac1b111xx_melody_base, melodypia_porta_r))
MCFG_PIA_WRITEPA_HANDLER(WRITE8(zac1b111xx_melody_base, melodypia_porta_w))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(zac1b111xx_melody_base, melodypia_portb_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("melodycpu", m6802_cpu_device, nmi_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("melodycpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("melodycpu", M6802_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("melodycpu", M6802_IRQ_LINE))
MCFG_SOUND_ADD("melodypsg1", AY8910, XTAL_3_579545MHz/2) // CPU clock divided using 4040
MCFG_AY8910_PORT_B_READ_CB(READ8(zac1b111xx_melody_base, melodypsg1_portb_r))
diff --git a/src/mame/drivers/a6809.cpp b/src/mame/drivers/a6809.cpp
index 98b57f5af99..9f213faa8d3 100644
--- a/src/mame/drivers/a6809.cpp
+++ b/src/mame/drivers/a6809.cpp
@@ -241,7 +241,7 @@ static MACHINE_CONFIG_START( a6809, a6809_state )
/* Devices */
MCFG_DEVICE_ADD("via", VIA6522, XTAL_4MHz / 4)
MCFG_VIA6522_CB2_HANDLER(WRITELINE(a6809_state, cass_w))
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
+ MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_MC6845_ADD("mc6845", HD6845, "screen", XTAL_4MHz / 2)
MCFG_MC6845_SHOW_BORDER_AREA(false)
diff --git a/src/mame/drivers/aim65.cpp b/src/mame/drivers/aim65.cpp
index 15240d13cfb..3e4ff2022f4 100644
--- a/src/mame/drivers/aim65.cpp
+++ b/src/mame/drivers/aim65.cpp
@@ -209,10 +209,10 @@ static MACHINE_CONFIG_START( aim65, aim65_state )
// out CB1 printer start
// out CA2 cass control (H=in)
// out CB2 turn printer on
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("maincpu", m6502_device, irq_line))
+ MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M6502_IRQ_LINE))
MCFG_DEVICE_ADD("via6522_1", VIA6522, 0)
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("maincpu", m6502_device, irq_line))
+ MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M6502_IRQ_LINE))
MCFG_DEVICE_ADD("pia6821", PIA6821, 0)
MCFG_PIA_WRITEPA_HANDLER(WRITE8(aim65_state, aim65_pia_a_w))
diff --git a/src/mame/drivers/allied.cpp b/src/mame/drivers/allied.cpp
index 9b96c72ab22..e170a00af88 100644
--- a/src/mame/drivers/allied.cpp
+++ b/src/mame/drivers/allied.cpp
@@ -626,8 +626,8 @@ static MACHINE_CONFIG_START( allied, allied_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(allied_state, ic1_b_w))
//MCFG_PIA_CA2_HANDLER(WRITELINE(allied_state, ic1_ca2_w))
//MCFG_PIA_CB2_HANDLER(WRITELINE(allied_state, ic1_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6504_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6504_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6504_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6504_IRQ_LINE))
MCFG_DEVICE_ADD("ic2", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(READ8(allied_state, ic2_a_r))
@@ -636,8 +636,8 @@ static MACHINE_CONFIG_START( allied, allied_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(allied_state, ic2_b_w))
//MCFG_PIA_CA2_HANDLER(WRITELINE(allied_state, ic2_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(allied_state, ic2_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6504_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6504_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6504_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6504_IRQ_LINE))
MCFG_DEVICE_ADD("ic4", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(READ8(allied_state, ic4_a_r))
@@ -646,8 +646,8 @@ static MACHINE_CONFIG_START( allied, allied_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(allied_state, ic4_b_w))
//MCFG_PIA_CA2_HANDLER(WRITELINE(allied_state, ic4_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(allied_state, ic4_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6504_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6504_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6504_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6504_IRQ_LINE))
MCFG_DEVICE_ADD("ic7", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(READ8(allied_state, ic7_a_r))
@@ -656,8 +656,8 @@ static MACHINE_CONFIG_START( allied, allied_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(allied_state, ic7_b_w))
//MCFG_PIA_CA2_HANDLER(WRITELINE(allied_state, ic7_ca2_w))
//MCFG_PIA_CB2_HANDLER(WRITELINE(allied_state, ic7_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6504_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6504_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6504_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6504_IRQ_LINE))
MCFG_DEVICE_ADD("ic8", PIA6821, 0)
//MCFG_PIA_READPA_HANDLER(READ8(allied_state, ic8_a_r))
@@ -666,8 +666,8 @@ static MACHINE_CONFIG_START( allied, allied_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(allied_state, ic8_b_w))
//MCFG_PIA_CA2_HANDLER(WRITELINE(allied_state, ic8_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(allied_state, ic8_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6504_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6504_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6504_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6504_IRQ_LINE))
MCFG_DEVICE_ADD("ic3", MOS6530, 3572549/4) // unknown where the ram and i/o is located
MCFG_MOS6530_OUT_PB_CB(WRITE8(allied_state, ic3_b_w))
diff --git a/src/mame/drivers/apf.cpp b/src/mame/drivers/apf.cpp
index 039c6bb2175..92c8d38892f 100644
--- a/src/mame/drivers/apf.cpp
+++ b/src/mame/drivers/apf.cpp
@@ -531,8 +531,8 @@ static MACHINE_CONFIG_START( apfm1000, apf_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(apf_state, pia0_portb_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(apf_state, pia0_ca2_w))
MCFG_PIA_CB2_HANDLER(DEVWRITELINE("speaker", speaker_sound_device, level_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_APF_CARTRIDGE_ADD("cartslot", apf_cart, nullptr)
diff --git a/src/mame/drivers/aristmk4.cpp b/src/mame/drivers/aristmk4.cpp
index 6d6a2b4b7e2..fa62bc58620 100644
--- a/src/mame/drivers/aristmk4.cpp
+++ b/src/mame/drivers/aristmk4.cpp
@@ -1741,7 +1741,7 @@ static MACHINE_CONFIG_START( aristmk4, aristmk4_state )
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(aristmk4_state, via_b_w))
MCFG_VIA6522_CA2_HANDLER(WRITELINE(aristmk4_state, via_ca2_w))
MCFG_VIA6522_CB2_HANDLER(WRITELINE(aristmk4_state, via_cb2_w))
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("maincpu", m6809_device, firq_line))
+ MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M6809_FIRQ_LINE))
// CA1 is connected to +5V, CB1 is not connected.
MCFG_DEVICE_ADD("pia6821_0", PIA6821, 0)
diff --git a/src/mame/drivers/atom.cpp b/src/mame/drivers/atom.cpp
index 6e8cb6e473f..f2842135532 100644
--- a/src/mame/drivers/atom.cpp
+++ b/src/mame/drivers/atom.cpp
@@ -725,7 +725,7 @@ static MACHINE_CONFIG_START( atom, atom_state )
MCFG_DEVICE_ADD(R6522_TAG, VIA6522, X2/4)
MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8("cent_data_out", output_latch_device, write))
MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(CENTRONICS_TAG, centronics_device, write_strobe))
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE(SY6502_TAG, m6502_device, irq_line))
+ MCFG_VIA6522_IRQ_HANDLER(INPUTLINE(SY6502_TAG, M6502_IRQ_LINE))
MCFG_DEVICE_ADD(INS8255_TAG, I8255, 0)
MCFG_I8255_OUT_PORTA_CB(WRITE8(atom_state, ppi_pa_w))
@@ -834,7 +834,7 @@ static MACHINE_CONFIG_START( atombb, atom_state )
MCFG_DEVICE_ADD(R6522_TAG, VIA6522, X2/4)
MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8("cent_data_out", output_latch_device, write))
MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(CENTRONICS_TAG, centronics_device, write_strobe))
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE(SY6502_TAG, m6502_device, irq_line))
+ MCFG_VIA6522_IRQ_HANDLER(INPUTLINE(SY6502_TAG, M6502_IRQ_LINE))
MCFG_DEVICE_ADD(INS8255_TAG, I8255, 0)
MCFG_I8255_OUT_PORTA_CB(WRITE8(atom_state, ppi_pa_w))
diff --git a/src/mame/drivers/battlane.cpp b/src/mame/drivers/battlane.cpp
index 815b8b00976..fa459ced611 100644
--- a/src/mame/drivers/battlane.cpp
+++ b/src/mame/drivers/battlane.cpp
@@ -296,7 +296,7 @@ static MACHINE_CONFIG_START( battlane, battlane_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM3526, 3000000)
- MCFG_YM3526_IRQ_HANDLER(DEVWRITELINE("maincpu", m6809_device, firq_line))
+ MCFG_YM3526_IRQ_HANDLER(INPUTLINE("maincpu", M6809_FIRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/beezer.cpp b/src/mame/drivers/beezer.cpp
index 78522fdec37..eaac517988c 100644
--- a/src/mame/drivers/beezer.cpp
+++ b/src/mame/drivers/beezer.cpp
@@ -122,7 +122,7 @@ static MACHINE_CONFIG_START( beezer, beezer_state )
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(beezer_state, b_via_0_pa_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(beezer_state, b_via_0_pb_w))
MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE("via6522_1", via6522_device, write_ca1))
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("maincpu", m6809_device, irq_line))
+ MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_DEVICE_ADD("via6522_1", VIA6522, 0)
MCFG_VIA6522_READPA_HANDLER(READ8(beezer_state, b_via_1_pa_r))
@@ -130,7 +130,7 @@ static MACHINE_CONFIG_START( beezer, beezer_state )
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(beezer_state, b_via_1_pa_w))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(beezer_state, b_via_1_pb_w))
MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE("via6522_0", via6522_device, write_cb1))
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("audiocpu", m6809_device, irq_line))
+ MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("audiocpu", M6809_IRQ_LINE))
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/brkthru.cpp b/src/mame/drivers/brkthru.cpp
index d9c216c9b1c..277cbbe080b 100644
--- a/src/mame/drivers/brkthru.cpp
+++ b/src/mame/drivers/brkthru.cpp
@@ -408,7 +408,7 @@ static MACHINE_CONFIG_START( brkthru, brkthru_state )
MCFG_SOUND_ROUTE(3, "mono", 0.50)
MCFG_SOUND_ADD("ym2", YM3526, MASTER_CLOCK/4)
- MCFG_YM3526_IRQ_HANDLER(DEVWRITELINE("audiocpu", m6809_device, irq_line))
+ MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", M6809_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -459,7 +459,7 @@ static MACHINE_CONFIG_START( darwin, brkthru_state )
MCFG_SOUND_ROUTE(3, "mono", 0.50)
MCFG_SOUND_ADD("ym2", YM3526, MASTER_CLOCK/4)
- MCFG_YM3526_IRQ_HANDLER(DEVWRITELINE("audiocpu", m6809_device, irq_line))
+ MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", M6809_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/by17.cpp b/src/mame/drivers/by17.cpp
index a16b56fe1e7..1f9b086df22 100644
--- a/src/mame/drivers/by17.cpp
+++ b/src/mame/drivers/by17.cpp
@@ -1003,8 +1003,8 @@ static MACHINE_CONFIG_START( by17, by17_state )
MCFG_PIA_READCB1_HANDLER(READLINE(by17_state, u10_cb1_r))
MCFG_PIA_CA2_HANDLER(WRITELINE(by17_state, u10_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(by17_state, u10_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_z_freq", by17_state, timer_z_freq, attotime::from_hz(100)) // Mains Line Frequency * 2
MCFG_TIMER_DRIVER_ADD("timer_z_pulse", by17_state, timer_z_pulse) // Active pulse length from Zero Crossing detector
@@ -1016,8 +1016,8 @@ static MACHINE_CONFIG_START( by17, by17_state )
MCFG_PIA_READCB1_HANDLER(READLINE(by17_state, u11_cb1_r))
MCFG_PIA_CA2_HANDLER(WRITELINE(by17_state, u11_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(by17_state, u11_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_d_freq", by17_state, u11_timer, attotime::from_hz(317)) // 555 timer
MCFG_TIMER_DRIVER_ADD("timer_d_pulse", by17_state, timer_d_pulse) // 555 Active pulse length
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/by35.cpp b/src/mame/drivers/by35.cpp
index 476804d398b..2bbd3366cbf 100644
--- a/src/mame/drivers/by35.cpp
+++ b/src/mame/drivers/by35.cpp
@@ -1101,8 +1101,8 @@ static MACHINE_CONFIG_START( by35, by35_state )
MCFG_PIA_READCB1_HANDLER(READLINE(by35_state, u10_cb1_r))
MCFG_PIA_CA2_HANDLER(WRITELINE(by35_state, u10_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(by35_state, u10_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_z_freq", by35_state, timer_z_freq, attotime::from_hz(100)) // Mains Line Frequency * 2
MCFG_TIMER_DRIVER_ADD("timer_z_pulse", by35_state, timer_z_pulse) // Active pulse length from Zero Crossing detector
@@ -1114,8 +1114,8 @@ static MACHINE_CONFIG_START( by35, by35_state )
MCFG_PIA_READCB1_HANDLER(READLINE(by35_state, u11_cb1_r))
MCFG_PIA_CA2_HANDLER(WRITELINE(by35_state, u11_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(by35_state, u11_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_d_freq", by35_state, u11_timer, attotime::from_hz(317)) // 555 timer
MCFG_TIMER_DRIVER_ADD("timer_d_pulse", by35_state, timer_d_pulse) // 555 Active pulse length
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/by6803.cpp b/src/mame/drivers/by6803.cpp
index bc7ce7e9f14..017e80256f7 100644
--- a/src/mame/drivers/by6803.cpp
+++ b/src/mame/drivers/by6803.cpp
@@ -390,8 +390,8 @@ static MACHINE_CONFIG_START( by6803, by6803_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(by6803_state, pia0_b_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(by6803_state, pia0_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(by6803_state, pia0_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6803_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6803_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6803_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6803_IRQ_LINE))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_z", by6803_state, pia0_timer, attotime::from_hz(120)) // mains freq*2
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
diff --git a/src/mame/drivers/byvid.cpp b/src/mame/drivers/byvid.cpp
index 939c7dbed81..da909d8d9c9 100644
--- a/src/mame/drivers/byvid.cpp
+++ b/src/mame/drivers/byvid.cpp
@@ -759,8 +759,8 @@ static MACHINE_CONFIG_START( babypac, by133_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(by133_state, u7_b_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(by133_state, u7_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(by133_state, u7_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("videocpu", m6809e_device, firq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("videocpu", m6809e_device, firq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("videocpu", M6809_FIRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("videocpu", M6809_FIRQ_LINE))
MCFG_DEVICE_ADD("pia_u10", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(READ8(by133_state, u10_a_r))
@@ -769,8 +769,8 @@ static MACHINE_CONFIG_START( babypac, by133_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(by133_state, u10_b_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(by133_state, u10_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(by133_state, u10_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_TIMER_DRIVER_ADD_PERIODIC("babypac1", by133_state, u10_timer, attotime::from_hz(120)) // mains freq*2
MCFG_DEVICE_ADD("pia_u11", PIA6821, 0)
@@ -780,14 +780,14 @@ static MACHINE_CONFIG_START( babypac, by133_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(by133_state, u11_b_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(by133_state, u11_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(by133_state, u11_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_TIMER_DRIVER_ADD_PERIODIC("babypac2", by133_state, u11_timer, attotime::from_hz(634)) // 555 timer*2
/* video hardware */
MCFG_DEVICE_ADD( "crtc", TMS9928A, XTAL_10_738635MHz / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(DEVWRITELINE("videocpu", m6809e_device, irq_line))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(INPUTLINE("videocpu", M6809_IRQ_LINE))
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
MCFG_SCREEN_UPDATE_DEVICE( "crtc", tms9928a_device, screen_update )
@@ -809,7 +809,7 @@ static MACHINE_CONFIG_DERIVED( granny, babypac )
MCFG_DEVICE_ADD( "crtc2", TMS9928A, XTAL_10_738635MHz / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(DEVWRITELINE("videocpu", m6809e_device, irq_line))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(INPUTLINE("videocpu", M6809_IRQ_LINE))
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_SCREEN_ADD( "screen", RASTER )
diff --git a/src/mame/drivers/clcd.cpp b/src/mame/drivers/clcd.cpp
index 52ac6a7534a..fb8c18775b8 100644
--- a/src/mame/drivers/clcd.cpp
+++ b/src/mame/drivers/clcd.cpp
@@ -206,7 +206,7 @@ public:
void update_irq()
{
- m_maincpu->irq_line(m_irq_via0 | m_irq_via1 | m_irq_acia);
+ m_maincpu->set_input_line(M65C02_IRQ_LINE, m_irq_via0 | m_irq_via1 | m_irq_acia);
}
WRITE_LINE_MEMBER(write_irq_via0)
diff --git a/src/mame/drivers/d6800.cpp b/src/mame/drivers/d6800.cpp
index af68192003d..e0ca57edcd8 100644
--- a/src/mame/drivers/d6800.cpp
+++ b/src/mame/drivers/d6800.cpp
@@ -407,8 +407,8 @@ static MACHINE_CONFIG_START( d6800, d6800_state )
MCFG_PIA_WRITEPA_HANDLER(WRITE8(d6800_state, d6800_keyboard_w))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(d6800_state, d6800_cassette_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(d6800_state, d6800_screen_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED)
diff --git a/src/mame/drivers/dec8.cpp b/src/mame/drivers/dec8.cpp
index a66690d3146..360621fb4e0 100644
--- a/src/mame/drivers/dec8.cpp
+++ b/src/mame/drivers/dec8.cpp
@@ -2032,7 +2032,7 @@ static MACHINE_CONFIG_START( lastmisn, dec8_state )
MCFG_SOUND_ROUTE(3, "mono", 0.20)
MCFG_SOUND_ADD("ym2", YM3526, 3000000)
- MCFG_YM3526_IRQ_HANDLER(DEVWRITELINE("audiocpu", m6502_device, irq_line))
+ MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
@@ -2086,7 +2086,7 @@ static MACHINE_CONFIG_START( shackled, dec8_state )
MCFG_SOUND_ROUTE(3, "mono", 0.20)
MCFG_SOUND_ADD("ym2", YM3526, 3000000)
- MCFG_YM3526_IRQ_HANDLER(DEVWRITELINE("audiocpu", m6502_device, irq_line))
+ MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
@@ -2140,7 +2140,7 @@ static MACHINE_CONFIG_START( gondo, dec8_state )
MCFG_SOUND_ROUTE(3, "mono", 0.20)
MCFG_SOUND_ADD("ym2", YM3526, 3000000)
- MCFG_YM3526_IRQ_HANDLER(DEVWRITELINE("audiocpu", m6502_device, irq_line))
+ MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
@@ -2194,7 +2194,7 @@ static MACHINE_CONFIG_START( garyoret, dec8_state )
MCFG_SOUND_ROUTE(3, "mono", 0.20)
MCFG_SOUND_ADD("ym2", YM3526, 3000000)
- MCFG_YM3526_IRQ_HANDLER(DEVWRITELINE("audiocpu", m6502_device, irq_line))
+ MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
@@ -2312,7 +2312,7 @@ static MACHINE_CONFIG_START( csilver, dec8_state )
MCFG_SOUND_ROUTE(3, "mono", 0.20)
MCFG_SOUND_ADD("ym2", YM3526, XTAL_12MHz/4) /* verified on pcb */
- MCFG_YM3526_IRQ_HANDLER(DEVWRITELINE("audiocpu", m6502_device, irq_line))
+ MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz) /* verified on pcb */
@@ -2375,7 +2375,7 @@ static MACHINE_CONFIG_START( oscar, dec8_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_SOUND_ADD("ym2", YM3526, XTAL_12MHz/4) /* verified on pcb */
- MCFG_YM3526_IRQ_HANDLER(DEVWRITELINE("audiocpu", m6502_device, irq_line))
+ MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/didact.cpp b/src/mame/drivers/didact.cpp
index 80dbdb2eef9..1354cf54f3f 100644
--- a/src/mame/drivers/didact.cpp
+++ b/src/mame/drivers/didact.cpp
@@ -659,8 +659,8 @@ static MACHINE_CONFIG_START( mp68a, mp68a_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(mp68a_state, pia2_kbB_w))
MCFG_PIA_READPB_HANDLER(READ8(mp68a_state, pia2_kbB_r))
MCFG_PIA_READCB1_HANDLER(READLINE(mp68a_state, pia2_cb1_r))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line)) /* Not used by ROM. Combined trace to CPU IRQ with IRQB */
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line)) /* Not used by ROM. Combined trace to CPU IRQ with IRQA */
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE)) /* Not used by ROM. Combined trace to CPU IRQ with IRQB */
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE)) /* Not used by ROM. Combined trace to CPU IRQ with IRQA */
/* Display - sequence outputting all '0':s at start */
/* 0x086B 0x600 (Port A) = 0x00 */
diff --git a/src/mame/drivers/eacc.cpp b/src/mame/drivers/eacc.cpp
index 8512cb0a36a..cc91872dddf 100644
--- a/src/mame/drivers/eacc.cpp
+++ b/src/mame/drivers/eacc.cpp
@@ -140,7 +140,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(eacc_state::eacc_cb1)
{
m_cb1 ^= 1; // 15hz
if (m_cb2)
- m_maincpu->set_input_line(M6800_IRQ_LINE, ASSERT_LINE);
+ m_maincpu->set_input_line(M6802_IRQ_LINE, ASSERT_LINE);
}
TIMER_DEVICE_CALLBACK_MEMBER(eacc_state::eacc_nmi)
@@ -252,8 +252,8 @@ static MACHINE_CONFIG_START( eacc, eacc_state )
MCFG_PIA_WRITEPA_HANDLER(WRITE8(eacc_state, eacc_segment_w))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(eacc_state, eacc_digit_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(eacc_state, eacc_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6802_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6802_IRQ_LINE))
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_TIMER_DRIVER_ADD_PERIODIC("eacc_nmi", eacc_state, eacc_nmi, attotime::from_hz(600))
diff --git a/src/mame/drivers/enmirage.cpp b/src/mame/drivers/enmirage.cpp
index cdea1be9d8a..0d0bb3aa935 100644
--- a/src/mame/drivers/enmirage.cpp
+++ b/src/mame/drivers/enmirage.cpp
@@ -224,10 +224,10 @@ static MACHINE_CONFIG_START( mirage, mirage_state )
MCFG_DEVICE_ADD("via6522", VIA6522, 1000000)
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mirage_state, mirage_via_write_porta))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mirage_state, mirage_via_write_portb))
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
+ MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_DEVICE_ADD("acia6850", ACIA6850, 0)
- MCFG_ACIA6850_IRQ_HANDLER(DEVWRITELINE("maincpu", m6809e_device, firq_line))
+ MCFG_ACIA6850_IRQ_HANDLER(INPUTLINE("maincpu", M6809_FIRQ_LINE))
MCFG_WD1772_ADD("wd1772", 8000000)
MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI))
diff --git a/src/mame/drivers/eti660.cpp b/src/mame/drivers/eti660.cpp
index 44de05760ba..72ab5cb146d 100644
--- a/src/mame/drivers/eti660.cpp
+++ b/src/mame/drivers/eti660.cpp
@@ -325,8 +325,8 @@ static MACHINE_CONFIG_START( eti660, eti660_state )
MCFG_DEVICE_ADD(MC6821_TAG, PIA6821, 0)
MCFG_PIA_READPA_HANDLER(READ8(eti660_state, pia_pa_r))
MCFG_PIA_WRITEPA_HANDLER(WRITE8(eti660_state, pia_pa_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE(CDP1802_TAG, cosmac_device, int_w)) MCFG_DEVCB_INVERT
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE(CDP1802_TAG, cosmac_device, int_w)) MCFG_DEVCB_INVERT
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT)) MCFG_DEVCB_INVERT
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT)) MCFG_DEVCB_INVERT
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED)
diff --git a/src/mame/drivers/galaxold.cpp b/src/mame/drivers/galaxold.cpp
index 371e6b4c6be..e33e6f55b15 100644
--- a/src/mame/drivers/galaxold.cpp
+++ b/src/mame/drivers/galaxold.cpp
@@ -2493,7 +2493,7 @@ static MACHINE_CONFIG_DERIVED( hunchbkg, galaxold_base )
MCFG_DEVICE_MODIFY("7474_9m_1")
/* the nmi line seems to be inverted on the cpu plugin board */
- MCFG_7474_COMP_OUTPUT_CB(DEVWRITELINE("maincpu", s2650_device, write_sense))
+ MCFG_7474_COMP_OUTPUT_CB(INPUTLINE("maincpu", S2650_SENSE_LINE))
MCFG_MACHINE_RESET_OVERRIDE(galaxold_state,hunchbkg)
diff --git a/src/mame/drivers/goupil.cpp b/src/mame/drivers/goupil.cpp
index 75a623c97ef..d13d2bc4eee 100644
--- a/src/mame/drivers/goupil.cpp
+++ b/src/mame/drivers/goupil.cpp
@@ -455,10 +455,10 @@ static MACHINE_CONFIG_START( goupil_g1, goupil_g1_state )
MCFG_VIA6522_CA2_HANDLER(WRITELINE(goupil_g1_state, via_video_ca2_w))
MCFG_DEVICE_ADD("m_via_keyb", VIA6522, 0)
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("maincpu", m6808_cpu_device, irq_line))
+ MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M6808_IRQ_LINE))
MCFG_DEVICE_ADD("m_via_modem", VIA6522, 0)
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("maincpu", m6808_cpu_device, irq_line))
+ MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M6808_IRQ_LINE))
/* Floppy */
MCFG_FD1791_ADD("fd1791", XTAL_8MHz )
diff --git a/src/mame/drivers/gts3.cpp b/src/mame/drivers/gts3.cpp
index 151a286c212..e47488d3952 100644
--- a/src/mame/drivers/gts3.cpp
+++ b/src/mame/drivers/gts3.cpp
@@ -286,7 +286,7 @@ static MACHINE_CONFIG_START( gts3, gts3_state )
MCFG_FRAGMENT_ADD( genpin_audio )
MCFG_DEVICE_ADD("u4", VIA6522, 0)
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("maincpu", m65c02_device, irq_line))
+ MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M65C02_IRQ_LINE))
MCFG_VIA6522_READPA_HANDLER(READ8(gts3_state, u4a_r))
MCFG_VIA6522_READPB_HANDLER(READ8(gts3_state, u4b_r))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(gts3_state, u4b_w))
@@ -294,7 +294,7 @@ static MACHINE_CONFIG_START( gts3, gts3_state )
MCFG_VIA6522_CB2_HANDLER(WRITELINE(gts3_state, nmi_w))
MCFG_DEVICE_ADD("u5", VIA6522, 0)
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("maincpu", m65c02_device, irq_line))
+ MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M65C02_IRQ_LINE))
//MCFG_VIA6522_READPA_HANDLER(READ8(gts3_state, u5a_r))
//MCFG_VIA6522_READPB_HANDLER(READ8(gts3_state, u5b_r))
//MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(gts3_state, u5b_w))
diff --git a/src/mame/drivers/gts3a.cpp b/src/mame/drivers/gts3a.cpp
index a437c38300e..dba72606856 100644
--- a/src/mame/drivers/gts3a.cpp
+++ b/src/mame/drivers/gts3a.cpp
@@ -354,7 +354,7 @@ static MACHINE_CONFIG_START( gts3a, gts3a_state )
MCFG_FRAGMENT_ADD( genpin_audio )
MCFG_DEVICE_ADD("u4", VIA6522, 0)
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("maincpu", m65c02_device, irq_line))
+ MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M65C02_IRQ_LINE))
MCFG_VIA6522_READPA_HANDLER(READ8(gts3a_state, u4a_r))
MCFG_VIA6522_READPB_HANDLER(READ8(gts3a_state, u4b_r))
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(gts3a_state, u4b_w))
@@ -362,7 +362,7 @@ static MACHINE_CONFIG_START( gts3a, gts3a_state )
MCFG_VIA6522_CB2_HANDLER(WRITELINE(gts3a_state, nmi_w))
MCFG_DEVICE_ADD("u5", VIA6522, 0)
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("maincpu", m65c02_device, irq_line))
+ MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M65C02_IRQ_LINE))
//MCFG_VIA6522_READPA_HANDLER(READ8(gts3a_state, u5a_r))
//MCFG_VIA6522_READPB_HANDLER(READ8(gts3a_state, u5b_r))
//MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(gts3a_state, u5b_w))
diff --git a/src/mame/drivers/hankin.cpp b/src/mame/drivers/hankin.cpp
index 10cd8f17c14..35c2f26a2a1 100644
--- a/src/mame/drivers/hankin.cpp
+++ b/src/mame/drivers/hankin.cpp
@@ -517,8 +517,8 @@ static MACHINE_CONFIG_START( hankin, hankin_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(hankin_state, ic10_b_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(hankin_state, ic10_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(hankin_state, ic10_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6802_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6802_IRQ_LINE))
MCFG_DEVICE_ADD("ic11", PIA6821, 0)
//MCFG_PIA_READPA_HANDLER(READ8(hankin_state, ic11_a_r))
@@ -527,8 +527,8 @@ static MACHINE_CONFIG_START( hankin, hankin_state )
//MCFG_PIA_WRITEPB_HANDLER(WRITE8(hankin_state, ic11_b_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(hankin_state, ic11_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(hankin_state, ic11_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6802_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6802_IRQ_LINE))
MCFG_DEVICE_ADD("ic2", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(READ8(hankin_state, ic2_a_r))
@@ -537,8 +537,8 @@ static MACHINE_CONFIG_START( hankin, hankin_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(hankin_state, ic2_b_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(hankin_state, ic2_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(hankin_state, ic2_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("audiocpu", m6802_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("audiocpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_x", hankin_state, timer_x, attotime::from_hz(120)) // mains freq*2
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_s", hankin_state, timer_s, attotime::from_hz(94000)) // 555 on sound board*2
diff --git a/src/mame/drivers/hx20.cpp b/src/mame/drivers/hx20.cpp
index 56d705e96bd..89ca8fddefe 100644
--- a/src/mame/drivers/hx20.cpp
+++ b/src/mame/drivers/hx20.cpp
@@ -42,7 +42,7 @@ void hx20_state::update_interrupt()
{
int irq = m_rtc_irq || m_kbrequest;
- m_maincpu->set_input_line(M6800_IRQ_LINE, irq);
+ m_maincpu->set_input_line(HD6301_IRQ_LINE, irq);
}
diff --git a/src/mame/drivers/icecold.cpp b/src/mame/drivers/icecold.cpp
index 39aeb9ab47c..c67a15f76e9 100644
--- a/src/mame/drivers/icecold.cpp
+++ b/src/mame/drivers/icecold.cpp
@@ -336,19 +336,19 @@ static MACHINE_CONFIG_START( icecold, icecold_state )
MCFG_DEVICE_ADD( "pia0", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(IOPORT("JOY"))
MCFG_PIA_READPB_HANDLER(IOPORT("DSW3"))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_DEVICE_ADD( "pia1", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(READ8(icecold_state, ay_r))
MCFG_PIA_WRITEPA_HANDLER(WRITE8(icecold_state, ay_w))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(icecold_state, snd_ctrl_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809_device, firq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809_device, firq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6809_FIRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_FIRQ_LINE))
MCFG_DEVICE_ADD( "pia2", PIA6821, 0)
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_DEVICE_ADD("i8279", I8279, XTAL_6MHz/4)
MCFG_I8279_OUT_IRQ_CB(DEVWRITELINE("pia0", pia6821_device, cb1_w)) // irq
diff --git a/src/mame/drivers/itech32.cpp b/src/mame/drivers/itech32.cpp
index 8f05132538b..af9304a915d 100644
--- a/src/mame/drivers/itech32.cpp
+++ b/src/mame/drivers/itech32.cpp
@@ -1711,7 +1711,7 @@ static MACHINE_CONFIG_START( timekill, itech32_state )
/* via */
MCFG_DEVICE_ADD("via6522_0", VIA6522, SOUND_CLOCK/8)
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(itech32_state,pia_portb_out))
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("soundcpu", m6809_device, firq_line))
+ MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("soundcpu", M6809_FIRQ_LINE))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/itech8.cpp b/src/mame/drivers/itech8.cpp
index 64ac1559427..f0b6dc351ed 100644
--- a/src/mame/drivers/itech8.cpp
+++ b/src/mame/drivers/itech8.cpp
@@ -1685,7 +1685,7 @@ static MACHINE_CONFIG_START( itech8_core_lo, itech8_state )
/* via */
MCFG_DEVICE_ADD("via6522_0", VIA6522, CLOCK_8MHz/4)
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(itech8_state, pia_portb_out))
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("soundcpu", m6809_device, firq_line))
+ MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("soundcpu", M6809_FIRQ_LINE))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/karnov.cpp b/src/mame/drivers/karnov.cpp
index 9b3abbf22b4..d78d66fad8a 100644
--- a/src/mame/drivers/karnov.cpp
+++ b/src/mame/drivers/karnov.cpp
@@ -830,7 +830,7 @@ static MACHINE_CONFIG_START( karnov, karnov_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("ym2", YM3526, 3000000)
- MCFG_YM3526_IRQ_HANDLER(DEVWRITELINE("audiocpu", m6502_device, irq_line))
+ MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -895,7 +895,7 @@ static MACHINE_CONFIG_START( wndrplnt, karnov_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("ym2", YM3526, 3000000)
- MCFG_YM3526_IRQ_HANDLER(DEVWRITELINE("audiocpu", m6502_device, irq_line))
+ MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/lazercmd.cpp b/src/mame/drivers/lazercmd.cpp
index f6b6881e0a1..f78dd9488cd 100644
--- a/src/mame/drivers/lazercmd.cpp
+++ b/src/mame/drivers/lazercmd.cpp
@@ -259,7 +259,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(lazercmd_state::lazercmd_timer)
{
m_timer_count = 0;
m_sense_state ^= 1;
- m_maincpu->write_sense(m_sense_state ? ASSERT_LINE : CLEAR_LINE);
+ m_maincpu->set_input_line(S2650_SENSE_LINE, m_sense_state ? ASSERT_LINE : CLEAR_LINE);
}
}
diff --git a/src/mame/drivers/ltd.cpp b/src/mame/drivers/ltd.cpp
index 23749cd2313..533a785bd46 100644
--- a/src/mame/drivers/ltd.cpp
+++ b/src/mame/drivers/ltd.cpp
@@ -387,7 +387,7 @@ DRIVER_INIT_MEMBER( ltd_state, zephy )
TIMER_DEVICE_CALLBACK_MEMBER( ltd_state::timer_r )
{
m_timer_r ^= 1;
- m_maincpu->set_input_line(M6800_IRQ_LINE, (m_timer_r) ? CLEAR_LINE : ASSERT_LINE);
+ m_maincpu->set_input_line(M6802_IRQ_LINE, (m_timer_r) ? CLEAR_LINE : ASSERT_LINE);
static const UINT8 patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0x58, 0x4c, 0x62, 0x69, 0x78, 0 }; // 7447
m_out_offs++;
if (m_out_offs > 0x7f) m_out_offs = 0x60;
diff --git a/src/mame/drivers/matmania.cpp b/src/mame/drivers/matmania.cpp
index 0384e2613d5..4b872c5a373 100644
--- a/src/mame/drivers/matmania.cpp
+++ b/src/mame/drivers/matmania.cpp
@@ -535,7 +535,7 @@ static MACHINE_CONFIG_START( maniach, matmania_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_SOUND_ADD("ymsnd", YM3526, 3600000)
- MCFG_YM3526_IRQ_HANDLER(DEVWRITELINE("audiocpu", m6809_device, firq_line))
+ MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", M6809_FIRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DAC_ADD("dac")
diff --git a/src/mame/drivers/meadows.cpp b/src/mame/drivers/meadows.cpp
index cc808e5324f..f97ee965bce 100644
--- a/src/mame/drivers/meadows.cpp
+++ b/src/mame/drivers/meadows.cpp
@@ -212,7 +212,7 @@ INTERRUPT_GEN_MEMBER(meadows_state::meadows_interrupt)
{
/* fake something toggling the sense input line of the S2650 */
m_main_sense_state ^= 1;
- m_maincpu->write_sense(m_main_sense_state ? ASSERT_LINE : CLEAR_LINE);
+ m_maincpu->set_input_line(S2650_SENSE_LINE, m_main_sense_state ? ASSERT_LINE : CLEAR_LINE);
}
@@ -308,7 +308,7 @@ INTERRUPT_GEN_MEMBER(meadows_state::audio_interrupt)
{
/* fake something toggling the sense input line of the S2650 */
m_audio_sense_state ^= 1;
- m_audiocpu->write_sense(m_audio_sense_state ? ASSERT_LINE : CLEAR_LINE);
+ m_audiocpu->set_input_line(S2650_SENSE_LINE, m_audio_sense_state ? ASSERT_LINE : CLEAR_LINE);
}
diff --git a/src/mame/drivers/mekd2.cpp b/src/mame/drivers/mekd2.cpp
index 3e79057964e..a2b7d1f9d71 100644
--- a/src/mame/drivers/mekd2.cpp
+++ b/src/mame/drivers/mekd2.cpp
@@ -383,12 +383,12 @@ static MACHINE_CONFIG_START( mekd2, mekd2_state )
MCFG_PIA_WRITEPA_HANDLER(WRITE8(mekd2_state, mekd2_segment_w))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(mekd2_state, mekd2_digit_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(mekd2_state, mekd2_nmi_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, nmi_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, nmi_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", INPUT_LINE_NMI))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", INPUT_LINE_NMI))
MCFG_DEVICE_ADD("pia_u", PIA6821, 0)
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_DEVICE_ADD("acia", ACIA6850, 0)
MCFG_ACIA6850_TXD_HANDLER(WRITELINE(mekd2_state, cass_w))
diff --git a/src/mame/drivers/metlclsh.cpp b/src/mame/drivers/metlclsh.cpp
index 920585917e5..e4e1d362c87 100644
--- a/src/mame/drivers/metlclsh.cpp
+++ b/src/mame/drivers/metlclsh.cpp
@@ -305,7 +305,7 @@ static MACHINE_CONFIG_START( metlclsh, metlclsh_state )
MCFG_SOUND_ROUTE(3, "mono", 0.50)
MCFG_SOUND_ADD("ym2", YM3526, 3000000)
- MCFG_YM3526_IRQ_HANDLER(DEVWRITELINE("maincpu", m6809_device, irq_line))
+ MCFG_YM3526_IRQ_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/microkit.cpp b/src/mame/drivers/microkit.cpp
index caf2207a9d2..ae4050b11a4 100644
--- a/src/mame/drivers/microkit.cpp
+++ b/src/mame/drivers/microkit.cpp
@@ -123,7 +123,7 @@ static MACHINE_CONFIG_START( microkit, microkit_state )
/* video hardware */
MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "keyboard")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("maincpu", cosmac_device, ef4_w))
+ MCFG_RS232_RXD_HANDLER(INPUTLINE("maincpu", COSMAC_INPUT_LINE_EF4))
MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("keyboard", serial_keyb)
MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mkit09.cpp b/src/mame/drivers/mkit09.cpp
index b3ebef1b5cd..1430ffcbc24 100644
--- a/src/mame/drivers/mkit09.cpp
+++ b/src/mame/drivers/mkit09.cpp
@@ -207,8 +207,8 @@ static MACHINE_CONFIG_START( mkit09, mkit09_state )
MCFG_PIA_READPB_HANDLER(READ8(mkit09_state, pb_r))
MCFG_PIA_WRITEPA_HANDLER(WRITE8(mkit09_state, pa_w))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(mkit09_state, pb_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_CASSETTE_ADD( "cassette" )
MACHINE_CONFIG_END
@@ -233,8 +233,8 @@ static MACHINE_CONFIG_START( mkit09a, mkit09_state )
MCFG_PIA_READPB_HANDLER(READ8(mkit09_state, pb_r))
MCFG_PIA_WRITEPA_HANDLER(WRITE8(mkit09_state, pa_w))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(mkit09_state, pb_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_CASSETTE_ADD( "cassette" )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mpu3.cpp b/src/mame/drivers/mpu3.cpp
index 97c65cdc8e9..7d527f0890f 100644
--- a/src/mame/drivers/mpu3.cpp
+++ b/src/mame/drivers/mpu3.cpp
@@ -271,7 +271,7 @@ WRITE_LINE_MEMBER(mpu3_state::cpu0_irq)
pia6->irq_a_state() | pia6->irq_b_state() |
ptm2->irq_state();
- m_maincpu->set_input_line(M6800_IRQ_LINE, combined_state ? ASSERT_LINE : CLEAR_LINE);
+ m_maincpu->set_input_line(M6808_IRQ_LINE, combined_state ? ASSERT_LINE : CLEAR_LINE);
LOG(("6808 int%d \n", combined_state));
}
diff --git a/src/mame/drivers/nyny.cpp b/src/mame/drivers/nyny.cpp
index 85e18877188..12d7a69d02e 100644
--- a/src/mame/drivers/nyny.cpp
+++ b/src/mame/drivers/nyny.cpp
@@ -363,7 +363,7 @@ WRITE_LINE_MEMBER(nyny_state::display_enable_changed)
WRITE8_MEMBER(nyny_state::audio_1_command_w)
{
m_soundlatch->write(space, 0, data);
- m_audiocpu->set_input_line(M6800_IRQ_LINE, HOLD_LINE);
+ m_audiocpu->set_input_line(M6802_IRQ_LINE, HOLD_LINE);
}
@@ -390,7 +390,7 @@ WRITE8_MEMBER(nyny_state::nyny_ay8910_37_port_a_w)
WRITE8_MEMBER(nyny_state::audio_2_command_w)
{
m_soundlatch2->write(space, 0, (data & 0x60) >> 5);
- m_audiocpu2->set_input_line(M6800_IRQ_LINE, BIT(data, 7) ? CLEAR_LINE : ASSERT_LINE);
+ m_audiocpu2->set_input_line(M6802_IRQ_LINE, BIT(data, 7) ? CLEAR_LINE : ASSERT_LINE);
}
diff --git a/src/mame/drivers/pegasus.cpp b/src/mame/drivers/pegasus.cpp
index 395cad82b3f..034ae2ef0d4 100644
--- a/src/mame/drivers/pegasus.cpp
+++ b/src/mame/drivers/pegasus.cpp
@@ -512,12 +512,12 @@ static MACHINE_CONFIG_START( pegasus, pegasus_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(pegasus_state, pegasus_controls_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(pegasus_state, pegasus_cassette_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(pegasus_state, pegasus_firq_clr))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_DEVICE_ADD("pia_u", PIA6821, 0)
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_GENERIC_SOCKET_ADD("exp00", generic_plain_slot, "pegasus_cart")
MCFG_GENERIC_LOAD(pegasus_state, exp00_load)
diff --git a/src/mame/drivers/pipbug.cpp b/src/mame/drivers/pipbug.cpp
index c6050fb81cf..40bc9788483 100644
--- a/src/mame/drivers/pipbug.cpp
+++ b/src/mame/drivers/pipbug.cpp
@@ -162,7 +162,7 @@ static MACHINE_CONFIG_START( pipbug, pipbug_state )
/* video hardware */
MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("maincpu", s2650_device, write_sense))
+ MCFG_RS232_RXD_HANDLER(INPUTLINE("maincpu", S2650_SENSE_LINE))
MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", terminal)
/* quickload */
diff --git a/src/mame/drivers/poly.cpp b/src/mame/drivers/poly.cpp
index 4dbf5502166..da47ce1e4ad 100644
--- a/src/mame/drivers/poly.cpp
+++ b/src/mame/drivers/poly.cpp
@@ -174,14 +174,14 @@ static MACHINE_CONFIG_START( poly, poly_state )
MCFG_SAA5050_SCREEN_SIZE(40, 24, 40)
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
MCFG_PIA_READPB_HANDLER(READ8(poly_state, pia1_b_in))
// CB1 kbd strobe
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_DEVICE_ADD("ptm", PTM6840, 0)
MCFG_PTM6840_INTERNAL_CLOCK(XTAL_12MHz / 3)
diff --git a/src/mame/drivers/proteus3.cpp b/src/mame/drivers/proteus3.cpp
index 760d0d10c4d..04e28c82c63 100644
--- a/src/mame/drivers/proteus3.cpp
+++ b/src/mame/drivers/proteus3.cpp
@@ -332,7 +332,7 @@ static MACHINE_CONFIG_START( proteus3, proteus3_state )
MCFG_DEVICE_ADD("pia", PIA6821, 0)
MCFG_PIA_WRITEPA_HANDLER(WRITE8(proteus3_state, video_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(proteus3_state, ca2_w))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
MCFG_GENERIC_KEYBOARD_CB(WRITE8(proteus3_state, kbd_put))
diff --git a/src/mame/drivers/r2dtank.cpp b/src/mame/drivers/r2dtank.cpp
index 771bf1a6500..146f416a294 100644
--- a/src/mame/drivers/r2dtank.cpp
+++ b/src/mame/drivers/r2dtank.cpp
@@ -142,7 +142,7 @@ if (LOG_AUDIO_COMM) logerror("%08X CPU#1 Audio Command Read: %x\n", space.devi
WRITE8_MEMBER(r2dtank_state::audio_command_w)
{
m_soundlatch->write(space, 0, ~data);
- m_audiocpu->set_input_line(M6800_IRQ_LINE, HOLD_LINE);
+ m_audiocpu->set_input_line(M6802_IRQ_LINE, HOLD_LINE);
if (LOG_AUDIO_COMM) logerror("%08X CPU#0 Audio Command Write: %x\n", space.device().safe_pc(), data^0xff);
}
diff --git a/src/mame/drivers/renegade.cpp b/src/mame/drivers/renegade.cpp
index c42ac577d1b..b1cca745881 100644
--- a/src/mame/drivers/renegade.cpp
+++ b/src/mame/drivers/renegade.cpp
@@ -875,7 +875,7 @@ static MACHINE_CONFIG_START( renegade, renegade_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_SOUND_ADD("ymsnd", YM3526, 12000000/4)
- MCFG_YM3526_IRQ_HANDLER(DEVWRITELINE("audiocpu", m6809_device, firq_line))
+ MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", M6809_FIRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_SOUND_ADD("msm", MSM5205, 12000000/32)
diff --git a/src/mame/drivers/s11.cpp b/src/mame/drivers/s11.cpp
index c8fb4f85934..70fffe59533 100644
--- a/src/mame/drivers/s11.cpp
+++ b/src/mame/drivers/s11.cpp
@@ -143,7 +143,7 @@ void s11_state::device_timer(emu_timer &timer, device_timer_id id, int param, vo
case TIMER_IRQ:
if(param == 1)
{
- m_maincpu->set_input_line(M6800_IRQ_LINE,ASSERT_LINE);
+ m_maincpu->set_input_line(M6802_IRQ_LINE, ASSERT_LINE);
m_irq_timer->adjust(attotime::from_ticks(32,E_CLOCK),0);
if(m_pias)
m_pias->cb1_w(0);
@@ -153,7 +153,7 @@ void s11_state::device_timer(emu_timer &timer, device_timer_id id, int param, vo
}
else
{
- m_maincpu->set_input_line(M6800_IRQ_LINE,CLEAR_LINE);
+ m_maincpu->set_input_line(M6802_IRQ_LINE, CLEAR_LINE);
m_irq_timer->adjust(attotime::from_ticks(S11_IRQ_CYCLES,E_CLOCK),1);
if(m_pias)
m_pias->cb1_w(1);
@@ -223,7 +223,7 @@ WRITE_LINE_MEMBER( s11_state::pia21_ca2_w )
WRITE8_MEMBER( s11_state::lamp0_w )
{
- m_maincpu->set_input_line(M6800_IRQ_LINE, CLEAR_LINE);
+ m_maincpu->set_input_line(M6802_IRQ_LINE, CLEAR_LINE);
}
WRITE8_MEMBER( s11_state::dig0_w )
@@ -470,8 +470,8 @@ static MACHINE_CONFIG_START( s11, s11_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, dac_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(s11_state, pias_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pias_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("audiocpu", m6808_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("audiocpu", m6808_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE))
/* Add the background music card */
MCFG_CPU_ADD("bgcpu", M6809E, 8000000) // MC68B09E
@@ -489,8 +489,8 @@ static MACHINE_CONFIG_START( s11, s11_state )
MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, pia40_pa_w))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, pia40_pb_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia40_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("bgcpu", m6809e_device, firq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("bgcpu", m6809e_device, nmi_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("bgcpu", M6809_FIRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("bgcpu", INPUT_LINE_NMI))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/s11a.cpp b/src/mame/drivers/s11a.cpp
index c809eabf3e7..8ad3ff0ae65 100644
--- a/src/mame/drivers/s11a.cpp
+++ b/src/mame/drivers/s11a.cpp
@@ -249,8 +249,8 @@ static MACHINE_CONFIG_START( s11a, s11a_state )
MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, sound_w))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, dac_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia40_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("audiocpu", m6802_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("audiocpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
/* Add the background music card */
MCFG_CPU_ADD("bgcpu", M6809E, 8000000) // MC68B09E
@@ -269,8 +269,8 @@ static MACHINE_CONFIG_START( s11a, s11a_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, pia40_pb_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(s11_state, pias_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pias_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("bgcpu", m6809e_device, firq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("bgcpu", m6809e_device, nmi_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("bgcpu", M6809_FIRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("bgcpu", INPUT_LINE_NMI))
MACHINE_CONFIG_END
/*------------------------
diff --git a/src/mame/drivers/s11b.cpp b/src/mame/drivers/s11b.cpp
index a9f074adc5e..a87c4bb3419 100644
--- a/src/mame/drivers/s11b.cpp
+++ b/src/mame/drivers/s11b.cpp
@@ -329,8 +329,8 @@ static MACHINE_CONFIG_START( s11b, s11b_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, dac_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(s11_state, pias_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pias_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("audiocpu", m6802_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("audiocpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
/* Add the background music card */
MCFG_CPU_ADD("bgcpu", M6809E, XTAL_8MHz) // MC68B09E (note: schematics show this as 8mhz/2, but games crash very quickly with that speed?)
@@ -353,8 +353,8 @@ static MACHINE_CONFIG_START( s11b, s11b_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, pia40_pb_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(s11b_state, pia40_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia40_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("bgcpu", m6809e_device, firq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("bgcpu", m6809e_device, nmi_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("bgcpu", M6809_FIRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("bgcpu", INPUT_LINE_NMI))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/s11c.cpp b/src/mame/drivers/s11c.cpp
index 5efd4c9e5ae..1eb5f69f016 100644
--- a/src/mame/drivers/s11c.cpp
+++ b/src/mame/drivers/s11c.cpp
@@ -237,8 +237,8 @@ static MACHINE_CONFIG_START( s11c, s11c_state )
MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, pia40_pa_w))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, pia40_pb_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia40_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("bgcpu", m6809_device, firq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("bgcpu", m6809_device, nmi_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("bgcpu", M6809_FIRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("bgcpu", INPUT_LINE_NMI))
*/
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/s3.cpp b/src/mame/drivers/s3.cpp
index 9d6167b9eae..e1f63043c14 100644
--- a/src/mame/drivers/s3.cpp
+++ b/src/mame/drivers/s3.cpp
@@ -440,16 +440,16 @@ static MACHINE_CONFIG_START( s3, s3_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(s3_state, sol1_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(s3_state, pia22_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(s3_state, pia22_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_DEVICE_ADD("pia24", PIA6821, 0)
MCFG_PIA_WRITEPA_HANDLER(WRITE8(s3_state, lamp0_w))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(s3_state, lamp1_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(s3_state, pia24_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(s3_state, pia24_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_DEVICE_ADD("pia28", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(READ8(s3_state, dips_r))
@@ -459,16 +459,16 @@ static MACHINE_CONFIG_START( s3, s3_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(s3_state, dig1_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(s3_state, pia28_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(s3_state, pia28_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_DEVICE_ADD("pia30", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(READ8(s3_state, switch_r))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(s3_state, switch_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(s3_state, pia30_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(s3_state, pia30_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
@@ -485,8 +485,8 @@ static MACHINE_CONFIG_DERIVED( s3a, s3 )
MCFG_DEVICE_ADD("pias", PIA6821, 0)
MCFG_PIA_READPB_HANDLER(READ8(s3_state, dac_r))
MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("dac", dac_device, write_unsigned8))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("audiocpu", m6800_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("audiocpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/s4.cpp b/src/mame/drivers/s4.cpp
index 52aca8c0ce1..0df3bd7b1ff 100644
--- a/src/mame/drivers/s4.cpp
+++ b/src/mame/drivers/s4.cpp
@@ -433,16 +433,16 @@ static MACHINE_CONFIG_START( s4, s4_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(s4_state, sol1_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(s4_state, pia22_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(s4_state, pia22_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_DEVICE_ADD("pia24", PIA6821, 0)
MCFG_PIA_WRITEPA_HANDLER(WRITE8(s4_state, lamp0_w))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(s4_state, lamp1_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(s4_state, pia24_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(s4_state, pia24_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_DEVICE_ADD("pia28", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(READ8(s4_state, dips_r))
@@ -452,16 +452,16 @@ static MACHINE_CONFIG_START( s4, s4_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(s4_state, dig1_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(s4_state, pia28_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(s4_state, pia28_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_DEVICE_ADD("pia30", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(READ8(s4_state, switch_r))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(s4_state, switch_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(s4_state, pia30_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(s4_state, pia30_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
@@ -478,8 +478,8 @@ static MACHINE_CONFIG_DERIVED( s4a, s4 )
MCFG_DEVICE_ADD("pias", PIA6821, 0)
MCFG_PIA_READPB_HANDLER(READ8(s4_state, dac_r))
MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("dac", dac_device, write_unsigned8))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("audiocpu", m6808_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("audiocpu", m6808_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/s6.cpp b/src/mame/drivers/s6.cpp
index 00e82e3500a..cc28d6f3c58 100644
--- a/src/mame/drivers/s6.cpp
+++ b/src/mame/drivers/s6.cpp
@@ -368,14 +368,14 @@ void s6_state::device_timer(emu_timer &timer, device_timer_id id, int param, voi
case TIMER_IRQ:
if(param == 1)
{
- m_maincpu->set_input_line(M6800_IRQ_LINE,ASSERT_LINE);
+ m_maincpu->set_input_line(M6808_IRQ_LINE, ASSERT_LINE);
m_irq_timer->adjust(attotime::from_ticks(32,3580000/4),0);
m_pia28->ca1_w(BIT(ioport("DIAGS")->read(), 2)); // Advance
m_pia28->cb1_w(BIT(ioport("DIAGS")->read(), 3)); // Up/Down
}
else
{
- m_maincpu->set_input_line(M6800_IRQ_LINE,CLEAR_LINE);
+ m_maincpu->set_input_line(M6808_IRQ_LINE, CLEAR_LINE);
m_irq_timer->adjust(attotime::from_ticks(980,3580000/4),1);
m_pia28->ca1_w(1);
m_pia28->cb1_w(1);
@@ -457,8 +457,8 @@ static MACHINE_CONFIG_START( s6, s6_state )
MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("dac", dac_device, write_unsigned8))
MCFG_PIA_CA2_HANDLER(DEVWRITELINE("hc55516", hc55516_device, digit_w))
MCFG_PIA_CB2_HANDLER(DEVWRITELINE("hc55516", hc55516_device, clock_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("audiocpu", m6802_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("audiocpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/s6a.cpp b/src/mame/drivers/s6a.cpp
index e1c5567b1e4..85988cb072f 100644
--- a/src/mame/drivers/s6a.cpp
+++ b/src/mame/drivers/s6a.cpp
@@ -351,14 +351,14 @@ void s6a_state::device_timer(emu_timer &timer, device_timer_id id, int param, vo
case TIMER_IRQ:
if(param == 1)
{
- m_maincpu->set_input_line(M6800_IRQ_LINE,ASSERT_LINE);
+ m_maincpu->set_input_line(M6808_IRQ_LINE, ASSERT_LINE);
m_irq_timer->adjust(attotime::from_ticks(32,3580000/4),0);
m_pia28->ca1_w(BIT(ioport("DIAGS")->read(), 2)); // Advance
m_pia28->cb1_w(BIT(ioport("DIAGS")->read(), 3)); // Up/Down
}
else
{
- m_maincpu->set_input_line(M6800_IRQ_LINE,CLEAR_LINE);
+ m_maincpu->set_input_line(M6808_IRQ_LINE, CLEAR_LINE);
m_irq_timer->adjust(attotime::from_ticks(980,3580000/4),1);
m_pia28->ca1_w(1);
m_pia28->cb1_w(1);
@@ -440,8 +440,8 @@ static MACHINE_CONFIG_START( s6a, s6a_state )
MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("dac", dac_device, write_unsigned8))
MCFG_PIA_CA2_HANDLER(DEVWRITELINE("hc55516", hc55516_device, digit_w))
MCFG_PIA_CB2_HANDLER(DEVWRITELINE("hc55516", hc55516_device, clock_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("audiocpu", m6802_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("audiocpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/s7.cpp b/src/mame/drivers/s7.cpp
index a4428f7590d..6637564468a 100644
--- a/src/mame/drivers/s7.cpp
+++ b/src/mame/drivers/s7.cpp
@@ -387,14 +387,14 @@ void s7_state::device_timer(emu_timer &timer, device_timer_id id, int param, voi
case TIMER_IRQ:
if(param == 1)
{
- m_maincpu->set_input_line(M6800_IRQ_LINE,ASSERT_LINE);
+ m_maincpu->set_input_line(M6808_IRQ_LINE, ASSERT_LINE);
m_irq_timer->adjust(attotime::from_ticks(32,3580000/4),0);
m_pia28->ca1_w(BIT(ioport("DIAGS")->read(), 2)); // Advance
m_pia28->cb1_w(BIT(ioport("DIAGS")->read(), 3)); // Up/Down
}
else
{
- m_maincpu->set_input_line(M6800_IRQ_LINE,CLEAR_LINE);
+ m_maincpu->set_input_line(M6808_IRQ_LINE, CLEAR_LINE);
m_irq_timer->adjust(attotime::from_ticks(980,3580000/4),1);
m_pia28->ca1_w(1);
m_pia28->cb1_w(1);
@@ -473,8 +473,8 @@ static MACHINE_CONFIG_START( s7, s7_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(s7_state, switch_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(s7_state, pia30_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(s7_state, pia30_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6808_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6808_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6808_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6808_IRQ_LINE))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -495,8 +495,8 @@ static MACHINE_CONFIG_START( s7, s7_state )
MCFG_PIA_READCA1_HANDLER(VCC)
MCFG_PIA_CA2_HANDLER(DEVWRITELINE("hc55516", hc55516_device, digit_w))
MCFG_PIA_CB2_HANDLER(DEVWRITELINE("hc55516", hc55516_device, clock_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("audiocpu", m6808_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("audiocpu", m6808_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/s8.cpp b/src/mame/drivers/s8.cpp
index 5c2f2c83284..a9cc361417f 100644
--- a/src/mame/drivers/s8.cpp
+++ b/src/mame/drivers/s8.cpp
@@ -276,14 +276,14 @@ void s8_state::device_timer(emu_timer &timer, device_timer_id id, int param, voi
case TIMER_IRQ:
if(param == 1)
{
- m_maincpu->set_input_line(M6800_IRQ_LINE,ASSERT_LINE);
+ m_maincpu->set_input_line(M6802_IRQ_LINE, ASSERT_LINE);
m_irq_timer->adjust(attotime::from_ticks(32,1e6),0);
m_pia28->ca1_w(BIT(ioport("DIAGS")->read(), 2)); // Advance
m_pia28->cb1_w(BIT(ioport("DIAGS")->read(), 3)); // Up/Down
}
else
{
- m_maincpu->set_input_line(M6800_IRQ_LINE,CLEAR_LINE);
+ m_maincpu->set_input_line(M6802_IRQ_LINE, CLEAR_LINE);
m_irq_timer->adjust(attotime::from_ticks(980,1e6),1);
m_pia28->ca1_w(1);
m_pia28->cb1_w(1);
@@ -358,8 +358,8 @@ static MACHINE_CONFIG_START( s8, s8_state )
MCFG_DEVICE_ADD("pias", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(READ8(s8_state, dac_r))
MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8("dac", dac_device, write_unsigned8))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("audiocpu", m6808_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("audiocpu", m6808_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE))
MACHINE_CONFIG_END
/*------------------------------
diff --git a/src/mame/drivers/s8a.cpp b/src/mame/drivers/s8a.cpp
index 444505d8538..677f4b3b43f 100644
--- a/src/mame/drivers/s8a.cpp
+++ b/src/mame/drivers/s8a.cpp
@@ -248,14 +248,14 @@ void s8a_state::device_timer(emu_timer &timer, device_timer_id id, int param, vo
case TIMER_IRQ:
if(param == 1)
{
- m_maincpu->set_input_line(M6800_IRQ_LINE,ASSERT_LINE);
+ m_maincpu->set_input_line(M6802_IRQ_LINE, ASSERT_LINE);
m_irq_timer->adjust(attotime::from_ticks(32,1e6),0);
m_pia28->ca1_w(BIT(ioport("DIAGS")->read(), 2)); // Advance
m_pia28->cb1_w(BIT(ioport("DIAGS")->read(), 3)); // Up/Down
}
else
{
- m_maincpu->set_input_line(M6800_IRQ_LINE,CLEAR_LINE);
+ m_maincpu->set_input_line(M6802_IRQ_LINE, CLEAR_LINE);
m_irq_timer->adjust(attotime::from_ticks(980,1e6),1);
m_pia28->ca1_w(1);
m_pia28->cb1_w(1);
@@ -330,8 +330,8 @@ static MACHINE_CONFIG_START( s8a, s8a_state )
MCFG_DEVICE_ADD("pias", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(READ8(s8a_state, dac_r))
MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8("dac", dac_device, write_unsigned8))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("audiocpu", m6808_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("audiocpu", m6808_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/s9.cpp b/src/mame/drivers/s9.cpp
index f72606db6f5..4ffe5fd99b2 100644
--- a/src/mame/drivers/s9.cpp
+++ b/src/mame/drivers/s9.cpp
@@ -284,14 +284,14 @@ void s9_state::device_timer(emu_timer &timer, device_timer_id id, int param, voi
case TIMER_IRQ:
if(param == 1)
{
- m_maincpu->set_input_line(M6800_IRQ_LINE,ASSERT_LINE);
+ m_maincpu->set_input_line(M6808_IRQ_LINE, ASSERT_LINE);
m_irq_timer->adjust(attotime::from_ticks(32,1e6),0);
m_pia28->ca1_w(BIT(ioport("DIAGS")->read(), 2)); // Advance
m_pia28->cb1_w(BIT(ioport("DIAGS")->read(), 3)); // Up/Down
}
else
{
- m_maincpu->set_input_line(M6800_IRQ_LINE,CLEAR_LINE);
+ m_maincpu->set_input_line(M6808_IRQ_LINE, CLEAR_LINE);
m_irq_timer->adjust(attotime::from_ticks(980,1e6),1);
m_pia28->ca1_w(1);
m_pia28->cb1_w(1);
@@ -371,8 +371,8 @@ static MACHINE_CONFIG_START( s9, s9_state )
MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8("dac", dac_device, write_unsigned8))
MCFG_PIA_CA2_HANDLER(DEVWRITELINE("hc55516", hc55516_device, clock_w))
MCFG_PIA_CB2_HANDLER(DEVWRITELINE("hc55516", hc55516_device, digit_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("audiocpu", m6808_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("audiocpu", m6808_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE))
MACHINE_CONFIG_END
/*-----------------------------
diff --git a/src/mame/drivers/sidepckt.cpp b/src/mame/drivers/sidepckt.cpp
index bc7506c0bbd..73c2e6ee493 100644
--- a/src/mame/drivers/sidepckt.cpp
+++ b/src/mame/drivers/sidepckt.cpp
@@ -395,7 +395,7 @@ static MACHINE_CONFIG_START( sidepckt, sidepckt_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("ym2", YM3526, 3000000)
- MCFG_YM3526_IRQ_HANDLER(DEVWRITELINE("audiocpu", m6502_device, irq_line))
+ MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/spiders.cpp b/src/mame/drivers/spiders.cpp
index b6c64842ee1..14485b8162c 100644
--- a/src/mame/drivers/spiders.cpp
+++ b/src/mame/drivers/spiders.cpp
@@ -236,18 +236,6 @@ WRITE_LINE_MEMBER(spiders_state::main_cpu_irq)
}
-WRITE_LINE_MEMBER(spiders_state::main_cpu_firq)
-{
- m_maincpu->set_input_line(M6809_FIRQ_LINE, state ? ASSERT_LINE : CLEAR_LINE);
-}
-
-
-WRITE_LINE_MEMBER(spiders_state::audio_cpu_irq)
-{
- m_audiocpu->set_input_line(M6800_IRQ_LINE, state ? ASSERT_LINE : CLEAR_LINE);
-}
-
-
/*************************************
*
@@ -588,7 +576,7 @@ static MACHINE_CONFIG_START( spiders, spiders_state )
MCFG_PIA_READPA_HANDLER(READ8(spiders_state,gfx_rom_r))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(spiders_state,gfx_rom_intf_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(spiders_state,flipscreen_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(spiders_state,main_cpu_firq))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6809_FIRQ_LINE))
MCFG_PIA_IRQB_HANDLER(WRITELINE(spiders_state,main_cpu_irq))
MCFG_DEVICE_ADD("pia3", PIA6821, 0)
@@ -600,7 +588,7 @@ static MACHINE_CONFIG_START( spiders, spiders_state )
MCFG_DEVICE_ADD("pia4", PIA6821, 0)
MCFG_PIA_WRITEPA_HANDLER(WRITE8(spiders_state, spiders_audio_a_w))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(spiders_state, spiders_audio_b_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(spiders_state, audio_cpu_irq))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
MCFG_DEVICE_ADD("ic60", TTL74123, 0)
MCFG_TTL74123_CONNECTION_TYPE(TTL74123_GROUNDED) /* the hook up type */
diff --git a/src/mame/drivers/st_mp100.cpp b/src/mame/drivers/st_mp100.cpp
index 7319daffee8..17ac76a0bf2 100644
--- a/src/mame/drivers/st_mp100.cpp
+++ b/src/mame/drivers/st_mp100.cpp
@@ -724,8 +724,8 @@ static MACHINE_CONFIG_START( st_mp100, st_mp100_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(st_mp100_state, u10_b_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(st_mp100_state, u10_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(st_mp100_state, u10_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_x", st_mp100_state, timer_x, attotime::from_hz(120)) // mains freq*2
MCFG_DEVICE_ADD("pia_u11", PIA6821, 0)
@@ -734,8 +734,8 @@ static MACHINE_CONFIG_START( st_mp100, st_mp100_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(st_mp100_state, u11_b_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(st_mp100_state, u11_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(st_mp100_state, u11_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_d", st_mp100_state, u11_timer, attotime::from_hz(634)) // 555 timer*2
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/st_mp200.cpp b/src/mame/drivers/st_mp200.cpp
index ff7d88e7c1c..a0ed6306fd1 100644
--- a/src/mame/drivers/st_mp200.cpp
+++ b/src/mame/drivers/st_mp200.cpp
@@ -598,8 +598,8 @@ static MACHINE_CONFIG_START( st_mp200, st_mp200_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(st_mp200_state, u10_b_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(st_mp200_state, u10_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(st_mp200_state, u10_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_x", st_mp200_state, timer_x, attotime::from_hz(120)) // mains freq*2
MCFG_DEVICE_ADD("pia_u11", PIA6821, 0)
@@ -608,8 +608,8 @@ static MACHINE_CONFIG_START( st_mp200, st_mp200_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(st_mp200_state, u11_b_w))
MCFG_PIA_CA2_HANDLER(WRITELINE(st_mp200_state, u11_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(st_mp200_state, u11_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_d", st_mp200_state, u11_timer, attotime::from_hz(634)) // 555 timer*2
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/swtpc09.cpp b/src/mame/drivers/swtpc09.cpp
index 9c84bdcb59e..4397d3cf296 100644
--- a/src/mame/drivers/swtpc09.cpp
+++ b/src/mame/drivers/swtpc09.cpp
@@ -213,7 +213,7 @@ static MACHINE_CONFIG_START( swtpc09d3, swtpc09_state )
MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(swtpc09_state, acia_interrupt))
- MCFG_ACIA6850_IRQ_HANDLER(DEVWRITELINE("maincpu", m6809_device, irq_line))
+ MCFG_ACIA6850_IRQ_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_DEVICE_ADD("acia_clock", CLOCK, 153600)
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(swtpc09_state, write_acia_clock))
diff --git a/src/mame/drivers/sym1.cpp b/src/mame/drivers/sym1.cpp
index 231703d1df1..ab69b9733dc 100644
--- a/src/mame/drivers/sym1.cpp
+++ b/src/mame/drivers/sym1.cpp
@@ -331,14 +331,14 @@ static MACHINE_CONFIG_START( sym1, sym1_state )
// lines 7-9 not connected
MCFG_DEVICE_ADD("via6522_0", VIA6522, 0)
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("maincpu", m6502_device, irq_line))
+ MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M6502_IRQ_LINE))
MCFG_DEVICE_ADD("via6522_1", VIA6522, 0)
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("maincpu", m6502_device, irq_line))
+ MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M6502_IRQ_LINE))
MCFG_DEVICE_ADD("via6522_2", VIA6522, 0)
MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(sym1_state, sym1_via2_a_w))
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("maincpu", m6502_device, irq_line))
+ MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M6502_IRQ_LINE))
// internal ram
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/mame/drivers/taito.cpp b/src/mame/drivers/taito.cpp
index 580921c4a4e..256854eaa22 100644
--- a/src/mame/drivers/taito.cpp
+++ b/src/mame/drivers/taito.cpp
@@ -343,8 +343,8 @@ static MACHINE_CONFIG_START( taito, taito_state )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(taito_state, pia_pb_w))
//MCFG_PIA_CA2_HANDLER(WRITELINE(taito_state, pia_ca2_w))
//MCFG_PIA_CB2_HANDLER(WRITELINE(taito_state, pia_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("audiocpu", m6802_cpu_device, nmi_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("audiocpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_a", taito_state, timer_a, attotime::from_hz(200))
MACHINE_CONFIG_END
@@ -376,8 +376,8 @@ static MACHINE_CONFIG_DERIVED( taito4, taito )
MCFG_PIA_WRITEPB_HANDLER(WRITE8(taito_state, pia_pb_w))
//MCFG_PIA_CA2_HANDLER(WRITELINE(taito_state, pia_ca2_w))
MCFG_PIA_CB2_HANDLER(WRITELINE(taito_state, pia_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("audiocpu", m6802_cpu_device, nmi_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("audiocpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( taito_ay_audio )
diff --git a/src/mame/drivers/tavernie.cpp b/src/mame/drivers/tavernie.cpp
index 2041652fcc3..13646865916 100644
--- a/src/mame/drivers/tavernie.cpp
+++ b/src/mame/drivers/tavernie.cpp
@@ -314,8 +314,8 @@ static MACHINE_CONFIG_START( cpu09, tavernie_state )
MCFG_PIA_READCA1_HANDLER(READLINE(tavernie_state, ca1_r))
MCFG_PIA_WRITEPA_HANDLER(WRITE8(tavernie_state, pa_w))
MCFG_PIA_WRITEPB_HANDLER(WRITE8(tavernie_state, pb_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_DEVICE_ADD("ptm", PTM6840, 0)
// all i/o lines connect to the 40-pin expansion connector
diff --git a/src/mame/drivers/v6809.cpp b/src/mame/drivers/v6809.cpp
index 81dde70447b..a7d5154cd3d 100644
--- a/src/mame/drivers/v6809.cpp
+++ b/src/mame/drivers/v6809.cpp
@@ -331,13 +331,13 @@ static MACHINE_CONFIG_START( v6809, v6809_state )
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
MCFG_PIA_READPB_HANDLER(READ8(v6809_state, pb_r))
MCFG_PIA_WRITEPA_HANDLER(WRITE8(v6809_state, pa_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
// no idea what this does
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809_device, irq_line))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
+ MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_DEVICE_ADD("ptm", PTM6840, 0)
MCFG_PTM6840_INTERNAL_CLOCK(XTAL_16MHz / 4)
diff --git a/src/mame/drivers/vic20.cpp b/src/mame/drivers/vic20.cpp
index 1b504f877af..5413d1df358 100644
--- a/src/mame/drivers/vic20.cpp
+++ b/src/mame/drivers/vic20.cpp
@@ -664,7 +664,7 @@ static MACHINE_CONFIG_START( vic20, vic20_state )
MCFG_VIA6522_CB1_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_b))
MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, motor_w))
MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_m))
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE(M6502_TAG, m6502_device, nmi_line))
+ MCFG_VIA6522_IRQ_HANDLER(INPUTLINE(M6502_TAG, M6502_NMI_LINE))
MCFG_DEVICE_ADD(M6522_2_TAG, VIA6522, 0)
MCFG_VIA6522_READPA_HANDLER(READ8(vic20_state, via2_pa_r))
@@ -672,7 +672,7 @@ static MACHINE_CONFIG_START( vic20, vic20_state )
MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(vic20_state, via2_pb_w))
MCFG_VIA6522_CA2_HANDLER(WRITELINE(vic20_state, via2_ca2_w))
MCFG_VIA6522_CB2_HANDLER(WRITELINE(vic20_state, via2_cb2_w))
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE(M6502_TAG, m6502_device, irq_line))
+ MCFG_VIA6522_IRQ_HANDLER(INPUTLINE(M6502_TAG, M6502_IRQ_LINE))
MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", DEVWRITELINE(M6522_2_TAG, via6522_device, write_ca1))
MCFG_CBM_IEC_ADD("c1541")
diff --git a/src/mame/includes/spiders.h b/src/mame/includes/spiders.h
index ba29815a7de..6c49f6ceeba 100644
--- a/src/mame/includes/spiders.h
+++ b/src/mame/includes/spiders.h
@@ -28,8 +28,6 @@ public:
UINT8 m_gfx_rom_ctrl_data;
DECLARE_WRITE_LINE_MEMBER(main_cpu_irq);
- DECLARE_WRITE_LINE_MEMBER(main_cpu_firq);
- DECLARE_WRITE_LINE_MEMBER(audio_cpu_irq);
DECLARE_WRITE_LINE_MEMBER(flipscreen_w);
DECLARE_WRITE_LINE_MEMBER(display_enable_changed);
DECLARE_WRITE8_MEMBER(gfx_rom_intf_w);
diff --git a/src/mame/machine/decopincpu.cpp b/src/mame/machine/decopincpu.cpp
index 4e748670071..e1ad37b8b89 100644
--- a/src/mame/machine/decopincpu.cpp
+++ b/src/mame/machine/decopincpu.cpp
@@ -62,7 +62,7 @@ void decocpu_type1_device::device_timer(emu_timer &timer, device_timer_id id, in
case TIMER_IRQ:
if(param == 1)
{
- m_cpu->set_input_line(M6800_IRQ_LINE,ASSERT_LINE);
+ m_cpu->set_input_line(M6808_IRQ_LINE, ASSERT_LINE);
m_irq_timer->adjust(attotime::from_ticks(32,E_CLOCK),0);
m_irq_active = true;
m_pia28->ca1_w(BIT(ioport("DIAGS")->read(), 2));
@@ -70,7 +70,7 @@ void decocpu_type1_device::device_timer(emu_timer &timer, device_timer_id id, in
}
else
{
- m_cpu->set_input_line(M6800_IRQ_LINE,CLEAR_LINE);
+ m_cpu->set_input_line(M6808_IRQ_LINE, CLEAR_LINE);
m_irq_timer->adjust(attotime::from_ticks(S11_IRQ_CYCLES,E_CLOCK),1);
m_irq_active = false;
m_pia28->ca1_w(1);
@@ -117,7 +117,7 @@ WRITE_LINE_MEMBER( decocpu_type1_device::pia21_ca2_w )
WRITE8_MEMBER( decocpu_type1_device::lamp0_w )
{
- m_cpu->set_input_line(M6800_IRQ_LINE, CLEAR_LINE);
+ m_cpu->set_input_line(M6808_IRQ_LINE, CLEAR_LINE);
m_write_lamp(0,data,0xff);
}
diff --git a/src/mame/machine/williams.cpp b/src/mame/machine/williams.cpp
index 0585061e92b..2572f99f0a2 100644
--- a/src/mame/machine/williams.cpp
+++ b/src/mame/machine/williams.cpp
@@ -78,7 +78,7 @@ WRITE_LINE_MEMBER(williams_state::williams_snd_irq)
int combined_state = pia_2->irq_a_state() | pia_2->irq_b_state();
/* IRQ to the sound CPU */
- m_soundcpu->set_input_line(M6800_IRQ_LINE, combined_state ? ASSERT_LINE : CLEAR_LINE);
+ m_soundcpu->set_input_line(M6808_IRQ_LINE, combined_state ? ASSERT_LINE : CLEAR_LINE);
}
/* Same as above, but for second sound board */
WRITE_LINE_MEMBER(blaster_state::williams_snd_irq_b)
@@ -87,7 +87,7 @@ WRITE_LINE_MEMBER(blaster_state::williams_snd_irq_b)
int combined_state = pia_2->irq_a_state() | pia_2->irq_b_state();
/* IRQ to the sound CPU */
- m_soundcpu_b->set_input_line(M6800_IRQ_LINE, combined_state ? ASSERT_LINE : CLEAR_LINE);
+ m_soundcpu_b->set_input_line(M6808_IRQ_LINE, combined_state ? ASSERT_LINE : CLEAR_LINE);
}