summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/s3.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/s3.cpp')
-rw-r--r--src/mame/drivers/s3.cpp20
1 files changed, 10 insertions, 10 deletions
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