summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author smf- <smf-@users.noreply.github.com>2014-01-07 14:25:34 +0000
committer smf- <smf-@users.noreply.github.com>2014-01-07 14:25:34 +0000
commit4a0d5a4c65c685837d142fc661b44aac04b3a502 (patch)
tree4ebef14e88c7c72cfafe017a4ea6f9c1522b7baf /src
parentdfeda5a01716660782a175b26eb0d9e62ac9b132 (diff)
remove 6821 from the MCFG PIA macros, not all PIA's are 6821's (nw)
Diffstat (limited to 'src')
-rw-r--r--src/emu/bus/c64/magic_formel.c6
-rw-r--r--src/emu/bus/cbmiec/c1541.c10
-rw-r--r--src/emu/machine/6821pia.h22
-rw-r--r--src/mame/audio/exidy.c24
-rw-r--r--src/mame/audio/midway.c38
-rw-r--r--src/mame/audio/qix.c40
-rw-r--r--src/mame/audio/redalert.c6
-rw-r--r--src/mame/audio/s11c_bg.c12
-rw-r--r--src/mame/audio/williams.c8
-rw-r--r--src/mame/drivers/5clown.c14
-rw-r--r--src/mame/drivers/arachnid.c24
-rw-r--r--src/mame/drivers/aristmk4.c10
-rw-r--r--src/mame/drivers/blitz.c10
-rw-r--r--src/mame/drivers/byvid.c10
-rw-r--r--src/mame/drivers/calomega.c34
-rw-r--r--src/mame/drivers/carpolo.c18
-rw-r--r--src/mame/drivers/coinmstr.c12
-rw-r--r--src/mame/drivers/funworld.c10
-rw-r--r--src/mame/drivers/goldnpkr.c54
-rw-r--r--src/mame/drivers/icecold.c22
-rw-r--r--src/mame/drivers/itech8.c6
-rw-r--r--src/mame/drivers/jokrwild.c12
-rw-r--r--src/mame/drivers/jpmsys5.c36
-rw-r--r--src/mame/drivers/laserbat.c10
-rw-r--r--src/mame/drivers/maxaflex.c8
-rw-r--r--src/mame/drivers/maygay1b.c4
-rw-r--r--src/mame/drivers/maygayv1.c8
-rw-r--r--src/mame/drivers/mcr68.c20
-rw-r--r--src/mame/drivers/mpu3.c42
-rw-r--r--src/mame/drivers/mpu4hw.c90
-rw-r--r--src/mame/drivers/mpu4vid.c6
-rw-r--r--src/mame/drivers/nyny.c18
-rw-r--r--src/mame/drivers/qix.c26
-rw-r--r--src/mame/drivers/r2dtank.c20
-rw-r--r--src/mame/drivers/s11.c90
-rw-r--r--src/mame/drivers/s11a.c90
-rw-r--r--src/mame/drivers/s11b.c92
-rw-r--r--src/mame/drivers/s11c.c76
-rw-r--r--src/mame/drivers/s3.c64
-rw-r--r--src/mame/drivers/s4.c64
-rw-r--r--src/mame/drivers/s6.c70
-rw-r--r--src/mame/drivers/s6a.c68
-rw-r--r--src/mame/drivers/s7.c80
-rw-r--r--src/mame/drivers/s8.c64
-rw-r--r--src/mame/drivers/s9.c64
-rw-r--r--src/mame/drivers/spiders.c32
-rw-r--r--src/mame/drivers/toratora.c22
-rw-r--r--src/mame/drivers/truco.c14
-rw-r--r--src/mame/drivers/tugboat.c8
-rw-r--r--src/mame/drivers/williams.c118
-rw-r--r--src/mame/drivers/wmg.c20
-rw-r--r--src/mame/drivers/zaccaria.c16
-rw-r--r--src/mame/machine/decopincpu.c54
-rw-r--r--src/mess/drivers/aim65.c4
-rw-r--r--src/mess/drivers/apf.c32
-rw-r--r--src/mess/drivers/apple1.c6
-rw-r--r--src/mess/drivers/atari400.c16
-rw-r--r--src/mess/drivers/bml3.c2
-rw-r--r--src/mess/drivers/bw12.c14
-rw-r--r--src/mess/drivers/coco12.c28
-rw-r--r--src/mess/drivers/coco3.c28
-rw-r--r--src/mess/drivers/crvision.c26
-rw-r--r--src/mess/drivers/csc.c22
-rw-r--r--src/mess/drivers/d6800.c14
-rw-r--r--src/mess/drivers/dgn_beta.c38
-rw-r--r--src/mess/drivers/dragon.c34
-rw-r--r--src/mess/drivers/eacc.c18
-rw-r--r--src/mess/drivers/eti660.c4
-rw-r--r--src/mess/drivers/mekd2.c18
-rw-r--r--src/mess/drivers/mkit09.c12
-rw-r--r--src/mess/drivers/osbexec.c20
-rw-r--r--src/mess/drivers/osborne1.c22
-rw-r--r--src/mess/drivers/osi.c8
-rw-r--r--src/mess/drivers/pegasus.c22
-rw-r--r--src/mess/drivers/pet.c62
-rw-r--r--src/mess/drivers/poly.c10
-rw-r--r--src/mess/drivers/tavernie.c18
-rw-r--r--src/mess/drivers/tek405x.c72
-rw-r--r--src/mess/drivers/thomson.c132
-rw-r--r--src/mess/drivers/v6809.c12
-rw-r--r--src/mess/drivers/z100.c8
-rw-r--r--src/mess/drivers/zorba.c2
82 files changed, 1250 insertions, 1250 deletions
diff --git a/src/emu/bus/c64/magic_formel.c b/src/emu/bus/c64/magic_formel.c
index d103ff38288..c77e18fe302 100644
--- a/src/emu/bus/c64/magic_formel.c
+++ b/src/emu/bus/c64/magic_formel.c
@@ -95,9 +95,9 @@ WRITE_LINE_MEMBER( c64_magic_formel_cartridge_device::pia_cb2_w )
static MACHINE_CONFIG_FRAGMENT( c64_magic_formel )
MCFG_DEVICE_ADD(MC6821_TAG, PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(c64_magic_formel_cartridge_device, pia_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(c64_magic_formel_cartridge_device, pia_pb_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(c64_magic_formel_cartridge_device, pia_cb2_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(c64_magic_formel_cartridge_device, pia_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(c64_magic_formel_cartridge_device, pia_pb_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(c64_magic_formel_cartridge_device, pia_cb2_w))
MACHINE_CONFIG_END
diff --git a/src/emu/bus/cbmiec/c1541.c b/src/emu/bus/cbmiec/c1541.c
index 6059730a02b..b0be3d320ab 100644
--- a/src/emu/bus/cbmiec/c1541.c
+++ b/src/emu/bus/cbmiec/c1541.c
@@ -895,11 +895,11 @@ static MACHINE_CONFIG_FRAGMENT( c1541pdc )
MCFG_CPU_PROGRAM_MAP(c1541pdc_mem)
MCFG_DEVICE_ADD(MC6821_TAG, PIA6821, 0)
- MCFG_PIA6821_READPB_HANDLER(READ8(c1541_prologic_dos_classic_device, pia_pb_r))
- MCFG_PIA6821_READCA1_HANDLER(DEVREADLINE(CENTRONICS_TAG, centronics_device, ack_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(c1541_prologic_dos_classic_device, pia_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(c1541_prologic_dos_classic_device, pia_pb_w))
- MCFG_PIA6821_CA2_HANDLER(DEVWRITELINE(CENTRONICS_TAG, centronics_device, strobe_w))
+ MCFG_PIA_READPB_HANDLER(READ8(c1541_prologic_dos_classic_device, pia_pb_r))
+ MCFG_PIA_READCA1_HANDLER(DEVREADLINE(CENTRONICS_TAG, centronics_device, ack_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(c1541_prologic_dos_classic_device, pia_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(c1541_prologic_dos_classic_device, pia_pb_w))
+ MCFG_PIA_CA2_HANDLER(DEVWRITELINE(CENTRONICS_TAG, centronics_device, strobe_w))
MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics)
MACHINE_CONFIG_END
diff --git a/src/emu/machine/6821pia.h b/src/emu/machine/6821pia.h
index 6dabe716b32..96ec69edf41 100644
--- a/src/emu/machine/6821pia.h
+++ b/src/emu/machine/6821pia.h
@@ -31,38 +31,38 @@
***************************************************************************/
// TODO: REMOVE THESE
-#define MCFG_PIA6821_READPA_HANDLER(_devcb) \
+#define MCFG_PIA_READPA_HANDLER(_devcb) \
devcb = &pia6821_device::set_readpa_handler(*device, DEVCB2_##_devcb);
-#define MCFG_PIA6821_READPB_HANDLER(_devcb) \
+#define MCFG_PIA_READPB_HANDLER(_devcb) \
devcb = &pia6821_device::set_readpb_handler(*device, DEVCB2_##_devcb);
-#define MCFG_PIA6821_READCA1_HANDLER(_devcb) \
+#define MCFG_PIA_READCA1_HANDLER(_devcb) \
devcb = &pia6821_device::set_readca1_handler(*device, DEVCB2_##_devcb);
-#define MCFG_PIA6821_READCA2_HANDLER(_devcb) \
+#define MCFG_PIA_READCA2_HANDLER(_devcb) \
devcb = &pia6821_device::set_readca2_handler(*device, DEVCB2_##_devcb);
-#define MCFG_PIA6821_READCB1_HANDLER(_devcb) \
+#define MCFG_PIA_READCB1_HANDLER(_devcb) \
devcb = &pia6821_device::set_readcb1_handler(*device, DEVCB2_##_devcb);
// TODO: CONVERT THESE TO WRITE LINE
-#define MCFG_PIA6821_WRITEPA_HANDLER(_devcb) \
+#define MCFG_PIA_WRITEPA_HANDLER(_devcb) \
devcb = &pia6821_device::set_writepa_handler(*device, DEVCB2_##_devcb);
-#define MCFG_PIA6821_WRITEPB_HANDLER(_devcb) \
+#define MCFG_PIA_WRITEPB_HANDLER(_devcb) \
devcb = &pia6821_device::set_writepb_handler(*device, DEVCB2_##_devcb);
-#define MCFG_PIA6821_CA2_HANDLER(_devcb) \
+#define MCFG_PIA_CA2_HANDLER(_devcb) \
devcb = &pia6821_device::set_ca2_handler(*device, DEVCB2_##_devcb);
-#define MCFG_PIA6821_CB2_HANDLER(_devcb) \
+#define MCFG_PIA_CB2_HANDLER(_devcb) \
devcb = &pia6821_device::set_cb2_handler(*device, DEVCB2_##_devcb);
-#define MCFG_PIA6821_IRQA_HANDLER(_devcb) \
+#define MCFG_PIA_IRQA_HANDLER(_devcb) \
devcb = &pia6821_device::set_irqa_handler(*device, DEVCB2_##_devcb);
-#define MCFG_PIA6821_IRQB_HANDLER(_devcb) \
+#define MCFG_PIA_IRQB_HANDLER(_devcb) \
devcb = &pia6821_device::set_irqb_handler(*device, DEVCB2_##_devcb);
diff --git a/src/mame/audio/exidy.c b/src/mame/audio/exidy.c
index b6cb75e7111..4589b39635d 100644
--- a/src/mame/audio/exidy.c
+++ b/src/mame/audio/exidy.c
@@ -774,17 +774,17 @@ MACHINE_CONFIG_FRAGMENT( venture_audio )
MCFG_RIOT6532_ADD("riot", SH6532_CLOCK, r6532_interface)
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(DEVWRITE8("pia1", pia6821_device, portb_w))
- MCFG_PIA6821_WRITEPB_HANDLER(DEVWRITE8("pia1", pia6821_device, porta_w))
- MCFG_PIA6821_CA2_HANDLER(DEVWRITELINE("pia1", pia6821_device, cb1_w))
- MCFG_PIA6821_CB2_HANDLER(DEVWRITELINE("pia1", pia6821_device, ca1_w))
+ MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("pia1", pia6821_device, portb_w))
+ MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8("pia1", pia6821_device, porta_w))
+ MCFG_PIA_CA2_HANDLER(DEVWRITELINE("pia1", pia6821_device, cb1_w))
+ MCFG_PIA_CB2_HANDLER(DEVWRITELINE("pia1", pia6821_device, ca1_w))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(DEVWRITE8("pia0", pia6821_device, portb_w))
- MCFG_PIA6821_WRITEPB_HANDLER(DEVWRITE8("pia0", pia6821_device, porta_w))
- MCFG_PIA6821_CA2_HANDLER(DEVWRITELINE("pia0", pia6821_device, cb1_w))
- MCFG_PIA6821_CB2_HANDLER(DEVWRITELINE("pia0", pia6821_device, ca1_w))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("custom", exidy_sound_device, update_irq_state))
+ MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("pia0", pia6821_device, portb_w))
+ MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8("pia0", pia6821_device, porta_w))
+ MCFG_PIA_CA2_HANDLER(DEVWRITELINE("pia0", pia6821_device, cb1_w))
+ MCFG_PIA_CB2_HANDLER(DEVWRITELINE("pia0", pia6821_device, ca1_w))
+ MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("custom", exidy_sound_device, update_irq_state))
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -1031,9 +1031,9 @@ MACHINE_CONFIG_FRAGMENT( victory_audio )
MCFG_RIOT6532_ADD("riot", SH6532_CLOCK, r6532_interface)
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA6821_CA2_HANDLER(DEVWRITELINE("custom", victory_sound_device, irq_clear_w))
- MCFG_PIA6821_CB2_HANDLER(DEVWRITELINE("custom", victory_sound_device, main_ack_w))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("custom", exidy_sound_device, update_irq_state))
+ MCFG_PIA_CA2_HANDLER(DEVWRITELINE("custom", victory_sound_device, irq_clear_w))
+ MCFG_PIA_CB2_HANDLER(DEVWRITELINE("custom", victory_sound_device, main_ack_w))
+ MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("custom", exidy_sound_device, update_irq_state))
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/audio/midway.c b/src/mame/audio/midway.c
index a8c82eb235c..0ee2a71d8f5 100644
--- a/src/mame/audio/midway.c
+++ b/src/mame/audio/midway.c
@@ -644,10 +644,10 @@ static MACHINE_CONFIG_FRAGMENT(midway_chip_squeak_deluxe)
MCFG_CPU_PROGRAM_MAP(csdeluxe_map)
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(midway_chip_squeak_deluxe_device, porta_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(midway_chip_squeak_deluxe_device, portb_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(midway_chip_squeak_deluxe_device, irq_w))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(midway_chip_squeak_deluxe_device, irq_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(midway_chip_squeak_deluxe_device, porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(midway_chip_squeak_deluxe_device, portb_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(midway_chip_squeak_deluxe_device, irq_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(midway_chip_squeak_deluxe_device, irq_w))
MCFG_DAC_ADD("dac")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, DEVICE_SELF_OWNER, 1.0)
@@ -814,10 +814,10 @@ static MACHINE_CONFIG_FRAGMENT(midway_sounds_good)
MCFG_CPU_PROGRAM_MAP(soundsgood_map)
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(midway_sounds_good_device, porta_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(midway_sounds_good_device, portb_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(midway_sounds_good_device, irq_w))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(midway_sounds_good_device, irq_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(midway_sounds_good_device, porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(midway_sounds_good_device, portb_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(midway_sounds_good_device, irq_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(midway_sounds_good_device, irq_w))
MCFG_DAC_ADD("dac")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, DEVICE_SELF_OWNER, 1.0)
@@ -978,10 +978,10 @@ static MACHINE_CONFIG_FRAGMENT(midway_turbo_chip_squeak)
MCFG_CPU_PROGRAM_MAP(turbocs_map)
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(midway_turbo_chip_squeak_device, porta_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(midway_turbo_chip_squeak_device, portb_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(midway_turbo_chip_squeak_device, irq_w))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(midway_turbo_chip_squeak_device, irq_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(midway_turbo_chip_squeak_device, porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(midway_turbo_chip_squeak_device, portb_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(midway_turbo_chip_squeak_device, irq_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(midway_turbo_chip_squeak_device, irq_w))
MCFG_DAC_ADD("dac")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, DEVICE_SELF_OWNER, 1.0)
@@ -1190,15 +1190,15 @@ static MACHINE_CONFIG_FRAGMENT(midway_squawk_n_talk)
MCFG_CPU_PROGRAM_MAP(squawkntalk_map)
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(midway_squawk_n_talk_device, porta1_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(midway_squawk_n_talk_device, irq_w))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(midway_squawk_n_talk_device, irq_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(midway_squawk_n_talk_device, porta1_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(midway_squawk_n_talk_device, irq_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(midway_squawk_n_talk_device, irq_w))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(midway_squawk_n_talk_device, porta2_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(midway_squawk_n_talk_device, portb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(midway_squawk_n_talk_device, irq_w))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(midway_squawk_n_talk_device, irq_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(midway_squawk_n_talk_device, porta2_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(midway_squawk_n_talk_device, portb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(midway_squawk_n_talk_device, irq_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(midway_squawk_n_talk_device, irq_w))
// only used on Discs of Tron, which is stereo
MCFG_SOUND_ADD("tms5200", TMS5200, 640000)
diff --git a/src/mame/audio/qix.c b/src/mame/audio/qix.c
index c34664f6a0d..20cac2f1bb4 100644
--- a/src/mame/audio/qix.c
+++ b/src/mame/audio/qix.c
@@ -182,25 +182,25 @@ MACHINE_CONFIG_FRAGMENT( qix_audio )
MCFG_CPU_PROGRAM_MAP(audio_map)
MCFG_DEVICE_ADD("sndpia0", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(qix_state, sync_sndpia1_porta_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(qix_state, qix_vol_w))
- MCFG_PIA6821_CA2_HANDLER(DEVWRITELINE("sndpia1", pia6821_device, ca1_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(qix_state, qix_flip_screen_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(qix_state, qix_pia_dint))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(qix_state, qix_pia_dint))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(qix_state, sync_sndpia1_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(qix_state, qix_vol_w))
+ MCFG_PIA_CA2_HANDLER(DEVWRITELINE("sndpia1", pia6821_device, ca1_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(qix_state, qix_flip_screen_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(qix_state, qix_pia_dint))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(qix_state, qix_pia_dint))
MCFG_DEVICE_ADD("sndpia1", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(DEVWRITE8("sndpia0", pia6821_device, porta_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(qix_state,qix_dac_w))
- MCFG_PIA6821_CA2_HANDLER(DEVWRITELINE("sndpia0", pia6821_device, ca1_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(qix_state, qix_pia_sint))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(qix_state, qix_pia_sint))
+ MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("sndpia0", pia6821_device, porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(qix_state,qix_dac_w))
+ MCFG_PIA_CA2_HANDLER(DEVWRITELINE("sndpia0", pia6821_device, ca1_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(qix_state, qix_pia_sint))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(qix_state, qix_pia_sint))
MCFG_DEVICE_ADD("sndpia2", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(qix_state, sndpia_2_warning_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(qix_state, sndpia_2_warning_w))
- MCFG_PIA6821_CA2_HANDLER(WRITE8(qix_state, sndpia_2_warning_w))
- MCFG_PIA6821_CB2_HANDLER(WRITE8(qix_state, sndpia_2_warning_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(qix_state, sndpia_2_warning_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(qix_state, sndpia_2_warning_w))
+ MCFG_PIA_CA2_HANDLER(WRITE8(qix_state, sndpia_2_warning_w))
+ MCFG_PIA_CB2_HANDLER(WRITE8(qix_state, sndpia_2_warning_w))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@@ -213,11 +213,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( slither_audio )
MCFG_DEVICE_ADD("sndpia0", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("P2"))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(qix_state, slither_coinctl_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(qix_state, qix_flip_screen_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(qix_state, qix_pia_dint))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(qix_state, qix_pia_dint))
+ MCFG_PIA_READPA_HANDLER(IOPORT("P2"))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(qix_state, slither_coinctl_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(qix_state, qix_flip_screen_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(qix_state, qix_pia_dint))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(qix_state, qix_pia_dint))
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/audio/redalert.c b/src/mame/audio/redalert.c
index 3c19181f287..8fc85def221 100644
--- a/src/mame/audio/redalert.c
+++ b/src/mame/audio/redalert.c
@@ -363,9 +363,9 @@ MACHINE_CONFIG_FRAGMENT( demoneye_audio )
MCFG_CPU_PERIODIC_INT_DRIVER(redalert_state, irq0_line_hold, REDALERT_AUDIO_CPU_IRQ_FREQ) /* guess */
MCFG_DEVICE_ADD("sndpia", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(redalert_state, demoneye_ay8910_latch_2_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(redalert_state, demoneye_ay8910_data_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(redalert_state, demoneye_ay8910_latch_1_w))
+ MCFG_PIA_READPA_HANDLER(READ8(redalert_state, demoneye_ay8910_latch_2_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(redalert_state, demoneye_ay8910_data_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(redalert_state, demoneye_ay8910_latch_1_w))
MCFG_SOUND_START_OVERRIDE( redalert_state, demoneye )
diff --git a/src/mame/audio/s11c_bg.c b/src/mame/audio/s11c_bg.c
index 25b887d5e37..5612a55c041 100644
--- a/src/mame/audio/s11c_bg.c
+++ b/src/mame/audio/s11c_bg.c
@@ -79,12 +79,12 @@ MACHINE_CONFIG_FRAGMENT( s11c_bg )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50)
MCFG_DEVICE_ADD("pia40", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s11c_bg_device, pia40_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11c_bg_device, pia40_pb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s11c_bg_device, pia40_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s11c_bg_device, pia40_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("bgcpu", m6809e_device, firq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("bgcpu", m6809e_device, nmi_line))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11c_bg_device, pia40_pa_w))
+ 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))
MACHINE_CONFIG_END
machine_config_constructor s11c_bg_device::device_mconfig_additions() const
diff --git a/src/mame/audio/williams.c b/src/mame/audio/williams.c
index e63c82cad87..94d9a39673a 100644
--- a/src/mame/audio/williams.c
+++ b/src/mame/audio/williams.c
@@ -211,10 +211,10 @@ static MACHINE_CONFIG_FRAGMENT( williams_cvsd_sound )
MCFG_CPU_PROGRAM_MAP(williams_cvsd_map)
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(DEVWRITE8("dac", dac_device, write_unsigned8))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(williams_cvsd_sound_device, talkback_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(williams_cvsd_sound_device, pia_irqa))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(williams_cvsd_sound_device, pia_irqb))
+ MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("dac", dac_device, write_unsigned8))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(williams_cvsd_sound_device, talkback_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(williams_cvsd_sound_device, pia_irqa))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(williams_cvsd_sound_device, pia_irqb))
MCFG_YM2151_ADD("ym2151", CVSD_FM_CLOCK)
MCFG_YM2151_IRQ_HANDLER(WRITELINE(williams_cvsd_sound_device, ym2151_irq_w))
diff --git a/src/mame/drivers/5clown.c b/src/mame/drivers/5clown.c
index e9bf022664d..7ff8645d63a 100644
--- a/src/mame/drivers/5clown.c
+++ b/src/mame/drivers/5clown.c
@@ -1043,15 +1043,15 @@ static MACHINE_CONFIG_START( fclown, _5clown_state )
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(_5clown_state, mux_port_r))
- MCFG_PIA6821_READPB_HANDLER(READ8(_5clown_state, pia0_b_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(_5clown_state, counters_w))
+ MCFG_PIA_READPA_HANDLER(READ8(_5clown_state, mux_port_r))
+ MCFG_PIA_READPB_HANDLER(READ8(_5clown_state, pia0_b_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(_5clown_state, counters_w))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("SW4"))
- MCFG_PIA6821_READPB_HANDLER(READ8(_5clown_state, pia1_b_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(_5clown_state, trigsnd_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(_5clown_state, mux_w))
+ MCFG_PIA_READPA_HANDLER(IOPORT("SW4"))
+ MCFG_PIA_READPB_HANDLER(READ8(_5clown_state, pia1_b_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(_5clown_state, trigsnd_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(_5clown_state, mux_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/arachnid.c b/src/mame/drivers/arachnid.c
index 654cbfe97aa..fe80ee0b8a7 100644
--- a/src/mame/drivers/arachnid.c
+++ b/src/mame/drivers/arachnid.c
@@ -438,20 +438,20 @@ static MACHINE_CONFIG_START( arachnid, arachnid_state )
// devices
MCFG_DEVICE_ADD(PIA6821_U4_TAG, PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(arachnid_state, pia_u4_pa_r))
- MCFG_PIA6821_READPB_HANDLER(READ8(arachnid_state, pia_u4_pb_r))
- MCFG_PIA6821_READCA1_HANDLER(READLINE(arachnid_state, pia_u4_pca_r))
- MCFG_PIA6821_READCB1_HANDLER(READLINE(arachnid_state, pia_u4_pcb_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(arachnid_state, pia_u4_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(arachnid_state, pia_u4_pb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(arachnid_state, pia_u4_pca_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(arachnid_state, pia_u4_pcb_w))
+ MCFG_PIA_READPA_HANDLER(READ8(arachnid_state, pia_u4_pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(arachnid_state, pia_u4_pb_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(arachnid_state, pia_u4_pca_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(arachnid_state, pia_u4_pcb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(arachnid_state, pia_u4_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(arachnid_state, pia_u4_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(arachnid_state, pia_u4_pca_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(arachnid_state, pia_u4_pcb_w))
MCFG_DEVICE_ADD(PIA6821_U17_TAG, PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(arachnid_state, pia_u17_pa_r))
- MCFG_PIA6821_READCA1_HANDLER(READLINE(arachnid_state, pia_u17_pca_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(arachnid_state, pia_u17_pb_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(arachnid_state, pia_u17_pcb_w))
+ MCFG_PIA_READPA_HANDLER(READ8(arachnid_state, pia_u17_pa_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(arachnid_state, pia_u17_pca_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(arachnid_state, pia_u17_pb_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(arachnid_state, pia_u17_pcb_w))
// video hardware
MCFG_TMS9928A_ADD( TMS9118_TAG, TMS9118, vdp_intf )
diff --git a/src/mame/drivers/aristmk4.c b/src/mame/drivers/aristmk4.c
index 21b2581f83b..db1ef8df0bc 100644
--- a/src/mame/drivers/aristmk4.c
+++ b/src/mame/drivers/aristmk4.c
@@ -1705,11 +1705,11 @@ static MACHINE_CONFIG_START( aristmk4, aristmk4_state )
// CA1 is connected to +5V, CB1 is not connected.
MCFG_DEVICE_ADD("pia6821_0", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(aristmk4_state, mkiv_pia_ina))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(aristmk4_state, mkiv_pia_outa))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(aristmk4_state, mkiv_pia_outb))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(aristmk4_state, mkiv_pia_ca2))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(aristmk4_state, mkiv_pia_cb2))
+ MCFG_PIA_READPA_HANDLER(READ8(aristmk4_state, mkiv_pia_ina))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(aristmk4_state, mkiv_pia_outa))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(aristmk4_state, mkiv_pia_outb))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(aristmk4_state, mkiv_pia_ca2))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(aristmk4_state, mkiv_pia_cb2))
MCFG_MC6845_ADD("crtc", C6545_1, "screen", MAIN_CLOCK/8, mc6845_intf) // TODO: type is unknown
MCFG_MC146818_ADD( "rtc", XTAL_4_194304Mhz )
diff --git a/src/mame/drivers/blitz.c b/src/mame/drivers/blitz.c
index 8aa016739ad..886f875ba07 100644
--- a/src/mame/drivers/blitz.c
+++ b/src/mame/drivers/blitz.c
@@ -768,13 +768,13 @@ static MACHINE_CONFIG_START( megadpkr, blitz_state )
// MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(blitz_state, megadpkr_mux_port_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(blitz_state, lamps_a_w))
+ MCFG_PIA_READPA_HANDLER(READ8(blitz_state, megadpkr_mux_port_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(blitz_state, lamps_a_w))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("SW1"))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(blitz_state, sound_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(blitz_state, mux_w))
+ MCFG_PIA_READPA_HANDLER(IOPORT("SW1"))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(blitz_state, sound_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(blitz_state, mux_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/byvid.c b/src/mame/drivers/byvid.c
index dbf82612b43..ebd2a8dc76f 100644
--- a/src/mame/drivers/byvid.c
+++ b/src/mame/drivers/byvid.c
@@ -156,11 +156,11 @@ static MACHINE_CONFIG_START( by133, by133_state )
MCFG_CPU_IO_MAP(sound_portmap)
MCFG_DEVICE_ADD("videopia", PIA6821, 0)
- MCFG_PIA6821_READPB_HANDLER(READ8(by133_state, by133_portb_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(by133_state, by133_portb_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(by133_state, by133_cb2))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(by133_state, by133_firq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(by133_state, by133_firq))
+ MCFG_PIA_READPB_HANDLER(READ8(by133_state, by133_portb_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(by133_state, by133_portb_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(by133_state, by133_cb2))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(by133_state, by133_firq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(by133_state, by133_firq))
/* video hardware */
MCFG_TMS9928A_ADD( "tms9928a", TMS9928A, byvid_tms9928a_interface )
diff --git a/src/mame/drivers/calomega.c b/src/mame/drivers/calomega.c
index 896dee18643..85520d748bf 100644
--- a/src/mame/drivers/calomega.c
+++ b/src/mame/drivers/calomega.c
@@ -2639,13 +2639,13 @@ static MACHINE_CONFIG_START( sys903, calomega_state )
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(calomega_state,s903_mux_port_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(calomega_state,lamps_903a_w))
+ MCFG_PIA_READPA_HANDLER(READ8(calomega_state,s903_mux_port_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(calomega_state,lamps_903a_w))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("SW1"))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(calomega_state, lamps_903b_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(calomega_state, s903_mux_w))
+ MCFG_PIA_READPA_HANDLER(IOPORT("SW1"))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(calomega_state, lamps_903b_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(calomega_state, s903_mux_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2695,11 +2695,11 @@ static MACHINE_CONFIG_DERIVED( sys905, sys903 )
MCFG_CPU_PROGRAM_MAP(sys905_map)
MCFG_DEVICE_MODIFY("pia0")
- MCFG_PIA6821_READPA_HANDLER(READ8(calomega_state,s905_mux_port_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(calomega_state,lamps_905_w))
+ MCFG_PIA_READPA_HANDLER(READ8(calomega_state,s905_mux_port_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(calomega_state,lamps_905_w))
MCFG_DEVICE_MODIFY("pia1")
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(calomega_state, s905_mux_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(calomega_state, s905_mux_w))
/* sound hardware */
MCFG_SOUND_MODIFY("ay8912")
@@ -2717,17 +2717,17 @@ static MACHINE_CONFIG_DERIVED( sys906, sys903 )
MCFG_CPU_PROGRAM_MAP(sys906_map)
MCFG_DEVICE_MODIFY("pia0")
- MCFG_PIA6821_READPA_HANDLER(READ8(calomega_state, pia0_ain_r))
- MCFG_PIA6821_READPB_HANDLER(READ8(calomega_state, pia0_bin_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(calomega_state, pia0_aout_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(calomega_state, pia0_bout_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(calomega_state, pia0_ca2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(calomega_state, pia0_ain_r))
+ MCFG_PIA_READPB_HANDLER(READ8(calomega_state, pia0_bin_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(calomega_state, pia0_aout_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(calomega_state, pia0_bout_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(calomega_state, pia0_ca2_w))
MCFG_DEVICE_MODIFY("pia1")
- MCFG_PIA6821_READPA_HANDLER(READ8(calomega_state, pia1_ain_r))
- MCFG_PIA6821_READPB_HANDLER(READ8(calomega_state, pia1_bin_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(calomega_state, pia1_aout_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(calomega_state, pia1_bout_w))
+ MCFG_PIA_READPA_HANDLER(READ8(calomega_state, pia1_ain_r))
+ MCFG_PIA_READPB_HANDLER(READ8(calomega_state, pia1_bin_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(calomega_state, pia1_aout_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(calomega_state, pia1_bout_w))
MCFG_GFXDECODE(sys906)
diff --git a/src/mame/drivers/carpolo.c b/src/mame/drivers/carpolo.c
index cd9573e5a6e..b45c7624f23 100644
--- a/src/mame/drivers/carpolo.c
+++ b/src/mame/drivers/carpolo.c
@@ -248,17 +248,17 @@ static MACHINE_CONFIG_START( carpolo, carpolo_state )
times a sec, so it's a good place */
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA6821_READPB_HANDLER(READ8(carpolo_state, pia_0_port_b_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(carpolo_state, pia_0_port_a_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(carpolo_state, pia_0_port_b_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(carpolo_state, coin1_interrupt_clear_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(carpolo_state,coin2_interrupt_clear_w))
+ MCFG_PIA_READPB_HANDLER(READ8(carpolo_state, pia_0_port_b_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(carpolo_state, pia_0_port_a_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(carpolo_state, pia_0_port_b_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(carpolo_state, coin1_interrupt_clear_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(carpolo_state,coin2_interrupt_clear_w))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(carpolo_state, pia_1_port_a_r))
- MCFG_PIA6821_READPB_HANDLER(READ8(carpolo_state, pia_1_port_b_r))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(carpolo_state, coin3_interrupt_clear_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(carpolo_state, coin4_interrupt_clear_w))
+ MCFG_PIA_READPA_HANDLER(READ8(carpolo_state, pia_1_port_a_r))
+ MCFG_PIA_READPB_HANDLER(READ8(carpolo_state, pia_1_port_b_r))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(carpolo_state, coin3_interrupt_clear_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(carpolo_state, coin4_interrupt_clear_w))
MCFG_7474_ADD("7474_2s_1", NOOP, WRITELINE(carpolo_state, carpolo_7474_2s_1_q_cb))
MCFG_7474_ADD("7474_2s_2", NOOP, WRITELINE(carpolo_state, carpolo_7474_2s_2_q_cb))
diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c
index aced7ef22f9..31853e28e25 100644
--- a/src/mame/drivers/coinmstr.c
+++ b/src/mame/drivers/coinmstr.c
@@ -963,16 +963,16 @@ static MACHINE_CONFIG_START( coinmstr, coinmstr_state )
MCFG_CPU_VBLANK_INT_DRIVER("screen", coinmstr_state, irq0_line_hold)
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("PIA0.A"))
- MCFG_PIA6821_READPB_HANDLER(IOPORT("PIA0.B"))
+ MCFG_PIA_READPA_HANDLER(IOPORT("PIA0.A"))
+ MCFG_PIA_READPB_HANDLER(IOPORT("PIA0.B"))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("PIA1.A"))
- MCFG_PIA6821_READPB_HANDLER(IOPORT("PIA1.B"))
+ MCFG_PIA_READPA_HANDLER(IOPORT("PIA1.A"))
+ MCFG_PIA_READPB_HANDLER(IOPORT("PIA1.B"))
MCFG_DEVICE_ADD("pia2", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("PIA2.A"))
- MCFG_PIA6821_READPB_HANDLER(IOPORT("PIA2.B"))
+ MCFG_PIA_READPA_HANDLER(IOPORT("PIA2.A"))
+ MCFG_PIA_READPB_HANDLER(IOPORT("PIA2.B"))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c
index 582a035ade9..d5954c6d38f 100644
--- a/src/mame/drivers/funworld.c
+++ b/src/mame/drivers/funworld.c
@@ -2534,13 +2534,13 @@ static MACHINE_CONFIG_START( fw1stpal, funworld_state )
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("IN0"))
- MCFG_PIA6821_READPB_HANDLER(IOPORT("IN1"))
+ MCFG_PIA_READPA_HANDLER(IOPORT("IN0"))
+ MCFG_PIA_READPB_HANDLER(IOPORT("IN1"))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("IN2"))
- MCFG_PIA6821_READPB_HANDLER(IOPORT("DSW"))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(funworld_state, pia1_ca2_w))
+ MCFG_PIA_READPA_HANDLER(IOPORT("IN2"))
+ MCFG_PIA_READPB_HANDLER(IOPORT("DSW"))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(funworld_state, pia1_ca2_w))
/* video hardware */
diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c
index 2cf61cad2db..d6acb1d04cc 100644
--- a/src/mame/drivers/goldnpkr.c
+++ b/src/mame/drivers/goldnpkr.c
@@ -3696,13 +3696,13 @@ static MACHINE_CONFIG_START( goldnpkr_base, goldnpkr_state )
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(goldnpkr_state, goldnpkr_mux_port_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(goldnpkr_state, lamps_a_w))
+ MCFG_PIA_READPA_HANDLER(READ8(goldnpkr_state, goldnpkr_mux_port_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(goldnpkr_state, lamps_a_w))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("SW1"))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(goldnpkr_state, sound_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(goldnpkr_state, mux_w))
+ MCFG_PIA_READPA_HANDLER(IOPORT("SW1"))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(goldnpkr_state, sound_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(goldnpkr_state, mux_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -3736,8 +3736,8 @@ static MACHINE_CONFIG_DERIVED( pottnpkr, goldnpkr_base )
MCFG_CPU_PROGRAM_MAP(pottnpkr_map)
MCFG_DEVICE_MODIFY("pia0")
- MCFG_PIA6821_READPA_HANDLER(READ8(goldnpkr_state, pottnpkr_mux_port_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(goldnpkr_state, mux_port_w))
+ MCFG_PIA_READPA_HANDLER(READ8(goldnpkr_state, pottnpkr_mux_port_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(goldnpkr_state, mux_port_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -3754,8 +3754,8 @@ static MACHINE_CONFIG_DERIVED( witchcrd, goldnpkr_base )
MCFG_CPU_PROGRAM_MAP(witchcrd_map)
MCFG_DEVICE_MODIFY("pia0")
- MCFG_PIA6821_READPA_HANDLER(READ8(goldnpkr_state, pottnpkr_mux_port_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(goldnpkr_state, mux_port_w))
+ MCFG_PIA_READPA_HANDLER(READ8(goldnpkr_state, pottnpkr_mux_port_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(goldnpkr_state, mux_port_w))
/* video hardware */
MCFG_PALETTE_INIT_OVERRIDE(goldnpkr_state,witchcrd)
@@ -3775,10 +3775,10 @@ static MACHINE_CONFIG_DERIVED( wcfalcon, goldnpkr_base )
MCFG_CPU_PROGRAM_MAP(witchcrd_falcon_map)
MCFG_DEVICE_MODIFY("pia0")
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(goldnpkr_state, mux_port_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(goldnpkr_state, mux_port_w))
MCFG_DEVICE_MODIFY("pia1")
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(goldnpkr_state, wcfalcon_snd_w)) /* port A out, custom handler due to address + data are muxed */
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(goldnpkr_state, wcfalcon_snd_w)) /* port A out, custom handler due to address + data are muxed */
/* video hardware */
MCFG_PALETTE_INIT_OVERRIDE(goldnpkr_state,witchcrd)
@@ -3798,8 +3798,8 @@ static MACHINE_CONFIG_DERIVED( wildcard, goldnpkr_base )
MCFG_CPU_PROGRAM_MAP(wildcard_map)
MCFG_DEVICE_MODIFY("pia0")
- MCFG_PIA6821_READPA_HANDLER(READ8(goldnpkr_state, pottnpkr_mux_port_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(goldnpkr_state, mux_port_w))
+ MCFG_PIA_READPA_HANDLER(READ8(goldnpkr_state, pottnpkr_mux_port_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(goldnpkr_state, mux_port_w))
/* video hardware */
// MCFG_GFXDECODE(wildcard)
@@ -3821,8 +3821,8 @@ static MACHINE_CONFIG_DERIVED( wcrdxtnd, goldnpkr_base )
MCFG_CPU_PROGRAM_MAP(wcrdxtnd_map)
MCFG_DEVICE_MODIFY("pia0")
- MCFG_PIA6821_READPA_HANDLER(READ8(goldnpkr_state, pottnpkr_mux_port_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(goldnpkr_state, mux_port_w))
+ MCFG_PIA_READPA_HANDLER(READ8(goldnpkr_state, pottnpkr_mux_port_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(goldnpkr_state, mux_port_w))
/* video hardware */
MCFG_GFXDECODE(wcrdxtnd)
@@ -3848,10 +3848,10 @@ static MACHINE_CONFIG_DERIVED( wildcrdb, goldnpkr_base )
MCFG_CPU_IO_MAP(wildcrdb_mcu_io_map)
MCFG_DEVICE_MODIFY("pia0")
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(goldnpkr_state, mux_port_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(goldnpkr_state, mux_port_w))
MCFG_DEVICE_MODIFY("pia1")
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(goldnpkr_state, wcfalcon_snd_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(goldnpkr_state, wcfalcon_snd_w))
/* video hardware */
// MCFG_GFXDECODE(wildcard)
@@ -3873,8 +3873,8 @@ static MACHINE_CONFIG_DERIVED( genie, goldnpkr_base )
MCFG_CPU_PROGRAM_MAP(genie_map)
MCFG_DEVICE_MODIFY("pia0")
- MCFG_PIA6821_READPA_HANDLER(READ8(goldnpkr_state, pottnpkr_mux_port_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(goldnpkr_state, mux_port_w))
+ MCFG_PIA_READPA_HANDLER(READ8(goldnpkr_state, pottnpkr_mux_port_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(goldnpkr_state, mux_port_w))
/* video hardware */
MCFG_PALETTE_INIT_OVERRIDE(goldnpkr_state,witchcrd)
@@ -3907,16 +3907,16 @@ static MACHINE_CONFIG_DERIVED( bchancep, goldnpkr_base )
MCFG_CPU_PROGRAM_MAP(bchancep_map)
MCFG_DEVICE_MODIFY("pia0")
- MCFG_PIA6821_READPA_HANDLER(READ8(goldnpkr_state, pia0_a_r))
- MCFG_PIA6821_READPB_HANDLER(READ8(goldnpkr_state, pia0_b_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(goldnpkr_state, pia0_a_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(goldnpkr_state, pia0_b_w))
+ MCFG_PIA_READPA_HANDLER(READ8(goldnpkr_state, pia0_a_r))
+ MCFG_PIA_READPB_HANDLER(READ8(goldnpkr_state, pia0_b_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(goldnpkr_state, pia0_a_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(goldnpkr_state, pia0_b_w))
MCFG_DEVICE_MODIFY("pia1")
- MCFG_PIA6821_READPA_HANDLER(READ8(goldnpkr_state, pia1_a_r))
- MCFG_PIA6821_READPB_HANDLER(READ8(goldnpkr_state, pia1_b_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(goldnpkr_state, pia1_a_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(goldnpkr_state, pia1_b_w))
+ MCFG_PIA_READPA_HANDLER(READ8(goldnpkr_state, pia1_a_r))
+ MCFG_PIA_READPB_HANDLER(READ8(goldnpkr_state, pia1_b_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(goldnpkr_state, pia1_a_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(goldnpkr_state, pia1_b_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/icecold.c b/src/mame/drivers/icecold.c
index 3055fe90f03..6ca32491e3b 100644
--- a/src/mame/drivers/icecold.c
+++ b/src/mame/drivers/icecold.c
@@ -366,21 +366,21 @@ static MACHINE_CONFIG_START( icecold, icecold_state )
MCFG_CPU_PROGRAM_MAP(icecold_map)
MCFG_DEVICE_ADD( "pia0", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("JOY"))
- MCFG_PIA6821_READPB_HANDLER(IOPORT("DSW3"))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809_device, irq_line))
+ 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_DEVICE_ADD( "pia1", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(icecold_state, ay_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(icecold_state, ay_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(icecold_state, snd_ctrl_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809_device, firq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809_device, firq_line))
+ 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_DEVICE_ADD( "pia2", PIA6821, 0)
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809_device, irq_line))
+ MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809_device, irq_line))
MCFG_I8279_ADD("i8279", XTAL_6MHz/4, icecold_i8279_intf)
diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c
index cf7fd967c43..9ca99aed8ca 100644
--- a/src/mame/drivers/itech8.c
+++ b/src/mame/drivers/itech8.c
@@ -1715,9 +1715,9 @@ static MACHINE_CONFIG_FRAGMENT( itech8_sound_ym3812 )
MCFG_CPU_PROGRAM_MAP(sound3812_map)
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA6821_READPB_HANDLER(DEVREADLINE("ticket", ticket_dispenser_device, line_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(itech8_state, pia_porta_out))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(itech8_state, pia_portb_out))
+ MCFG_PIA_READPB_HANDLER(DEVREADLINE("ticket", ticket_dispenser_device, line_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(itech8_state, pia_porta_out))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(itech8_state, pia_portb_out))
/* sound hardware */
MCFG_SOUND_ADD("ymsnd", YM3812, CLOCK_8MHz/2)
diff --git a/src/mame/drivers/jokrwild.c b/src/mame/drivers/jokrwild.c
index 7f9aa78f6ba..f4c932c9c6a 100644
--- a/src/mame/drivers/jokrwild.c
+++ b/src/mame/drivers/jokrwild.c
@@ -455,14 +455,14 @@ static MACHINE_CONFIG_START( jokrwild, jokrwild_state )
// MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("IN0"))
- MCFG_PIA6821_READPB_HANDLER(IOPORT("IN1"))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(jokrwild_state, testa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(jokrwild_state, testb_w))
+ MCFG_PIA_READPA_HANDLER(IOPORT("IN0"))
+ MCFG_PIA_READPB_HANDLER(IOPORT("IN1"))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(jokrwild_state, testa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(jokrwild_state, testb_w))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("IN2"))
- MCFG_PIA6821_READPB_HANDLER(IOPORT("IN3"))
+ MCFG_PIA_READPA_HANDLER(IOPORT("IN2"))
+ MCFG_PIA_READPB_HANDLER(IOPORT("IN3"))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/jpmsys5.c b/src/mame/drivers/jpmsys5.c
index 95b9c379b23..2c4c5410761 100644
--- a/src/mame/drivers/jpmsys5.c
+++ b/src/mame/drivers/jpmsys5.c
@@ -685,12 +685,12 @@ static MACHINE_CONFIG_START( jpmsys5v, jpmsys5_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_DEVICE_ADD("6821pia", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(jpmsys5_state, u29_porta_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(jpmsys5_state, u29_portb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(jpmsys5_state, u29_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(jpmsys5_state, u29_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(jpmsys5_state, pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(jpmsys5_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(jpmsys5_state, u29_porta_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(jpmsys5_state, u29_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(jpmsys5_state, u29_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(jpmsys5_state, u29_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(jpmsys5_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(jpmsys5_state, pia_irq))
/* 6840 PTM */
MCFG_PTM6840_ADD("6840ptm", ptm_intf)
@@ -878,12 +878,12 @@ MACHINE_CONFIG_START( jpmsys5_ym, jpmsys5_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_DEVICE_ADD("6821pia", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(jpmsys5_state, u29_porta_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(jpmsys5_state, u29_portb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(jpmsys5_state, u29_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(jpmsys5_state, u29_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(jpmsys5_state, pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(jpmsys5_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(jpmsys5_state, u29_porta_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(jpmsys5_state, u29_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(jpmsys5_state, u29_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(jpmsys5_state, u29_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(jpmsys5_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(jpmsys5_state, pia_irq))
/* 6840 PTM */
MCFG_PTM6840_ADD("6840ptm", ptm_intf)
@@ -913,12 +913,12 @@ MACHINE_CONFIG_START( jpmsys5, jpmsys5_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD("6821pia", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(jpmsys5_state, u29_porta_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(jpmsys5_state, u29_portb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(jpmsys5_state, u29_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(jpmsys5_state, u29_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(jpmsys5_state, pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(jpmsys5_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(jpmsys5_state, u29_porta_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(jpmsys5_state, u29_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(jpmsys5_state, u29_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(jpmsys5_state, u29_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(jpmsys5_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(jpmsys5_state, pia_irq))
/* 6840 PTM */
MCFG_PTM6840_ADD("6840ptm", ptm_intf)
diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c
index f32a4699bc0..328b00af82c 100644
--- a/src/mame/drivers/laserbat.c
+++ b/src/mame/drivers/laserbat.c
@@ -758,11 +758,11 @@ static MACHINE_CONFIG_START( catnmous, laserbat_state )
MCFG_CPU_PERIODIC_INT_DRIVER(laserbat_state, zaccaria_cb1_toggle, (double)3580000/4096)
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(laserbat_state, zaccaria_port0a_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(laserbat_state, zaccaria_port0a_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(laserbat_state, zaccaria_port0b_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(laserbat_state, zaccaria_irq0a))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(laserbat_state, zaccaria_irq0b))
+ MCFG_PIA_READPA_HANDLER(READ8(laserbat_state, zaccaria_port0a_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(laserbat_state, zaccaria_port0a_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(laserbat_state, zaccaria_port0b_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(laserbat_state, zaccaria_irq0a))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(laserbat_state, zaccaria_irq0b))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/maxaflex.c b/src/mame/drivers/maxaflex.c
index cfb46e48b69..3747e30ff64 100644
--- a/src/mame/drivers/maxaflex.c
+++ b/src/mame/drivers/maxaflex.c
@@ -403,10 +403,10 @@ static MACHINE_CONFIG_START( a600xl, maxaflex_state )
MCFG_CPU_PROGRAM_MAP(mcu_mem)
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(maxaflex_state, maxaflex_atari_pia_pa_r))
- MCFG_PIA6821_READPB_HANDLER(READ8(maxaflex_state, maxaflex_atari_pia_pb_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(maxaflex_state, a600xl_pia_pb_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(maxaflex_state, atari_pia_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(maxaflex_state, maxaflex_atari_pia_pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(maxaflex_state, maxaflex_atari_pia_pb_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(maxaflex_state, a600xl_pia_pb_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(maxaflex_state, atari_pia_cb2_w))
MCFG_TIMER_DRIVER_ADD("mcu_timer", maxaflex_state, mcu_timer_proc)
diff --git a/src/mame/drivers/maygay1b.c b/src/mame/drivers/maygay1b.c
index f2be1fe08c4..bb20e3f7503 100644
--- a/src/mame/drivers/maygay1b.c
+++ b/src/mame/drivers/maygay1b.c
@@ -847,8 +847,8 @@ MACHINE_CONFIG_START( maygay_m1, maygay1b_state )
MCFG_DUARTN68681_INPORT_CALLBACK(READ8(maygay1b_state, m1_duart_r))
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(maygay1b_state, m1_pia_porta_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(maygay1b_state, m1_pia_portb_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(maygay1b_state, m1_pia_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(maygay1b_state, m1_pia_portb_w))
MCFG_MSC1937_ADD("vfd",0,RIGHT_TO_LEFT)
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/maygayv1.c b/src/mame/drivers/maygayv1.c
index 241edbbc1d5..5f8cbae68ce 100644
--- a/src/mame/drivers/maygayv1.c
+++ b/src/mame/drivers/maygayv1.c
@@ -1019,10 +1019,10 @@ static MACHINE_CONFIG_START( maygayv1, maygayv1_state )
/* U25 ST 2 9148 EF68B21P */
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(maygayv1_state, b_read))
- MCFG_PIA6821_READPB_HANDLER(READ8(maygayv1_state, b_read))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(maygayv1_state, b_writ))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(maygayv1_state, b_writ))
+ MCFG_PIA_READPA_HANDLER(READ8(maygayv1_state, b_read))
+ MCFG_PIA_READPB_HANDLER(READ8(maygayv1_state, b_read))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(maygayv1_state, b_writ))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(maygayv1_state, b_writ))
MCFG_NVRAM_ADD_0FILL("nvram")
diff --git a/src/mame/drivers/mcr68.c b/src/mame/drivers/mcr68.c
index 0e13e201aa5..6a2241fb294 100644
--- a/src/mame/drivers/mcr68.c
+++ b/src/mame/drivers/mcr68.c
@@ -965,20 +965,20 @@ static MACHINE_CONFIG_START( zwackery, mcr68_state )
MCFG_MACHINE_RESET_OVERRIDE(mcr68_state,zwackery)
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA6821_READPB_HANDLER(IOPORT("IN0"))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(mcr68_state, zwackery_pia0_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(mcr68_state, zwackery_pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(mcr68_state, zwackery_pia_irq))
+ MCFG_PIA_READPB_HANDLER(IOPORT("IN0"))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(mcr68_state, zwackery_pia0_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(mcr68_state, zwackery_pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(mcr68_state, zwackery_pia_irq))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(mcr68_state,zwackery_port_1_r))
- MCFG_PIA6821_READPB_HANDLER(READ8(mcr68_state, zwackery_port_2_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(mcr68_state, zwackery_pia1_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(mcr68_state, zwackery_ca2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(mcr68_state,zwackery_port_1_r))
+ MCFG_PIA_READPB_HANDLER(READ8(mcr68_state, zwackery_port_2_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(mcr68_state, zwackery_pia1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(mcr68_state, zwackery_ca2_w))
MCFG_DEVICE_ADD("pia2", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(mcr68_state, zwackery_port_3_r))
- MCFG_PIA6821_READPB_HANDLER(IOPORT("DSW"))
+ MCFG_PIA_READPA_HANDLER(READ8(mcr68_state, zwackery_port_3_r))
+ MCFG_PIA_READPB_HANDLER(IOPORT("DSW"))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/mpu3.c b/src/mame/drivers/mpu3.c
index e28da5c7c42..7fdd1a50445 100644
--- a/src/mame/drivers/mpu3.c
+++ b/src/mame/drivers/mpu3.c
@@ -862,33 +862,33 @@ static MACHINE_CONFIG_START( mpu3base, mpu3_state )
MCFG_PTM6840_ADD("ptm_ic2", ptm_ic2_intf)
MCFG_DEVICE_ADD("pia_ic3", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(mpu3_state, pia_ic3_porta_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(mpu3_state, pia_ic3_portb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(mpu3_state, pia_ic3_ca2_w))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(mpu3_state, cpu0_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(mpu3_state, pia_ic3_porta_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu3_state, pia_ic3_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(mpu3_state, pia_ic3_ca2_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(mpu3_state, cpu0_irq))
MCFG_DEVICE_ADD("pia_ic4", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(mpu3_state, pia_ic4_porta_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(mpu3_state, pia_ic4_porta_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(mpu3_state, pia_ic4_portb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(mpu3_state, pia_ic4_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(mpu3_state, pia_ic4_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(mpu3_state, cpu0_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(mpu3_state, pia_ic4_porta_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(mpu3_state, pia_ic4_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu3_state, pia_ic4_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(mpu3_state, pia_ic4_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(mpu3_state, pia_ic4_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(mpu3_state, cpu0_irq))
MCFG_DEVICE_ADD("pia_ic5", PIA6821, 0)
- MCFG_PIA6821_READPB_HANDLER(READ8(mpu3_state, pia_ic5_portb_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(mpu3_state, pia_ic5_porta_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(mpu3_state, pia_ic5_portb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(mpu3_state, pia_ic5_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(mpu3_state, pia_ic5_cb2_w))
+ MCFG_PIA_READPB_HANDLER(READ8(mpu3_state, pia_ic5_portb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(mpu3_state, pia_ic5_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu3_state, pia_ic5_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(mpu3_state, pia_ic5_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(mpu3_state, pia_ic5_cb2_w))
MCFG_DEVICE_ADD("pia_ic6", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(mpu3_state, pia_ic6_porta_r))
- MCFG_PIA6821_READPB_HANDLER(READ8(mpu3_state, pia_ic6_portb_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(mpu3_state, pia_ic6_porta_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(mpu3_state, pia_ic6_portb_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(mpu3_state, cpu0_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(mpu3_state, cpu0_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(mpu3_state, pia_ic6_porta_r))
+ MCFG_PIA_READPB_HANDLER(READ8(mpu3_state, pia_ic6_portb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(mpu3_state, pia_ic6_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu3_state, pia_ic6_portb_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(mpu3_state, cpu0_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(mpu3_state, cpu0_irq))
MCFG_NVRAM_ADD_0FILL("nvram")
diff --git a/src/mame/drivers/mpu4hw.c b/src/mame/drivers/mpu4hw.c
index 6eaa3c60b36..c3d6aa563e5 100644
--- a/src/mame/drivers/mpu4hw.c
+++ b/src/mame/drivers/mpu4hw.c
@@ -2639,67 +2639,67 @@ MACHINE_CONFIG_FRAGMENT( mpu4_common )
MCFG_PTM6840_ADD("ptm_ic2", ptm_ic2_intf)
MCFG_DEVICE_ADD("pia_ic3", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(mpu4_state, pia_ic3_porta_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_ic3_portb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(mpu4_state, pia_ic3_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(mpu4_state, pia_ic3_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(mpu4_state, pia_ic3_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_ic3_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(mpu4_state, pia_ic3_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(mpu4_state, pia_ic3_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
MCFG_DEVICE_ADD("pia_ic4", PIA6821, 0)
- MCFG_PIA6821_READPB_HANDLER(READ8(mpu4_state, pia_ic4_portb_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(mpu4_state, pia_ic4_porta_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_ic4_portb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(mpu4_state,pia_ic4_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(mpu4_state,pia_ic4_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(mpu4_state,cpu0_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(mpu4_state,cpu0_irq))
+ MCFG_PIA_READPB_HANDLER(READ8(mpu4_state, pia_ic4_portb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(mpu4_state, pia_ic4_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_ic4_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(mpu4_state,pia_ic4_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(mpu4_state,pia_ic4_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(mpu4_state,cpu0_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(mpu4_state,cpu0_irq))
MCFG_DEVICE_ADD("pia_ic5", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(mpu4_state, pia_ic5_porta_r))
- MCFG_PIA6821_READPB_HANDLER(READ8(mpu4_state, pia_ic5_portb_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(mpu4_state, pia_ic5_porta_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_ic5_portb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(mpu4_state, pia_ic5_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(mpu4_state, pia_ic5_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(mpu4_state, pia_ic5_porta_r))
+ MCFG_PIA_READPB_HANDLER(READ8(mpu4_state, pia_ic5_portb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(mpu4_state, pia_ic5_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_ic5_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(mpu4_state, pia_ic5_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(mpu4_state, pia_ic5_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
MCFG_DEVICE_ADD("pia_ic6", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(mpu4_state, pia_ic6_porta_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_ic6_portb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(mpu4_state, pia_ic6_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(mpu4_state, pia_ic6_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(mpu4_state, pia_ic6_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_ic6_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(mpu4_state, pia_ic6_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(mpu4_state, pia_ic6_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
MCFG_DEVICE_ADD("pia_ic7", PIA6821, 0)
- MCFG_PIA6821_READPB_HANDLER(READ8(mpu4_state, pia_ic7_portb_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(mpu4_state, pia_ic7_porta_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_ic7_portb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(mpu4_state, pia_ic7_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(mpu4_state, pia_ic7_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
+ MCFG_PIA_READPB_HANDLER(READ8(mpu4_state, pia_ic7_portb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(mpu4_state, pia_ic7_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_ic7_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(mpu4_state, pia_ic7_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(mpu4_state, pia_ic7_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
MCFG_DEVICE_ADD("pia_ic8", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(mpu4_state, pia_ic8_porta_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_ic8_portb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(mpu4_state, pia_ic8_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(mpu4_state, pia_ic8_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(mpu4_state, pia_ic8_porta_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_ic8_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(mpu4_state, pia_ic8_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(mpu4_state, pia_ic8_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( mpu4_common2 )
MCFG_PTM6840_ADD("ptm_ic3ss", ptm_ic3ss_intf)
MCFG_DEVICE_ADD("pia_ic4ss", PIA6821, 0)
- MCFG_PIA6821_READPB_HANDLER(READ8(mpu4_state, pia_gb_portb_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(mpu4_state, pia_gb_porta_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_gb_portb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(mpu4_state, pia_gb_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(mpu4_state, pia_gb_cb2_w))
+ MCFG_PIA_READPB_HANDLER(READ8(mpu4_state, pia_gb_portb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(mpu4_state, pia_gb_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_gb_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(mpu4_state, pia_gb_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(mpu4_state, pia_gb_cb2_w))
MACHINE_CONFIG_END
/* machine driver for MOD 2 board */
diff --git a/src/mame/drivers/mpu4vid.c b/src/mame/drivers/mpu4vid.c
index c3107101e37..8b525420e98 100644
--- a/src/mame/drivers/mpu4vid.c
+++ b/src/mame/drivers/mpu4vid.c
@@ -1470,9 +1470,9 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( crmaze, mpu4_vid )
MCFG_DEVICE_MODIFY("pia_ic5")
- MCFG_PIA6821_READPA_HANDLER(READ8(mpu4vid_state, pia_ic5_porta_track_r))
- MCFG_PIA6821_WRITEPA_HANDLER(NULL)
- MCFG_PIA6821_WRITEPB_HANDLER(NULL)
+ MCFG_PIA_READPA_HANDLER(READ8(mpu4vid_state, pia_ic5_porta_track_r))
+ MCFG_PIA_WRITEPA_HANDLER(NULL)
+ MCFG_PIA_WRITEPB_HANDLER(NULL)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( mating, crmaze )
diff --git a/src/mame/drivers/nyny.c b/src/mame/drivers/nyny.c
index ddffeffda2a..1d39b1c4f31 100644
--- a/src/mame/drivers/nyny.c
+++ b/src/mame/drivers/nyny.c
@@ -691,17 +691,17 @@ static MACHINE_CONFIG_START( nyny, nyny_state )
MCFG_TTL74123_ADD("ic48_1", ic48_1_config)
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("IN0"))
- MCFG_PIA6821_READPB_HANDLER(IOPORT("IN1"))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(nyny_state, main_cpu_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(nyny_state, main_cpu_irq))
+ MCFG_PIA_READPA_HANDLER(IOPORT("IN0"))
+ MCFG_PIA_READPB_HANDLER(IOPORT("IN1"))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(nyny_state, main_cpu_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(nyny_state, main_cpu_irq))
MCFG_DEVICE_ADD("pia2", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(nyny_state,pia_2_port_a_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(nyny_state,pia_2_port_b_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(nyny_state,flipscreen_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(nyny_state,main_cpu_firq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(nyny_state,main_cpu_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(nyny_state,pia_2_port_a_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(nyny_state,pia_2_port_b_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(nyny_state,flipscreen_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(nyny_state,main_cpu_firq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(nyny_state,main_cpu_irq))
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/qix.c b/src/mame/drivers/qix.c
index 86112fa41b1..e0a9d3884e2 100644
--- a/src/mame/drivers/qix.c
+++ b/src/mame/drivers/qix.c
@@ -619,16 +619,16 @@ static MACHINE_CONFIG_START( qix_base, qix_state )
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("P1"))
- MCFG_PIA6821_READPB_HANDLER(IOPORT("COIN"))
+ MCFG_PIA_READPA_HANDLER(IOPORT("P1"))
+ MCFG_PIA_READPB_HANDLER(IOPORT("COIN"))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("SPARE"))
- MCFG_PIA6821_READPB_HANDLER(IOPORT("IN0"))
+ MCFG_PIA_READPA_HANDLER(IOPORT("SPARE"))
+ MCFG_PIA_READPB_HANDLER(IOPORT("IN0"))
MCFG_DEVICE_ADD("pia2", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("P2"))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(qix_state, qix_coinctl_w))
+ MCFG_PIA_READPA_HANDLER(IOPORT("P2"))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(qix_state, qix_coinctl_w))
/* video hardware */
MCFG_FRAGMENT_ADD(qix_video)
@@ -656,11 +656,11 @@ static MACHINE_CONFIG_DERIVED( mcu, qix )
MCFG_MACHINE_START_OVERRIDE(qix_state,qixmcu)
MCFG_DEVICE_MODIFY("pia1")
- MCFG_PIA6821_READPB_HANDLER(READ8(qix_state, qixmcu_coin_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(qix_state, qixmcu_coin_w))
+ MCFG_PIA_READPB_HANDLER(READ8(qix_state, qixmcu_coin_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(qix_state, qixmcu_coin_w))
MCFG_DEVICE_MODIFY("pia2")
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(qix_state, qixmcu_coinctrl_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(qix_state, qixmcu_coinctrl_w))
MACHINE_CONFIG_END
@@ -692,12 +692,12 @@ static MACHINE_CONFIG_DERIVED( slither, qix_base )
MCFG_CPU_CLOCK(SLITHER_CLOCK_OSC/4/4) /* 1.34 MHz */
MCFG_DEVICE_MODIFY("pia1")
- MCFG_PIA6821_READPA_HANDLER(READ8(qix_state, slither_trak_lr_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(qix_state, slither_76489_0_w))
+ MCFG_PIA_READPA_HANDLER(READ8(qix_state, slither_trak_lr_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(qix_state, slither_76489_0_w))
MCFG_DEVICE_MODIFY("pia2")
- MCFG_PIA6821_READPA_HANDLER(READ8(qix_state, slither_trak_ud_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(qix_state, slither_76489_1_w))
+ MCFG_PIA_READPA_HANDLER(READ8(qix_state, slither_trak_ud_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(qix_state, slither_76489_1_w))
/* video hardware */
MCFG_FRAGMENT_ADD(slither_video)
diff --git a/src/mame/drivers/r2dtank.c b/src/mame/drivers/r2dtank.c
index bddf6beba86..579c0d1f524 100644
--- a/src/mame/drivers/r2dtank.c
+++ b/src/mame/drivers/r2dtank.c
@@ -525,18 +525,18 @@ static MACHINE_CONFIG_START( r2dtank, r2dtank_state )
MCFG_TTL74123_ADD("74123", ttl74123_intf)
MCFG_DEVICE_ADD("pia_main", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("IN0"))
- MCFG_PIA6821_READPB_HANDLER(IOPORT("IN1"))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(r2dtank_state, flipscreen_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(r2dtank_state, main_cpu_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(r2dtank_state, main_cpu_irq))
+ MCFG_PIA_READPA_HANDLER(IOPORT("IN0"))
+ MCFG_PIA_READPB_HANDLER(IOPORT("IN1"))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(r2dtank_state, flipscreen_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(r2dtank_state, main_cpu_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(r2dtank_state, main_cpu_irq))
MCFG_DEVICE_ADD("pia_audio", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(r2dtank_state, AY8910_port_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(r2dtank_state, AY8910_port_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(r2dtank_state, AY8910_select_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(r2dtank_state, main_cpu_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(r2dtank_state, main_cpu_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(r2dtank_state, AY8910_port_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(r2dtank_state, AY8910_port_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(r2dtank_state, AY8910_select_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(r2dtank_state, main_cpu_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(r2dtank_state, main_cpu_irq))
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/s11.c b/src/mame/drivers/s11.c
index c593a2147d2..33c79f56858 100644
--- a/src/mame/drivers/s11.c
+++ b/src/mame/drivers/s11.c
@@ -404,49 +404,49 @@ static MACHINE_CONFIG_START( s11, s11_state )
/* Devices */
MCFG_DEVICE_ADD("pia21", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s11_state, dac_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s11_state, sound_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11_state, sol2_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s11_state, pia21_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s11_state, pia21_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(s11_state, dac_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, sound_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, sol2_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s11_state, pia21_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia21_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
MCFG_DEVICE_ADD("pia24", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s11_state, lamp0_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11_state, lamp1_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s11_state, pia24_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, lamp0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, lamp1_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia24_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
MCFG_DEVICE_ADD("pia28", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s11_state, pia28_w7_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s11_state, dig0_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11_state, dig1_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s11_state, pia28_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s11_state, pia28_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(s11_state, pia28_w7_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, dig0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, dig1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s11_state, pia28_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia28_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
MCFG_DEVICE_ADD("pia2c", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s11_state, pia2c_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11_state, pia2c_pb_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, pia2c_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, pia2c_pb_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
MCFG_DEVICE_ADD("pia30", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s11_state, switch_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11_state, switch_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s11_state, pia30_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(s11_state, switch_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, switch_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia30_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
MCFG_DEVICE_ADD("pia34", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s11_state, pia34_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11_state, pia34_pb_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s11_state, pia34_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, pia34_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, pia34_pb_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia34_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -463,13 +463,13 @@ static MACHINE_CONFIG_START( s11, s11_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speech", 0.50)
MCFG_DEVICE_ADD("pias", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s11_state, dac_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s11_state, sound_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11_state, dac_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s11_state, pias_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s11_state, pias_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("audiocpu", m6808_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("audiocpu", m6808_cpu_device, irq_line))
+ MCFG_PIA_READPA_HANDLER(READ8(s11_state, dac_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, sound_w))
+ 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))
/* Add the background music card */
MCFG_CPU_ADD("bgcpu", M6809E, 8000000) // MC68B09E
@@ -484,11 +484,11 @@ static MACHINE_CONFIG_START( s11, s11_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50)
MCFG_DEVICE_ADD("pia40", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s11_state, pia40_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11_state, pia40_pb_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s11_state, pia40_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("bgcpu", m6809_device, firq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("bgcpu", m6809_device, nmi_line))
+ 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))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/s11a.c b/src/mame/drivers/s11a.c
index 79350b2cbe5..1048eddfd18 100644
--- a/src/mame/drivers/s11a.c
+++ b/src/mame/drivers/s11a.c
@@ -184,49 +184,49 @@ static MACHINE_CONFIG_START( s11a, s11a_state )
/* Devices */
MCFG_DEVICE_ADD("pia21", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s11_state, dac_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s11_state, sound_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11_state, sol2_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s11_state, pia21_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s11_state, pia21_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(s11_state, dac_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, sound_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, sol2_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s11_state, pia21_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia21_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
MCFG_DEVICE_ADD("pia24", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s11_state, lamp0_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11_state, lamp1_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s11_state, pia24_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, lamp0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, lamp1_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia24_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
MCFG_DEVICE_ADD("pia28", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s11_state, pia28_w7_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s11a_state, dig0_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11_state, dig1_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s11_state, pia28_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s11_state, pia28_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(s11_state, pia28_w7_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11a_state, dig0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, dig1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s11_state, pia28_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia28_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
MCFG_DEVICE_ADD("pia2c", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s11_state, pia2c_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11_state, pia2c_pb_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, pia2c_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, pia2c_pb_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
MCFG_DEVICE_ADD("pia30", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s11_state, switch_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11_state, switch_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s11_state, pia30_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(s11_state, switch_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, switch_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia30_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
MCFG_DEVICE_ADD("pia34", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s11_state, pia34_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11_state, pia34_pb_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s11_state, pia34_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, pia34_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, pia34_pb_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia34_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -243,12 +243,12 @@ static MACHINE_CONFIG_START( s11a, s11a_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speech", 0.50)
MCFG_DEVICE_ADD("pias", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s11_state, dac_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s11_state, sound_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11_state, dac_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s11_state, pia40_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("audiocpu", m6802_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("audiocpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_READPA_HANDLER(READ8(s11_state, dac_r))
+ 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))
/* Add the background music card */
MCFG_CPU_ADD("bgcpu", M6809E, 8000000) // MC68B09E
@@ -263,12 +263,12 @@ static MACHINE_CONFIG_START( s11a, s11a_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50)
MCFG_DEVICE_ADD("pia40", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s11_state, pia40_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11_state, pia40_pb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s11_state, pias_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s11_state, pias_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("bgcpu", m6809e_device, firq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("bgcpu", m6809e_device, nmi_line))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, pia40_pa_w))
+ 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))
MACHINE_CONFIG_END
/*------------------------
diff --git a/src/mame/drivers/s11b.c b/src/mame/drivers/s11b.c
index 67dc34a91b1..f2dae9cee4b 100644
--- a/src/mame/drivers/s11b.c
+++ b/src/mame/drivers/s11b.c
@@ -263,49 +263,49 @@ static MACHINE_CONFIG_START( s11b, s11b_state )
/* Devices */
MCFG_DEVICE_ADD("pia21", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s11_state, dac_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s11_state, sound_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11_state, sol2_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s11_state, pia21_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s11_state, pia21_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(s11_state, dac_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, sound_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, sol2_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s11_state, pia21_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia21_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
MCFG_DEVICE_ADD("pia24", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s11_state, lamp0_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11_state, lamp1_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s11_state, pia24_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, lamp0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, lamp1_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia24_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
MCFG_DEVICE_ADD("pia28", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s11_state, pia28_w7_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s11a_state, dig0_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11b_state, dig1_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s11_state, pia28_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s11_state, pia28_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(s11_state, pia28_w7_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11a_state, dig0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11b_state, dig1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s11_state, pia28_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia28_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
MCFG_DEVICE_ADD("pia2c", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s11b_state, pia2c_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11b_state, pia2c_pb_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11b_state, pia2c_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11b_state, pia2c_pb_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
MCFG_DEVICE_ADD("pia30", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s11_state, switch_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11_state, switch_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s11_state, pia30_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(s11_state, switch_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, switch_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia30_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
MCFG_DEVICE_ADD("pia34", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s11b_state, pia34_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11_state, pia34_pb_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s11_state, pia34_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11b_state, pia34_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, pia34_pb_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia34_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -322,13 +322,13 @@ static MACHINE_CONFIG_START( s11b, s11b_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speech", 0.50)
MCFG_DEVICE_ADD("pias", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s11_state, dac_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s11_state, sound_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11_state, dac_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s11_state, pias_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s11_state, pias_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("audiocpu", m6802_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("audiocpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_READPA_HANDLER(READ8(s11_state, dac_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, sound_w))
+ 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))
/* 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?)
@@ -347,12 +347,12 @@ static MACHINE_CONFIG_START( s11b, s11b_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speech", 0.50)
MCFG_DEVICE_ADD("pia40", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s11_state, pia40_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11_state, pia40_pb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s11b_state, pia40_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s11_state, pia40_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("bgcpu", m6809e_device, firq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("bgcpu", m6809e_device, nmi_line))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, pia40_pa_w))
+ 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))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/s11c.c b/src/mame/drivers/s11c.c
index ab6232184f4..334a7a59e4c 100644
--- a/src/mame/drivers/s11c.c
+++ b/src/mame/drivers/s11c.c
@@ -165,49 +165,49 @@ static MACHINE_CONFIG_START( s11c, s11c_state )
/* Devices */
MCFG_DEVICE_ADD("pia21", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s11_state, dac_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s11_state, sound_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11_state, sol2_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s11_state, pia21_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s11_state, pia21_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(s11_state, dac_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, sound_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, sol2_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s11_state, pia21_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia21_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
MCFG_DEVICE_ADD("pia24", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s11_state, lamp0_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11_state, lamp1_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s11_state, pia24_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, lamp0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, lamp1_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia24_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
MCFG_DEVICE_ADD("pia28", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s11_state, pia28_w7_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s11a_state, dig0_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11b_state, dig1_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s11_state, pia28_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s11_state, pia28_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(s11_state, pia28_w7_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11a_state, dig0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11b_state, dig1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s11_state, pia28_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia28_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
MCFG_DEVICE_ADD("pia2c", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s11b_state, pia2c_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11b_state, pia2c_pb_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11b_state, pia2c_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11b_state, pia2c_pb_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
MCFG_DEVICE_ADD("pia30", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s11_state, switch_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11_state, switch_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s11_state, pia30_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(s11_state, switch_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, switch_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia30_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
MCFG_DEVICE_ADD("pia34", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s11b_state, pia34_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11_state, pia34_pb_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s11_state, pia34_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11b_state, pia34_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, pia34_pb_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia34_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -232,11 +232,11 @@ static MACHINE_CONFIG_START( s11c, s11c_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50)
MCFG_DEVICE_ADD("pia40", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s11_state, pia40_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s11_state, pia40_pb_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s11_state, pia40_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("bgcpu", m6809_device, firq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("bgcpu", m6809_device, nmi_line))
+ 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))
*/
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/s3.c b/src/mame/drivers/s3.c
index 7e4ce3e9ed4..955ebe22502 100644
--- a/src/mame/drivers/s3.c
+++ b/src/mame/drivers/s3.c
@@ -428,39 +428,39 @@ static MACHINE_CONFIG_START( s3, s3_state )
/* Devices */
MCFG_DEVICE_ADD("pia22", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s3_state, sol0_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s3_state, sol1_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s3_state, pia22_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s3_state, pia22_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s3_state, sol0_w))
+ 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_DEVICE_ADD("pia24", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s3_state, lamp0_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s3_state, lamp1_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s3_state, pia24_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s3_state, pia24_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ 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_DEVICE_ADD("pia28", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s3_state, dips_r))
- MCFG_PIA6821_READCA1_HANDLER(READLINE(s3_state, pia28_ca1_r))
- MCFG_PIA6821_READCB1_HANDLER(READLINE(s3_state, pia28_cb1_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s3_state, dig0_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s3_state, dig1_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s3_state, pia28_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s3_state, pia28_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_READPA_HANDLER(READ8(s3_state, dips_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(s3_state, pia28_ca1_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(s3_state, pia28_cb1_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s3_state, dig0_w))
+ 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_DEVICE_ADD("pia30", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s3_state, switch_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s3_state, switch_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s3_state, pia30_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s3_state, pia30_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ 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_NVRAM_ADD_1FILL("nvram")
MACHINE_CONFIG_END
@@ -475,11 +475,11 @@ static MACHINE_CONFIG_DERIVED( s3a, s3 )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_DEVICE_ADD("pias", PIA6821, 0)
- MCFG_PIA6821_READPB_HANDLER(READ8(s3_state, dac_r))
- MCFG_PIA6821_READCB1_HANDLER(READLINE(s3_state, pias_cb1_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s3_state, dac_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_READPB_HANDLER(READ8(s3_state, dac_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(s3_state, pias_cb1_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s3_state, dac_w))
+ MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/s4.c b/src/mame/drivers/s4.c
index b09ccc20d30..b200841fccd 100644
--- a/src/mame/drivers/s4.c
+++ b/src/mame/drivers/s4.c
@@ -430,39 +430,39 @@ static MACHINE_CONFIG_START( s4, s4_state )
/* Devices */
MCFG_DEVICE_ADD("pia22", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s4_state, sol0_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s4_state, sol1_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s4_state, pia22_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s4_state, pia22_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s4_state, sol0_w))
+ 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_DEVICE_ADD("pia24", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s4_state, lamp0_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s4_state, lamp1_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s4_state, pia24_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s4_state, pia24_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ 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_DEVICE_ADD("pia28", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s4_state, dips_r))
- MCFG_PIA6821_READCA1_HANDLER(READLINE(s4_state, pia28_ca1_r))
- MCFG_PIA6821_READCB1_HANDLER(READLINE(s4_state, pia28_cb1_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s4_state, dig0_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s4_state, dig1_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s4_state, pia28_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s4_state, pia28_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_READPA_HANDLER(READ8(s4_state, dips_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(s4_state, pia28_ca1_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(s4_state, pia28_cb1_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s4_state, dig0_w))
+ 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_DEVICE_ADD("pia30", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s4_state, switch_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s4_state, switch_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s4_state, pia30_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s4_state, pia30_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ 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_NVRAM_ADD_1FILL("nvram")
MACHINE_CONFIG_END
@@ -477,11 +477,11 @@ static MACHINE_CONFIG_DERIVED( s4a, s4 )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_DEVICE_ADD("pias", PIA6821, 0)
- MCFG_PIA6821_READPB_HANDLER(READ8(s4_state, dac_r))
- MCFG_PIA6821_READCB1_HANDLER(READLINE(s4_state, pias_cb1_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s4_state, dac_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("audiocpu", m6808_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("audiocpu", m6808_cpu_device, irq_line))
+ MCFG_PIA_READPB_HANDLER(READ8(s4_state, dac_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(s4_state, pias_cb1_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s4_state, dac_w))
+ MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("audiocpu", m6808_cpu_device, irq_line))
+ MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("audiocpu", m6808_cpu_device, irq_line))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/s6.c b/src/mame/drivers/s6.c
index 0fa0d6e9273..cdeb4b7da48 100644
--- a/src/mame/drivers/s6.c
+++ b/src/mame/drivers/s6.c
@@ -407,39 +407,39 @@ static MACHINE_CONFIG_START( s6, s6_state )
/* Devices */
MCFG_DEVICE_ADD("pia22", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s6_state, sol0_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s6_state, sol1_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s6_state, pia22_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s6_state, pia22_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s6_state, sol0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s6_state, sol1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s6_state, pia22_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s6_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_DEVICE_ADD("pia24", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s6_state, lamp0_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s6_state, lamp1_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s6_state, pia24_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s6_state, pia24_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s6_state, lamp0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s6_state, lamp1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s6_state, pia24_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s6_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_DEVICE_ADD("pia28", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s6_state, dips_r))
- MCFG_PIA6821_READCA1_HANDLER(READLINE(s6_state, pia28_ca1_r))
- MCFG_PIA6821_READCB1_HANDLER(READLINE(s6_state, pia28_cb1_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s6_state, dig0_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s6_state, dig1_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s6_state, pia28_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s6_state, pia28_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_READPA_HANDLER(READ8(s6_state, dips_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(s6_state, pia28_ca1_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(s6_state, pia28_cb1_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s6_state, dig0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s6_state, dig1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s6_state, pia28_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s6_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_DEVICE_ADD("pia30", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s6_state, switch_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s6_state, switch_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s6_state, pia30_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s6_state, pia30_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_READPA_HANDLER(READ8(s6_state, switch_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s6_state, switch_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s6_state, pia30_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s6_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_NVRAM_ADD_1FILL("nvram")
@@ -454,14 +454,14 @@ static MACHINE_CONFIG_START( s6, s6_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speech", 0.50)
MCFG_DEVICE_ADD("pias", PIA6821, 0)
- MCFG_PIA6821_READPB_HANDLER(READ8(s6_state, dac_r))
- MCFG_PIA6821_READCB1_HANDLER(READLINE(s6_state, pias_cb1_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s6_state, dac_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s6_state, pias_pb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s6_state, pias_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s6_state, pias_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("audiocpu", m6802_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("audiocpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_READPB_HANDLER(READ8(s6_state, dac_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(s6_state, pias_cb1_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s6_state, dac_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s6_state, pias_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s6_state, pias_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s6_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))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/s6a.c b/src/mame/drivers/s6a.c
index 26eb2fe0125..d7a7b71151e 100644
--- a/src/mame/drivers/s6a.c
+++ b/src/mame/drivers/s6a.c
@@ -410,39 +410,39 @@ static MACHINE_CONFIG_START( s6a, s6a_state )
/* Devices */
MCFG_DEVICE_ADD("pia22", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s6a_state, sol0_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s6a_state, sol1_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s6a_state, pia22_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s6a_state, pia22_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s6a_state, sol0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s6a_state, sol1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s6a_state, pia22_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s6a_state, pia22_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_DEVICE_ADD("pia24", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s6a_state, lamp0_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s6a_state, lamp1_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s6a_state, pia24_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s6a_state, pia24_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s6a_state, lamp0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s6a_state, lamp1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s6a_state, pia24_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s6a_state, pia24_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_DEVICE_ADD("pia28", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s6a_state, dips_r))
- MCFG_PIA6821_READCA1_HANDLER(READLINE(s6a_state, pia28_ca1_r))
- MCFG_PIA6821_READCB1_HANDLER(READLINE(s6a_state, pia28_cb1_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s6a_state, dig0_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s6a_state, dig1_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s6a_state, pia28_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s6a_state, pia28_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_READPA_HANDLER(READ8(s6a_state, dips_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(s6a_state, pia28_ca1_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(s6a_state, pia28_cb1_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s6a_state, dig0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s6a_state, dig1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s6a_state, pia28_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s6a_state, pia28_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_DEVICE_ADD("pia30", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s6a_state, switch_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s6a_state, switch_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s6a_state, pia30_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s6a_state, pia30_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_READPA_HANDLER(READ8(s6a_state, switch_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s6a_state, switch_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s6a_state, pia30_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s6a_state, pia30_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_NVRAM_ADD_1FILL("nvram")
@@ -457,13 +457,13 @@ static MACHINE_CONFIG_START( s6a, s6a_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speech", 0.50)
MCFG_DEVICE_ADD("pias", PIA6821, 0)
- MCFG_PIA6821_READPB_HANDLER(READ8(s6a_state, dac_r))
- MCFG_PIA6821_READCB1_HANDLER(READLINE(s6a_state, pias_cb1_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s6a_state, dac_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s6a_state, pias_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s6a_state, pias_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("audiocpu", m6802_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("audiocpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_READPB_HANDLER(READ8(s6a_state, dac_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(s6a_state, pias_cb1_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s6a_state, dac_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s6a_state, pias_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s6a_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))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/s7.c b/src/mame/drivers/s7.c
index 5946d5117f4..d5a445f2886 100644
--- a/src/mame/drivers/s7.c
+++ b/src/mame/drivers/s7.c
@@ -388,48 +388,48 @@ static MACHINE_CONFIG_START( s7, s7_state )
/* Devices */
MCFG_DEVICE_ADD("pia21", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s7_state, dac_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s7_state, sound_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s7_state, sol2_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s7_state, pia21_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s7_state, pia21_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6808_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6808_cpu_device, irq_line))
+ MCFG_PIA_READPA_HANDLER(READ8(s7_state, dac_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s7_state, sound_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s7_state, sol2_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s7_state, pia21_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s7_state, pia21_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_DEVICE_ADD("pia22", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s7_state, sol0_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s7_state, sol1_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s7_state, pia22_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s7_state, pia22_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6808_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6808_cpu_device, irq_line))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s7_state, sol0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s7_state, sol1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s7_state, pia22_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s7_state, pia22_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_DEVICE_ADD("pia24", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s7_state, lamp0_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s7_state, lamp1_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s7_state, pia24_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s7_state, pia24_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6808_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6808_cpu_device, irq_line))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s7_state, lamp0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s7_state, lamp1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s7_state, pia24_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s7_state, pia24_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_DEVICE_ADD("pia28", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s7_state, dips_r))
- MCFG_PIA6821_READCA1_HANDLER(READLINE(s7_state, pia28_ca1_r))
- MCFG_PIA6821_READCB1_HANDLER(READLINE(s7_state, pia28_cb1_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s7_state, dig0_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s7_state, dig1_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s7_state, pia28_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s7_state, pia28_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6808_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6808_cpu_device, irq_line))
+ MCFG_PIA_READPA_HANDLER(READ8(s7_state, dips_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(s7_state, pia28_ca1_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(s7_state, pia28_cb1_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s7_state, dig0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s7_state, dig1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s7_state, pia28_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s7_state, pia28_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_DEVICE_ADD("pia30", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s7_state, switch_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s7_state, switch_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s7_state, pia30_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s7_state, pia30_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6808_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6808_cpu_device, irq_line))
+ MCFG_PIA_READPA_HANDLER(READ8(s7_state, switch_r))
+ 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_NVRAM_ADD_1FILL("nvram")
@@ -444,12 +444,12 @@ static MACHINE_CONFIG_START( s7, s7_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speech", 0.50)
MCFG_DEVICE_ADD("pias", PIA6821, 0)
- MCFG_PIA6821_READPB_HANDLER(READ8(s7_state, dac_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s7_state, dac_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s7_state, pias_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s7_state, pias_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("audiocpu", m6808_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("audiocpu", m6808_cpu_device, irq_line))
+ MCFG_PIA_READPB_HANDLER(READ8(s7_state, dac_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s7_state, dac_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s7_state, pias_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s7_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))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/s8.c b/src/mame/drivers/s8.c
index 1220cc3c534..870dc51e57e 100644
--- a/src/mame/drivers/s8.c
+++ b/src/mame/drivers/s8.c
@@ -334,37 +334,37 @@ static MACHINE_CONFIG_START( s8, s8_state )
/* Devices */
MCFG_DEVICE_ADD("pia21", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s8_state, dac_r))
- MCFG_PIA6821_READCA1_HANDLER(READLINE(s8_state, pia21_ca1_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s8_state, sound_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s8_state, sol2_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s8_state, pia21_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s8_state, pia21_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_READPA_HANDLER(READ8(s8_state, dac_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(s8_state, pia21_ca1_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s8_state, sound_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s8_state, sol2_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s8_state, pia21_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s8_state, pia21_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_DEVICE_ADD("pia24", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s8_state, lamp0_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s8_state, lamp1_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s8_state, pia24_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s8_state, lamp0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s8_state, lamp1_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s8_state, pia24_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_DEVICE_ADD("pia28", PIA6821, 0)
- MCFG_PIA6821_READCA1_HANDLER(READLINE(s8_state, pia28_ca1_r))
- MCFG_PIA6821_READCB1_HANDLER(READLINE(s8_state, pia28_cb1_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s8_state, dig0_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s8_state, dig1_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s8_state, pia28_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s8_state, pia28_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_READCA1_HANDLER(READLINE(s8_state, pia28_ca1_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(s8_state, pia28_cb1_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s8_state, dig0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s8_state, dig1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s8_state, pia28_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s8_state, pia28_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_DEVICE_ADD("pia30", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s8_state, switch_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s8_state, switch_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_READPA_HANDLER(READ8(s8_state, switch_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s8_state, switch_w))
+ MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -376,13 +376,13 @@ static MACHINE_CONFIG_START( s8, s8_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADD("pias", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s8_state, dac_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s8_state, sound_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s8_state, dac_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s8_state, pias_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s8_state, pias_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("audiocpu", m6808_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("audiocpu", m6808_cpu_device, irq_line))
+ MCFG_PIA_READPA_HANDLER(READ8(s8_state, dac_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s8_state, sound_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s8_state, dac_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s8_state, pias_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s8_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))
MACHINE_CONFIG_END
/*------------------------------
diff --git a/src/mame/drivers/s9.c b/src/mame/drivers/s9.c
index 314c810fbb6..c16308cbf78 100644
--- a/src/mame/drivers/s9.c
+++ b/src/mame/drivers/s9.c
@@ -314,37 +314,37 @@ static MACHINE_CONFIG_START( s9, s9_state )
/* Devices */
MCFG_DEVICE_ADD("pia21", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s9_state, dac_r))
- MCFG_PIA6821_READCA1_HANDLER(READLINE(s9_state, pia21_ca1_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s9_state, sound_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s9_state, sol2_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s9_state, pia21_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s9_state, pia21_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6808_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6808_cpu_device, irq_line))
+ MCFG_PIA_READPA_HANDLER(READ8(s9_state, dac_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(s9_state, pia21_ca1_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s9_state, sound_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s9_state, sol2_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s9_state, pia21_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s9_state, pia21_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_DEVICE_ADD("pia24", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s9_state, lamp0_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s9_state, lamp1_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s9_state, pia24_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6808_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6808_cpu_device, irq_line))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s9_state, lamp0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s9_state, lamp1_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s9_state, pia24_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_DEVICE_ADD("pia28", PIA6821, 0)
- MCFG_PIA6821_READCA1_HANDLER(READLINE(s9_state, pia28_ca1_r))
- MCFG_PIA6821_READCB1_HANDLER(READLINE(s9_state, pia28_cb1_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s9_state, dig0_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s9_state, dig1_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s9_state, pia28_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s9_state, pia28_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6808_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6808_cpu_device, irq_line))
+ MCFG_PIA_READCA1_HANDLER(READLINE(s9_state, pia28_ca1_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(s9_state, pia28_cb1_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s9_state, dig0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s9_state, dig1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s9_state, pia28_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s9_state, pia28_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_DEVICE_ADD("pia30", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s9_state, switch_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s9_state, switch_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6808_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6808_cpu_device, irq_line))
+ MCFG_PIA_READPA_HANDLER(READ8(s9_state, switch_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s9_state, switch_w))
+ MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6808_cpu_device, irq_line))
+ MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6808_cpu_device, irq_line))
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -359,13 +359,13 @@ static MACHINE_CONFIG_START( s9, s9_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speech", 0.50)
MCFG_DEVICE_ADD("pias", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(s9_state, dac_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(s9_state, sound_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(s9_state, dac_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(s9_state, pias_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(s9_state, pias_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("audiocpu", m6808_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("audiocpu", m6808_cpu_device, irq_line))
+ MCFG_PIA_READPA_HANDLER(READ8(s9_state, dac_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(s9_state, sound_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(s9_state, dac_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(s9_state, pias_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(s9_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))
MACHINE_CONFIG_END
/*-----------------------------
diff --git a/src/mame/drivers/spiders.c b/src/mame/drivers/spiders.c
index e99965714a1..301ffc88360 100644
--- a/src/mame/drivers/spiders.c
+++ b/src/mame/drivers/spiders.c
@@ -623,28 +623,28 @@ static MACHINE_CONFIG_START( spiders, spiders_state )
/* 74LS123 */
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("IN0"))
- MCFG_PIA6821_READPB_HANDLER(IOPORT("IN1"))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(spiders_state,main_cpu_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(spiders_state,main_cpu_irq))
+ MCFG_PIA_READPA_HANDLER(IOPORT("IN0"))
+ MCFG_PIA_READPB_HANDLER(IOPORT("IN1"))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(spiders_state,main_cpu_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(spiders_state,main_cpu_irq))
MCFG_DEVICE_ADD("pia2", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(spiders_state,gfx_rom_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(spiders_state,gfx_rom_intf_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(spiders_state,flipscreen_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(spiders_state,main_cpu_firq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(spiders_state,main_cpu_irq))
+ 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_IRQB_HANDLER(WRITELINE(spiders_state,main_cpu_irq))
MCFG_DEVICE_ADD("pia3", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(spiders_state, spiders_audio_ctrl_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(spiders_state, spiders_audio_command_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(spiders_state,main_cpu_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(spiders_state,main_cpu_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(spiders_state, spiders_audio_ctrl_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(spiders_state, spiders_audio_command_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(spiders_state,main_cpu_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(spiders_state,main_cpu_irq))
MCFG_DEVICE_ADD("pia4", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(spiders_state, spiders_audio_a_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(spiders_state, spiders_audio_b_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(spiders_state, audio_cpu_irq))
+ 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_TTL74123_ADD("ic60", ic60_intf)
diff --git a/src/mame/drivers/toratora.c b/src/mame/drivers/toratora.c
index b2abf8f1212..fea7fbdb0bf 100644
--- a/src/mame/drivers/toratora.c
+++ b/src/mame/drivers/toratora.c
@@ -387,21 +387,21 @@ static MACHINE_CONFIG_START( toratora, toratora_state )
MCFG_CPU_PERIODIC_INT_DRIVER(toratora_state, toratora_timer, 16) /* timer counting at 16 Hz */
MCFG_DEVICE_ADD("pia_u1", PIA6821, 0)
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(toratora_state,port_b_u1_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(toratora_state,main_cpu_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(toratora_state,main_cpu_irq))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(toratora_state,port_b_u1_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(toratora_state,main_cpu_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(toratora_state,main_cpu_irq))
MCFG_DEVICE_ADD("pia_u2", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(toratora_state, sn1_port_a_u2_u3_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(toratora_state, sn1_port_b_u2_u3_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(toratora_state, sn1_ca2_u2_u3_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(toratora_state, sn1_port_a_u2_u3_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(toratora_state, sn1_port_b_u2_u3_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(toratora_state, sn1_ca2_u2_u3_w))
MCFG_DEVICE_ADD("pia_u3", PIA6821, 0)
- MCFG_PIA6821_READPB_HANDLER(IOPORT("DSW"))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(toratora_state,sn2_port_a_u2_u3_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(toratora_state,sn2_port_b_u2_u3_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(toratora_state,sn2_ca2_u2_u3_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(toratora_state,cb2_u3_w))
+ MCFG_PIA_READPB_HANDLER(IOPORT("DSW"))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(toratora_state,sn2_port_a_u2_u3_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(toratora_state,sn2_port_b_u2_u3_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(toratora_state,sn2_ca2_u2_u3_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(toratora_state,cb2_u3_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/truco.c b/src/mame/drivers/truco.c
index 30a29586f80..fe323115dff 100644
--- a/src/mame/drivers/truco.c
+++ b/src/mame/drivers/truco.c
@@ -438,13 +438,13 @@ static MACHINE_CONFIG_START( truco, truco_state )
MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(1.6)) /* 1.6 seconds */
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("P1"))
- MCFG_PIA6821_READPB_HANDLER(IOPORT("JMPRS"))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(truco_state,porta_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(truco_state,portb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(truco_state,pia_ca2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(truco_state,pia_irqa_w))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(truco_state,pia_irqb_w))
+ MCFG_PIA_READPA_HANDLER(IOPORT("P1"))
+ MCFG_PIA_READPB_HANDLER(IOPORT("JMPRS"))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(truco_state,porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(truco_state,portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(truco_state,pia_ca2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(truco_state,pia_irqa_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(truco_state,pia_irqb_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/tugboat.c b/src/mame/drivers/tugboat.c
index de1641c2877..eefcc5c4be5 100644
--- a/src/mame/drivers/tugboat.c
+++ b/src/mame/drivers/tugboat.c
@@ -321,12 +321,12 @@ static MACHINE_CONFIG_START( tugboat, tugboat_state )
MCFG_CPU_VBLANK_INT_DRIVER("screen", tugboat_state, nmi_line_pulse)
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(tugboat_state,tugboat_input_r))
+ MCFG_PIA_READPA_HANDLER(READ8(tugboat_state,tugboat_input_r))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("DSW"))
- MCFG_PIA6821_READPB_HANDLER(READ8(tugboat_state, tugboat_ctrl_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(tugboat_state, tugboat_ctrl_w))
+ MCFG_PIA_READPA_HANDLER(IOPORT("DSW"))
+ MCFG_PIA_READPB_HANDLER(READ8(tugboat_state, tugboat_ctrl_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(tugboat_state, tugboat_ctrl_w))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/williams.c b/src/mame/drivers/williams.c
index 10537a2c7a9..9a9090cc16d 100644
--- a/src/mame/drivers/williams.c
+++ b/src/mame/drivers/williams.c
@@ -1463,19 +1463,19 @@ static MACHINE_CONFIG_START( defender, williams_state )
/* pia */
MCFG_DEVICE_ADD("pia_0", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("IN0"))
- MCFG_PIA6821_READPB_HANDLER(IOPORT("IN1"))
+ MCFG_PIA_READPA_HANDLER(IOPORT("IN0"))
+ MCFG_PIA_READPB_HANDLER(IOPORT("IN1"))
MCFG_DEVICE_ADD("pia_1", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("IN2"))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(williams_state, williams_snd_cmd_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(williams_state, williams_main_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(williams_state, williams_main_irq))
+ MCFG_PIA_READPA_HANDLER(IOPORT("IN2"))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(williams_state, williams_snd_cmd_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(williams_state, williams_main_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(williams_state, williams_main_irq))
MCFG_DEVICE_ADD("pia_2", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(DEVWRITE8("wmsdac", dac_device, write_unsigned8))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(williams_state,williams_snd_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(williams_state,williams_snd_irq))
+ MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("wmsdac", dac_device, write_unsigned8))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(williams_state,williams_snd_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(williams_state,williams_snd_irq))
MACHINE_CONFIG_END
@@ -1509,7 +1509,7 @@ static MACHINE_CONFIG_DERIVED( williams_muxed, williams )
/* pia */
MCFG_DEVICE_MODIFY("pia_0")
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(williams_state, williams_port_select_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(williams_state, williams_port_select_w))
MACHINE_CONFIG_END
@@ -1528,8 +1528,8 @@ static MACHINE_CONFIG_DERIVED( spdball, williams )
/* pia */
MCFG_DEVICE_ADD("pia_3", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("IN3"))
- MCFG_PIA6821_READPB_HANDLER(IOPORT("IN4"))
+ MCFG_PIA_READPA_HANDLER(IOPORT("IN3"))
+ MCFG_PIA_READPB_HANDLER(IOPORT("IN4"))
MACHINE_CONFIG_END
@@ -1539,8 +1539,8 @@ static MACHINE_CONFIG_DERIVED( lottofun, williams )
/* pia */
MCFG_DEVICE_MODIFY("pia_0")
- MCFG_PIA6821_WRITEPB_HANDLER(DEVWRITE8("ticket", ticket_dispenser_device, write))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(williams_state, lottofun_coin_lock_w))
+ MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8("ticket", ticket_dispenser_device, write))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(williams_state, lottofun_coin_lock_w))
MCFG_TICKET_DISPENSER_ADD("ticket", attotime::from_msec(70), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH)
MACHINE_CONFIG_END
@@ -1560,7 +1560,7 @@ static MACHINE_CONFIG_DERIVED( alienar, defender )
/* pia */
MCFG_DEVICE_MODIFY("pia_0")
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(williams_state, williams_port_select_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(williams_state, williams_port_select_w))
MACHINE_CONFIG_END
@@ -1574,11 +1574,11 @@ static MACHINE_CONFIG_DERIVED( sinistar, williams_extra_ram )
/* pia */
MCFG_DEVICE_MODIFY("pia_0")
- MCFG_PIA6821_READPA_HANDLER(READ8(williams_state, williams_49way_port_0_r))
+ MCFG_PIA_READPA_HANDLER(READ8(williams_state, williams_49way_port_0_r))
MCFG_DEVICE_MODIFY("pia_2")
- MCFG_PIA6821_CA2_HANDLER(DEVWRITELINE("cvsd", hc55516_device, digit_w))
- MCFG_PIA6821_CB2_HANDLER(DEVWRITELINE("cvsd", hc55516_device, clock_w))
+ MCFG_PIA_CA2_HANDLER(DEVWRITELINE("cvsd", hc55516_device, digit_w))
+ MCFG_PIA_CB2_HANDLER(DEVWRITELINE("cvsd", hc55516_device, clock_w))
MACHINE_CONFIG_END
@@ -1596,11 +1596,11 @@ static MACHINE_CONFIG_DERIVED( playball, williams )
/* pia */
MCFG_DEVICE_MODIFY("pia_1")
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(williams_state, playball_snd_cmd_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(williams_state, playball_snd_cmd_w))
MCFG_DEVICE_MODIFY("pia_2")
- MCFG_PIA6821_CA2_HANDLER(DEVWRITELINE("cvsd", hc55516_device, digit_w))
- MCFG_PIA6821_CB2_HANDLER(DEVWRITELINE("cvsd", hc55516_device, clock_w))
+ MCFG_PIA_CA2_HANDLER(DEVWRITELINE("cvsd", hc55516_device, digit_w))
+ MCFG_PIA_CB2_HANDLER(DEVWRITELINE("cvsd", hc55516_device, clock_w))
MACHINE_CONFIG_END
@@ -1620,8 +1620,8 @@ static MACHINE_CONFIG_DERIVED( blastkit, williams )
/* pia */
MCFG_DEVICE_MODIFY("pia_0")
- MCFG_PIA6821_READPA_HANDLER(READ8(williams_state, williams_input_port_49way_0_5_r))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(williams_state, williams_port_select_w))
+ MCFG_PIA_READPA_HANDLER(READ8(williams_state, williams_input_port_49way_0_5_r))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(williams_state, williams_port_select_w))
MACHINE_CONFIG_END
@@ -1633,15 +1633,15 @@ static MACHINE_CONFIG_DERIVED( blaster, blastkit )
/* pia */
MCFG_DEVICE_MODIFY("pia_0")
- MCFG_PIA6821_READPA_HANDLER(READ8(williams_state, williams_49way_port_0_r))
+ MCFG_PIA_READPA_HANDLER(READ8(williams_state, williams_49way_port_0_r))
MCFG_DEVICE_MODIFY("pia_1")
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(williams_state, blaster_snd_cmd_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(williams_state, blaster_snd_cmd_w))
MCFG_DEVICE_ADD("pia_2b", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(DEVWRITE8("wmsdac_b", dac_device, write_unsigned8))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(williams_state,williams_snd_irq_b))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(williams_state,williams_snd_irq_b))
+ MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("wmsdac_b", dac_device, write_unsigned8))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(williams_state,williams_snd_irq_b))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(williams_state,williams_snd_irq_b))
/* sound hardware */
MCFG_DEVICE_REMOVE("wmsdac")
@@ -1690,23 +1690,23 @@ static MACHINE_CONFIG_START( williams2, williams_state )
/* pia */
MCFG_DEVICE_ADD("pia_0", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("IN0"))
- MCFG_PIA6821_READPB_HANDLER(IOPORT("IN1"))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(williams_state, williams_port_select_w))
+ MCFG_PIA_READPA_HANDLER(IOPORT("IN0"))
+ MCFG_PIA_READPB_HANDLER(IOPORT("IN1"))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(williams_state, williams_port_select_w))
MCFG_DEVICE_ADD("pia_1", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("IN2"))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(williams_state,williams2_snd_cmd_w))
- MCFG_PIA6821_CB2_HANDLER(DEVWRITELINE("pia_2", pia6821_device, ca1_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(williams_state,williams_main_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(williams_state,williams_main_irq))
+ MCFG_PIA_READPA_HANDLER(IOPORT("IN2"))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(williams_state,williams2_snd_cmd_w))
+ MCFG_PIA_CB2_HANDLER(DEVWRITELINE("pia_2", pia6821_device, ca1_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(williams_state,williams_main_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(williams_state,williams_main_irq))
MCFG_DEVICE_ADD("pia_2", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(DEVWRITE8("pia_1", pia6821_device, portb_w))
- MCFG_PIA6821_WRITEPB_HANDLER(DEVWRITE8("wmsdac", dac_device, write_unsigned8))
- MCFG_PIA6821_CA2_HANDLER(DEVWRITELINE("pia_1", pia6821_device, cb1_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(williams_state,williams_snd_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(williams_state,williams_snd_irq))
+ MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("pia_1", pia6821_device, portb_w))
+ MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8("wmsdac", dac_device, write_unsigned8))
+ MCFG_PIA_CA2_HANDLER(DEVWRITELINE("pia_1", pia6821_device, cb1_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(williams_state,williams_snd_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(williams_state,williams_snd_irq))
MACHINE_CONFIG_END
@@ -1725,13 +1725,13 @@ static MACHINE_CONFIG_DERIVED( mysticm, williams2_extra_ram )
/* pia */
MCFG_DEVICE_MODIFY("pia_0")
- MCFG_PIA6821_CA2_HANDLER(NULL)
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(williams_state,williams_main_firq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(williams_state,mysticm_main_irq))
+ MCFG_PIA_CA2_HANDLER(NULL)
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(williams_state,williams_main_firq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(williams_state,mysticm_main_irq))
MCFG_DEVICE_MODIFY("pia_1")
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(williams_state,mysticm_main_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(williams_state,mysticm_main_irq))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(williams_state,mysticm_main_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(williams_state,mysticm_main_irq))
MACHINE_CONFIG_END
@@ -1741,17 +1741,17 @@ static MACHINE_CONFIG_DERIVED( tshoot, williams2 )
/* pia */
MCFG_DEVICE_MODIFY("pia_0")
- MCFG_PIA6821_READPA_HANDLER(READ8(williams_state,tshoot_input_port_0_3_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(williams_state,tshoot_lamp_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(williams_state,tshoot_main_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(williams_state,tshoot_main_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(williams_state,tshoot_input_port_0_3_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(williams_state,tshoot_lamp_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(williams_state,tshoot_main_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(williams_state,tshoot_main_irq))
MCFG_DEVICE_MODIFY("pia_1")
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(williams_state,tshoot_main_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(williams_state,tshoot_main_irq))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(williams_state,tshoot_main_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(williams_state,tshoot_main_irq))
MCFG_DEVICE_MODIFY("pia_2")
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(williams_state,tshoot_maxvol_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(williams_state,tshoot_maxvol_w))
MACHINE_CONFIG_END
@@ -1766,12 +1766,12 @@ static MACHINE_CONFIG_DERIVED_CLASS( joust2, williams2, joust2_state )
/* pia */
MCFG_DEVICE_MODIFY("pia_1")
- MCFG_PIA6821_READPA_HANDLER(IOPORT("IN2"))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(joust2_state,joust2_snd_cmd_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(joust2_state,joust2_pia_3_cb1_w))
- MCFG_PIA6821_CB2_HANDLER(DEVWRITELINE("pia_2", pia6821_device, ca1_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(williams_state,williams_main_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(williams_state,williams_main_irq))
+ MCFG_PIA_READPA_HANDLER(IOPORT("IN2"))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(joust2_state,joust2_snd_cmd_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(joust2_state,joust2_pia_3_cb1_w))
+ MCFG_PIA_CB2_HANDLER(DEVWRITELINE("pia_2", pia6821_device, ca1_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(williams_state,williams_main_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(williams_state,williams_main_irq))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/wmg.c b/src/mame/drivers/wmg.c
index 18315da308f..ffecd3938b9 100644
--- a/src/mame/drivers/wmg.c
+++ b/src/mame/drivers/wmg.c
@@ -487,20 +487,20 @@ static MACHINE_CONFIG_START( wmg, wmg_state )
/* pia */
MCFG_DEVICE_ADD("pia_0", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("IN0"))
- MCFG_PIA6821_READPB_HANDLER(IOPORT("IN1"))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(wmg_state, wmg_port_select_w))
+ MCFG_PIA_READPA_HANDLER(IOPORT("IN0"))
+ MCFG_PIA_READPB_HANDLER(IOPORT("IN1"))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(wmg_state, wmg_port_select_w))
MCFG_DEVICE_ADD("pia_1", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("IN2"))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(williams_state, williams_snd_cmd_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(williams_state, williams_main_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(williams_state, williams_main_irq))
+ MCFG_PIA_READPA_HANDLER(IOPORT("IN2"))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(williams_state, williams_snd_cmd_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(williams_state, williams_main_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(williams_state, williams_main_irq))
MCFG_DEVICE_ADD("pia_2", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(DEVWRITE8("wmsdac", dac_device, write_unsigned8))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(williams_state,williams_snd_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(williams_state,williams_snd_irq))
+ MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("wmsdac", dac_device, write_unsigned8))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(williams_state,williams_snd_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(williams_state,williams_snd_irq))
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/zaccaria.c b/src/mame/drivers/zaccaria.c
index 05fee89cfb6..c17ddbad287 100644
--- a/src/mame/drivers/zaccaria.c
+++ b/src/mame/drivers/zaccaria.c
@@ -555,16 +555,16 @@ static MACHINE_CONFIG_START( zaccaria, zaccaria_state )
MCFG_I8255A_ADD( "ppi8255", ppi8255_intf )
MCFG_DEVICE_ADD( "pia0", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(zaccaria_state, zaccaria_port0a_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(zaccaria_state, zaccaria_port0a_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(zaccaria_state, zaccaria_port0b_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(zaccaria_state, zaccaria_irq0a))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(zaccaria_state, zaccaria_irq0b))
+ MCFG_PIA_READPA_HANDLER(READ8(zaccaria_state, zaccaria_port0a_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(zaccaria_state, zaccaria_port0a_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(zaccaria_state, zaccaria_port0b_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(zaccaria_state, zaccaria_irq0a))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(zaccaria_state, zaccaria_irq0b))
MCFG_DEVICE_ADD( "pia1", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(DEVREAD8("tms", tms5220_device, status_r))
- MCFG_PIA6821_WRITEPA_HANDLER(DEVWRITE8("tms", tms5220_device, data_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(zaccaria_state,zaccaria_port1b_w))
+ MCFG_PIA_READPA_HANDLER(DEVREAD8("tms", tms5220_device, status_r))
+ MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("tms", tms5220_device, data_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(zaccaria_state,zaccaria_port1b_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/machine/decopincpu.c b/src/mame/machine/decopincpu.c
index 3e59b90227e..fa951483f55 100644
--- a/src/mame/machine/decopincpu.c
+++ b/src/mame/machine/decopincpu.c
@@ -201,43 +201,43 @@ static MACHINE_CONFIG_FRAGMENT( decocpu1 )
/* Devices */
MCFG_DEVICE_ADD("pia21", PIA6821, 0) // 5F - PIA at 0x2100
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(decocpu_type1_device, solenoid1_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(decocpu_type1_device, pia21_ca2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(decocpu_type1_device, solenoid1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(decocpu_type1_device, pia21_ca2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
MCFG_DEVICE_ADD("pia24", PIA6821, 0) // 11D - PIA at 0x2400
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(decocpu_type1_device, lamp0_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(decocpu_type1_device, lamp1_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(decocpu_type1_device, lamp0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(decocpu_type1_device, lamp1_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
MCFG_DEVICE_ADD("pia28", PIA6821, 0) // 11B - PIA at 0x2800
- MCFG_PIA6821_READPA_HANDLER(READ8(decocpu_type1_device, display_strobe_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(decocpu_type1_device, display_strobe_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(decocpu_type1_device, display_out1_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(decocpu_type1_device, display_strobe_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(decocpu_type1_device, display_strobe_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(decocpu_type1_device, display_out1_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
MCFG_DEVICE_ADD("pia2c", PIA6821, 0) // 9B - PIA at 0x2c00
- MCFG_PIA6821_READPB_HANDLER(READ8(decocpu_type1_device, display_in3_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(decocpu_type1_device, display_out2_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(decocpu_type1_device, display_out3_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
+ MCFG_PIA_READPB_HANDLER(READ8(decocpu_type1_device, display_in3_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(decocpu_type1_device, display_out2_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(decocpu_type1_device, display_out3_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
MCFG_DEVICE_ADD("pia30", PIA6821, 0) // 8H - PIA at 0x3000
- MCFG_PIA6821_READPA_HANDLER(READ8(decocpu_type1_device, switch_r))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(decocpu_type1_device, switch_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(decocpu_type1_device, switch_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(decocpu_type1_device, switch_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
MCFG_DEVICE_ADD("pia34", PIA6821, 0) // 7B - PIA at 0x3400
- MCFG_PIA6821_READPA_HANDLER(READ8(decocpu_type1_device, dmdstatus_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(decocpu_type1_device, display_out4_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(decocpu_type1_device, sound_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(decocpu_type1_device, dmdstatus_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(decocpu_type1_device, display_out4_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(decocpu_type1_device, sound_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
MCFG_NVRAM_ADD_1FILL("nvram")
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/aim65.c b/src/mess/drivers/aim65.c
index da7c5713cb5..518563672d4 100644
--- a/src/mess/drivers/aim65.c
+++ b/src/mess/drivers/aim65.c
@@ -321,8 +321,8 @@ static MACHINE_CONFIG_START( aim65, aim65_state )
MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("maincpu", m6502_device, irq_line))
MCFG_DEVICE_ADD("pia6821", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(aim65_state, aim65_pia_a_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(aim65_state, aim65_pia_b_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(aim65_state, aim65_pia_a_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(aim65_state, aim65_pia_b_w))
MCFG_CASSETTE_ADD( "cassette", aim65_1_cassette_interface )
MCFG_CASSETTE_ADD( "cassette2", aim65_2_cassette_interface )
diff --git a/src/mess/drivers/apf.c b/src/mess/drivers/apf.c
index 263ab4f8b30..38df33c3eef 100644
--- a/src/mess/drivers/apf.c
+++ b/src/mess/drivers/apf.c
@@ -628,24 +628,24 @@ static MACHINE_CONFIG_START( apf_imagination, apf_state )
/* Devices */
MCFG_DEVICE_ADD("pia_0", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(apf_state, apf_m1000_pia_in_a_func))
- MCFG_PIA6821_READPB_HANDLER(READ8(apf_state, apf_m1000_pia_in_b_func))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(apf_state, apf_m1000_pia_out_a_func))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(apf_state, apf_m1000_pia_out_b_func))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(apf_state, apf_m1000_pia_out_ca2_func))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(apf_state, apf_m1000_pia_out_cb2_func))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(apf_state, apf_m1000_irq_a_func))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(apf_state, apf_m1000_irq_b_func))
+ MCFG_PIA_READPA_HANDLER(READ8(apf_state, apf_m1000_pia_in_a_func))
+ MCFG_PIA_READPB_HANDLER(READ8(apf_state, apf_m1000_pia_in_b_func))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(apf_state, apf_m1000_pia_out_a_func))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(apf_state, apf_m1000_pia_out_b_func))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(apf_state, apf_m1000_pia_out_ca2_func))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(apf_state, apf_m1000_pia_out_cb2_func))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(apf_state, apf_m1000_irq_a_func))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(apf_state, apf_m1000_irq_b_func))
MCFG_DEVICE_ADD("pia_1", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(apf_state, apf_imagination_pia_in_a_func))
- MCFG_PIA6821_READPB_HANDLER(READ8(apf_state, apf_imagination_pia_in_b_func))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(apf_state, apf_imagination_pia_out_a_func))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(apf_state, apf_imagination_pia_out_b_func))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(apf_state, apf_imagination_pia_out_ca2_func))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(apf_state, apf_imagination_pia_out_cb2_func))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(apf_state, apf_imagination_irq_a_func))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(apf_state, apf_imagination_irq_b_func))
+ MCFG_PIA_READPA_HANDLER(READ8(apf_state, apf_imagination_pia_in_a_func))
+ MCFG_PIA_READPB_HANDLER(READ8(apf_state, apf_imagination_pia_in_b_func))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(apf_state, apf_imagination_pia_out_a_func))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(apf_state, apf_imagination_pia_out_b_func))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(apf_state, apf_imagination_pia_out_ca2_func))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(apf_state, apf_imagination_pia_out_cb2_func))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(apf_state, apf_imagination_irq_a_func))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(apf_state, apf_imagination_irq_b_func))
MCFG_CASSETTE_ADD( "cassette", apf_cassette_interface )
MCFG_FD1793_ADD("wd179x", default_wd17xx_interface ) // TODO confirm type
diff --git a/src/mess/drivers/apple1.c b/src/mess/drivers/apple1.c
index 0b5203eb71e..1670135f22c 100644
--- a/src/mess/drivers/apple1.c
+++ b/src/mess/drivers/apple1.c
@@ -306,9 +306,9 @@ static MACHINE_CONFIG_START( apple1, apple1_state )
MCFG_DEVICE_ADD( "pia", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(apple1_state,apple1_pia0_kbdin))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(apple1_state,apple1_pia0_dspout))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(apple1_state,apple1_pia0_dsp_write_signal))
+ MCFG_PIA_READPA_HANDLER(READ8(apple1_state,apple1_pia0_kbdin))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(apple1_state,apple1_pia0_dspout))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(apple1_state,apple1_pia0_dsp_write_signal))
/* snapshot */
MCFG_SNAPSHOT_ADD("snapshot", apple1_state, apple1, "snp", 0)
diff --git a/src/mess/drivers/atari400.c b/src/mess/drivers/atari400.c
index e61786c2ebe..1a12a39680d 100644
--- a/src/mess/drivers/atari400.c
+++ b/src/mess/drivers/atari400.c
@@ -2487,9 +2487,9 @@ static MACHINE_CONFIG_START( atari_common_nodac, a400_state )
MCFG_VIDEO_START(atari)
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(IOPORT("djoy_0_1"))
- MCFG_PIA6821_READPB_HANDLER(IOPORT("djoy_2_3"))
- MCFG_PIA6821_CB2_HANDLER(DEVWRITELINE("fdc", atari_fdc_device, pia_cb2_w))
+ MCFG_PIA_READPA_HANDLER(IOPORT("djoy_0_1"))
+ MCFG_PIA_READPB_HANDLER(IOPORT("djoy_2_3"))
+ MCFG_PIA_CB2_HANDLER(DEVWRITELINE("fdc", atari_fdc_device, pia_cb2_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -2597,7 +2597,7 @@ static MACHINE_CONFIG_DERIVED( a600xl, atari_common )
MCFG_TIMER_ADD_SCANLINE("scantimer", a800xl_interrupt, "screen", 0, 1)
MCFG_DEVICE_MODIFY("pia")
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(a400_state, a600xl_pia_pb_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(a400_state, a600xl_pia_pb_w))
MCFG_MACHINE_START_OVERRIDE( a400_state, a800xl ) // FIXME?
@@ -2623,7 +2623,7 @@ static MACHINE_CONFIG_DERIVED( a800xl, atari_common )
MCFG_TIMER_ADD_SCANLINE("scantimer", a800xl_interrupt, "screen", 0, 1)
MCFG_DEVICE_MODIFY("pia")
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(a400_state, a800xl_pia_pb_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(a400_state, a800xl_pia_pb_w))
MCFG_MACHINE_START_OVERRIDE( a400_state, a800xl )
@@ -2653,7 +2653,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( a1200xl, a800xl )
MCFG_DEVICE_MODIFY("pia")
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(a400_state, a1200xl_pia_pb_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(a400_state, a1200xl_pia_pb_w))
MACHINE_CONFIG_END
@@ -2665,7 +2665,7 @@ static MACHINE_CONFIG_DERIVED( xegs, a800xl )
MCFG_MACHINE_START_OVERRIDE( a400_state, xegs )
MCFG_DEVICE_MODIFY("pia")
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(a400_state, xegs_pia_pb_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(a400_state, xegs_pia_pb_w))
MCFG_DEVICE_REMOVE("cart1")
MCFG_DEVICE_REMOVE("cart_list")
@@ -2697,7 +2697,7 @@ static MACHINE_CONFIG_DERIVED( a5200, atari_common_nodac )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_DEVICE_MODIFY("pia")
- MCFG_PIA6821_CB2_HANDLER(NULL) // FIXME: is there anything connected here
+ MCFG_PIA_CB2_HANDLER(NULL) // FIXME: is there anything connected here
MCFG_MACHINE_START_OVERRIDE( a400_state, a5200 )
diff --git a/src/mess/drivers/bml3.c b/src/mess/drivers/bml3.c
index 0d36dd133c2..9a829d120f6 100644
--- a/src/mess/drivers/bml3.c
+++ b/src/mess/drivers/bml3.c
@@ -1011,7 +1011,7 @@ static MACHINE_CONFIG_START( bml3_common, bml3_state )
MCFG_TIMER_DRIVER_ADD_PERIODIC("bml3_p", bml3_state, bml3_p, attotime::from_hz(40000))
MCFG_DEVICE_ADD("pia6821", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(bml3_state, bml3_piaA_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(bml3_state, bml3_piaA_w))
MCFG_ACIA6850_ADD("acia6850", bml3_acia_if)
MCFG_CASSETTE_ADD( "cassette", default_cassette_interface )
diff --git a/src/mess/drivers/bw12.c b/src/mess/drivers/bw12.c
index 7d22e1374fe..f97c94297bb 100644
--- a/src/mess/drivers/bw12.c
+++ b/src/mess/drivers/bw12.c
@@ -632,13 +632,13 @@ static MACHINE_CONFIG_START( common, bw12_state )
MCFG_UPD765A_ADD(UPD765_TAG, false, true)
MCFG_DEVICE_ADD(PIA6821_TAG, PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(bw12_state, pia_pa_r))
- MCFG_PIA6821_READCA1_HANDLER(DEVREADLINE(CENTRONICS_TAG, centronics_device, ack_r))
- MCFG_PIA6821_WRITEPB_HANDLER(DEVWRITE8(CENTRONICS_TAG, centronics_device, write))
- MCFG_PIA6821_CA2_HANDLER(DEVWRITELINE(CENTRONICS_TAG, centronics_device, strobe_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(bw12_state, pia_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE(Z80_TAG, z80_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE(Z80_TAG, z80_device, irq_line))
+ MCFG_PIA_READPA_HANDLER(READ8(bw12_state, pia_pa_r))
+ MCFG_PIA_READCA1_HANDLER(DEVREADLINE(CENTRONICS_TAG, centronics_device, ack_r))
+ MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8(CENTRONICS_TAG, centronics_device, write))
+ MCFG_PIA_CA2_HANDLER(DEVWRITELINE(CENTRONICS_TAG, centronics_device, strobe_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(bw12_state, pia_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(DEVWRITELINE(Z80_TAG, z80_device, irq_line))
+ MCFG_PIA_IRQB_HANDLER(DEVWRITELINE(Z80_TAG, z80_device, irq_line))
MCFG_Z80SIO0_ADD(Z80SIO_TAG, XTAL_16MHz/4, sio_intf)
MCFG_PIT8253_ADD(PIT8253_TAG, pit_intf)
diff --git a/src/mess/drivers/coco12.c b/src/mess/drivers/coco12.c
index 9a06ad3f9b7..5cc074fa27d 100644
--- a/src/mess/drivers/coco12.c
+++ b/src/mess/drivers/coco12.c
@@ -273,22 +273,22 @@ static MACHINE_CONFIG_START( coco, coco12_state )
// devices
MCFG_DEVICE_ADD(PIA0_TAG, PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(coco_state, pia0_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(coco_state, pia0_pb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(coco_state, pia0_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(coco_state, pia0_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(coco_state, pia0_irq_a))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(coco_state, pia0_irq_b))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(coco_state, pia0_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(coco_state, pia0_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(coco_state, pia0_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(coco_state, pia0_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(coco_state, pia0_irq_a))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(coco_state, pia0_irq_b))
MCFG_DEVICE_ADD(PIA1_TAG, PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(coco_state, pia1_pa_r))
- MCFG_PIA6821_READPB_HANDLER(READ8(coco_state, pia1_pb_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(coco_state, pia1_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(coco_state, pia1_pb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(coco_state, pia1_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(coco_state, pia1_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(coco_state, pia1_firq_a))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(coco_state, pia1_firq_b))
+ MCFG_PIA_READPA_HANDLER(READ8(coco_state, pia1_pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(coco_state, pia1_pb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(coco_state, pia1_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(coco_state, pia1_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(coco_state, pia1_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(coco_state, pia1_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(coco_state, pia1_firq_a))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(coco_state, pia1_firq_b))
MCFG_SAM6883_ADD(SAM_TAG, XTAL_3_579545MHz, coco12_state::sam6883_config)
MCFG_CASSETTE_ADD("cassette", coco_state::coco_cassette_interface)
diff --git a/src/mess/drivers/coco3.c b/src/mess/drivers/coco3.c
index 0dfa1d9e1d7..bdf93621832 100644
--- a/src/mess/drivers/coco3.c
+++ b/src/mess/drivers/coco3.c
@@ -250,22 +250,22 @@ static MACHINE_CONFIG_START( coco3, coco3_state )
// devices
MCFG_DEVICE_ADD(PIA0_TAG, PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(coco_state, pia0_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(coco_state, pia0_pb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(coco_state, pia0_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(coco_state, pia0_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(coco_state, pia0_irq_a))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(coco_state, pia0_irq_b))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(coco_state, pia0_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(coco_state, pia0_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(coco_state, pia0_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(coco_state, pia0_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(coco_state, pia0_irq_a))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(coco_state, pia0_irq_b))
MCFG_DEVICE_ADD(PIA1_TAG, PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(coco_state, pia1_pa_r))
- MCFG_PIA6821_READPB_HANDLER(READ8(coco_state, pia1_pb_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(coco_state, pia1_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(coco_state, pia1_pb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(coco_state, pia1_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(coco_state, pia1_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(coco_state, pia1_firq_a))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(coco_state, pia1_firq_b))
+ MCFG_PIA_READPA_HANDLER(READ8(coco_state, pia1_pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(coco_state, pia1_pb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(coco_state, pia1_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(coco_state, pia1_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(coco_state, pia1_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(coco_state, pia1_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(coco_state, pia1_firq_a))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(coco_state, pia1_firq_b))
MCFG_CASSETTE_ADD("cassette", coco_state::coco_cassette_interface)
MCFG_BITBANGER_ADD(BITBANGER_TAG, coco_state::coco_bitbanger_config)
diff --git a/src/mess/drivers/crvision.c b/src/mess/drivers/crvision.c
index cb1785d6afe..fc51dec09a3 100644
--- a/src/mess/drivers/crvision.c
+++ b/src/mess/drivers/crvision.c
@@ -914,11 +914,11 @@ static MACHINE_CONFIG_START( creativision, crvision_state )
// devices
MCFG_DEVICE_ADD(PIA6821_TAG, PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(crvision_state, pia_pa_r))
- MCFG_PIA6821_READPB_HANDLER(READ8(crvision_state, pia_pb_r))
- MCFG_PIA6821_READCB1_HANDLER(DEVREADLINE(SN76489_TAG, sn76496_base_device, ready_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(crvision_state, pia_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(DEVWRITE8(SN76489_TAG, sn76496_base_device, write))
+ MCFG_PIA_READPA_HANDLER(READ8(crvision_state, pia_pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(crvision_state, pia_pb_r))
+ MCFG_PIA_READCB1_HANDLER(DEVREADLINE(SN76489_TAG, sn76496_base_device, ready_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(crvision_state, pia_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8(SN76489_TAG, sn76496_base_device, write))
MCFG_CASSETTE_ADD("cassette", crvision_cassette_interface)
MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics)
@@ -981,14 +981,14 @@ static MACHINE_CONFIG_START( lasr2001, laser2001_state )
// devices
MCFG_DEVICE_ADD(PIA6821_TAG, PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(laser2001_state, pia_pa_r))
- MCFG_PIA6821_READPB_HANDLER(READ8(laser2001_state, pia_pb_r))
- MCFG_PIA6821_READCA1_HANDLER(READLINE(laser2001_state, pia_ca1_r))
- MCFG_PIA6821_READCB1_HANDLER(READLINE(laser2001_state, pia_cb1_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(laser2001_state, pia_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(laser2001_state, pia_pb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(laser2001_state, pia_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(laser2001_state, pia_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(laser2001_state, pia_pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(laser2001_state, pia_pb_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(laser2001_state, pia_ca1_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(laser2001_state, pia_cb1_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(laser2001_state, pia_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(laser2001_state, pia_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(laser2001_state, pia_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(laser2001_state, pia_cb2_w))
MCFG_CASSETTE_ADD("cassette", lasr2001_cassette_interface)
MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, lasr2001_centronics_intf)
diff --git a/src/mess/drivers/csc.c b/src/mess/drivers/csc.c
index 0ae7793d74f..d00a4a4930a 100644
--- a/src/mess/drivers/csc.c
+++ b/src/mess/drivers/csc.c
@@ -306,19 +306,19 @@ static MACHINE_CONFIG_START( csc, csc_state )
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_timer", csc_state, irq_timer, attotime::from_hz(38400/64))
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA6821_READPB_HANDLER(READ8(csc_state, pia0_pb_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(csc_state, pia0_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(csc_state, pia0_pb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(csc_state, pia0_ca2_w))
+ MCFG_PIA_READPB_HANDLER(READ8(csc_state, pia0_pb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(csc_state, pia0_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(csc_state, pia0_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(csc_state, pia0_ca2_w))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(csc_state, pia1_pa_r))
- MCFG_PIA6821_READCA1_HANDLER(READLINE(csc_state, pia1_ca1_r))
- MCFG_PIA6821_READCB1_HANDLER(READLINE(csc_state, pia1_cb1_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(csc_state, pia1_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(csc_state, pia1_pb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(csc_state, pia1_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(csc_state, pia1_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(csc_state, pia1_pa_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(csc_state, pia1_ca1_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(csc_state, pia1_cb1_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(csc_state, pia1_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(csc_state, pia1_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(csc_state, pia1_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(csc_state, pia1_cb2_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mess/drivers/d6800.c b/src/mess/drivers/d6800.c
index 9c7fa1f8a8d..cfc69bf562b 100644
--- a/src/mess/drivers/d6800.c
+++ b/src/mess/drivers/d6800.c
@@ -413,13 +413,13 @@ static MACHINE_CONFIG_START( d6800, d6800_state )
/* devices */
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(d6800_state, d6800_keyboard_r))
- MCFG_PIA6821_READPB_HANDLER(READ8(d6800_state, d6800_cassette_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(d6800_state, d6800_keyboard_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(d6800_state, d6800_cassette_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(d6800_state, d6800_screen_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_READPA_HANDLER(READ8(d6800_state, d6800_keyboard_r))
+ MCFG_PIA_READPB_HANDLER(READ8(d6800_state, d6800_cassette_r))
+ 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_CASSETTE_ADD("cassette", d6800_cassette_interface)
MCFG_TIMER_DRIVER_ADD_PERIODIC("d6800_c", d6800_state, d6800_c, attotime::from_hz(4800))
diff --git a/src/mess/drivers/dgn_beta.c b/src/mess/drivers/dgn_beta.c
index 90c7d5c0d92..6c04a261db3 100644
--- a/src/mess/drivers/dgn_beta.c
+++ b/src/mess/drivers/dgn_beta.c
@@ -342,33 +342,33 @@ static MACHINE_CONFIG_START( dgnbeta, dgn_beta_state )
/* PIA 0 at $FC20-$FC23 I46 */
MCFG_DEVICE_ADD(PIA_0_TAG, PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(dgn_beta_state,d_pia0_pa_r))
- MCFG_PIA6821_READPB_HANDLER(READ8(dgn_beta_state,d_pia0_pb_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(dgn_beta_state,d_pia0_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(dgn_beta_state,d_pia0_pb_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(dgn_beta_state,d_pia0_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(dgn_beta_state,d_pia0_irq_a))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(dgn_beta_state,d_pia0_irq_b))
+ MCFG_PIA_READPA_HANDLER(READ8(dgn_beta_state,d_pia0_pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(dgn_beta_state,d_pia0_pb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(dgn_beta_state,d_pia0_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(dgn_beta_state,d_pia0_pb_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(dgn_beta_state,d_pia0_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(dgn_beta_state,d_pia0_irq_a))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(dgn_beta_state,d_pia0_irq_b))
/* PIA 1 at $FC24-$FC27 I63 */
MCFG_DEVICE_ADD(PIA_1_TAG, PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(dgn_beta_state,d_pia1_pa_r))
- MCFG_PIA6821_READPB_HANDLER(READ8(dgn_beta_state,d_pia1_pb_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(dgn_beta_state,d_pia1_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(dgn_beta_state,d_pia1_pb_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(dgn_beta_state,d_pia1_irq_a))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(dgn_beta_state,d_pia1_irq_b))
+ MCFG_PIA_READPA_HANDLER(READ8(dgn_beta_state,d_pia1_pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(dgn_beta_state,d_pia1_pb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(dgn_beta_state,d_pia1_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(dgn_beta_state,d_pia1_pb_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(dgn_beta_state,d_pia1_irq_a))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(dgn_beta_state,d_pia1_irq_b))
/* PIA 2 at FCC0-FCC3 I28 */
/* This seems to control the RAM paging system, and have the DRQ */
/* from the WD2797 */
MCFG_DEVICE_ADD(PIA_2_TAG, PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(dgn_beta_state,d_pia2_pa_r))
- MCFG_PIA6821_READPB_HANDLER(READ8(dgn_beta_state,d_pia2_pb_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(dgn_beta_state,d_pia2_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(dgn_beta_state,d_pia2_pb_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(dgn_beta_state,d_pia2_irq_a))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(dgn_beta_state,d_pia2_irq_b))
+ MCFG_PIA_READPA_HANDLER(READ8(dgn_beta_state,d_pia2_pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(dgn_beta_state,d_pia2_pb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(dgn_beta_state,d_pia2_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(dgn_beta_state,d_pia2_pb_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(dgn_beta_state,d_pia2_irq_a))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(dgn_beta_state,d_pia2_irq_b))
MCFG_WD2797_ADD(FDC_TAG, dgnbeta_wd17xx_interface )
diff --git a/src/mess/drivers/dragon.c b/src/mess/drivers/dragon.c
index 8825d6eed59..9ee9e07df47 100644
--- a/src/mess/drivers/dragon.c
+++ b/src/mess/drivers/dragon.c
@@ -142,22 +142,22 @@ static MACHINE_CONFIG_START( dragon_base, dragon_state )
// devices
MCFG_DEVICE_ADD(PIA0_TAG, PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(coco_state, pia0_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(coco_state, pia0_pb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(coco_state, pia0_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(coco_state, pia0_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(coco_state, pia0_irq_a))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(coco_state, pia0_irq_b))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(coco_state, pia0_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(coco_state, pia0_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(coco_state, pia0_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(coco_state, pia0_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(coco_state, pia0_irq_a))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(coco_state, pia0_irq_b))
MCFG_DEVICE_ADD(PIA1_TAG, PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(coco_state, pia1_pa_r))
- MCFG_PIA6821_READPB_HANDLER(READ8(coco_state, pia1_pb_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(coco_state, pia1_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(coco_state, pia1_pb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(coco_state, pia1_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(coco_state, pia1_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(coco_state, pia1_firq_a))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(coco_state, pia1_firq_b))
+ MCFG_PIA_READPA_HANDLER(READ8(coco_state, pia1_pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(coco_state, pia1_pb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(coco_state, pia1_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(coco_state, pia1_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(coco_state, pia1_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(coco_state, pia1_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(coco_state, pia1_firq_a))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(coco_state, pia1_firq_b))
MCFG_SAM6883_ADD(SAM_TAG, XTAL_4_433619MHz, dragon_state::sam6883_config)
MCFG_CASSETTE_ADD("cassette", dragon_state::coco_cassette_interface)
@@ -227,9 +227,9 @@ static MACHINE_CONFIG_DERIVED_CLASS( dgnalpha, dragon_base, dragon_alpha_state )
// pia 2
MCFG_DEVICE_ADD( PIA2_TAG, PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(dragon_alpha_state, pia2_pa_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(dragon_alpha_state, pia2_firq_a))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(dragon_alpha_state, pia2_firq_b))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(dragon_alpha_state, pia2_pa_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(dragon_alpha_state, pia2_firq_a))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(dragon_alpha_state, pia2_firq_b))
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( tanodr64, dragon_base )
diff --git a/src/mess/drivers/eacc.c b/src/mess/drivers/eacc.c
index ba4361fe02b..3dd7320ac59 100644
--- a/src/mess/drivers/eacc.c
+++ b/src/mess/drivers/eacc.c
@@ -245,15 +245,15 @@ static MACHINE_CONFIG_START( eacc, eacc_state )
MCFG_DEFAULT_LAYOUT(layout_eacc)
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA6821_READPB_HANDLER(READ8(eacc_state, eacc_keyboard_r))
- MCFG_PIA6821_READCA1_HANDLER(READLINE(eacc_state, eacc_distance_r))
- MCFG_PIA6821_READCB1_HANDLER(READLINE(eacc_state, eacc_cb1_r))
- MCFG_PIA6821_READCA2_HANDLER(READLINE(eacc_state, eacc_fuel_sensor_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(eacc_state, eacc_segment_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(eacc_state, eacc_digit_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(eacc_state, eacc_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6802_cpu_device, irq_line))
+ MCFG_PIA_READPB_HANDLER(READ8(eacc_state, eacc_keyboard_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(eacc_state, eacc_distance_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(eacc_state, eacc_cb1_r))
+ MCFG_PIA_READCA2_HANDLER(READLINE(eacc_state, eacc_fuel_sensor_r))
+ 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_NVRAM_ADD_0FILL("nvram")
MCFG_TIMER_DRIVER_ADD_PERIODIC("eacc_nmi", eacc_state, eacc_nmi, attotime::from_hz(600))
diff --git a/src/mess/drivers/eti660.c b/src/mess/drivers/eti660.c
index 7b7d69925e6..c41f92dbdac 100644
--- a/src/mess/drivers/eti660.c
+++ b/src/mess/drivers/eti660.c
@@ -242,8 +242,8 @@ static MACHINE_CONFIG_START( eti660, eti660_state )
/* devices */
MCFG_DEVICE_ADD(MC6821_TAG, PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(eti660_state, pia_pa_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(eti660_state, pia_pa_w))
+ MCFG_PIA_READPA_HANDLER(READ8(eti660_state, pia_pa_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(eti660_state, pia_pa_w))
MCFG_CASSETTE_ADD("cassette", eti660_cassette_interface)
diff --git a/src/mess/drivers/mekd2.c b/src/mess/drivers/mekd2.c
index a63f5952530..366c0932610 100644
--- a/src/mess/drivers/mekd2.c
+++ b/src/mess/drivers/mekd2.c
@@ -385,17 +385,17 @@ static MACHINE_CONFIG_START( mekd2, mekd2_state )
/* Devices */
MCFG_DEVICE_ADD("pia_s", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(mekd2_state, mekd2_key_r))
- MCFG_PIA6821_READCB1_HANDLER(READLINE(mekd2_state, mekd2_key40_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(mekd2_state, mekd2_segment_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(mekd2_state, mekd2_digit_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(mekd2_state, mekd2_nmi_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, nmi_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, nmi_line))
+ MCFG_PIA_READPA_HANDLER(READ8(mekd2_state, mekd2_key_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(mekd2_state, mekd2_key40_r))
+ 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_DEVICE_ADD("pia_u", PIA6821, 0)
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
+ MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6800_cpu_device, irq_line))
MCFG_ACIA6850_ADD("acia", mekd2_acia_intf)
MCFG_TIMER_DRIVER_ADD_PERIODIC("mekd2_c", mekd2_state, mekd2_c, attotime::from_hz(4800))
diff --git a/src/mess/drivers/mkit09.c b/src/mess/drivers/mkit09.c
index eea50c61d85..88cd45e391e 100644
--- a/src/mess/drivers/mkit09.c
+++ b/src/mess/drivers/mkit09.c
@@ -190,12 +190,12 @@ static MACHINE_CONFIG_START( mkit09, mkit09_state )
/* Devices */
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(mkit09_state, pa_r))
- MCFG_PIA6821_READPB_HANDLER(READ8(mkit09_state, pb_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(mkit09_state, pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(mkit09_state, pb_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
+ MCFG_PIA_READPA_HANDLER(READ8(mkit09_state, pa_r))
+ 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_CASSETTE_ADD( "cassette", default_cassette_interface )
MACHINE_CONFIG_END
diff --git a/src/mess/drivers/osbexec.c b/src/mess/drivers/osbexec.c
index d2023163e5a..0340803a153 100644
--- a/src/mess/drivers/osbexec.c
+++ b/src/mess/drivers/osbexec.c
@@ -618,18 +618,18 @@ static MACHINE_CONFIG_START( osbexec, osbexec_state )
// MCFG_PIT8253_ADD( "pit", osbexec_pit_config )
MCFG_DEVICE_ADD("pia_0", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(osbexec_state, osbexec_pia0_a_r))
- MCFG_PIA6821_READPB_HANDLER(READ8(osbexec_state, osbexec_pia0_b_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(osbexec_state, osbexec_pia0_a_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(osbexec_state, osbexec_pia0_b_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(osbexec_state, osbexec_pia0_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(osbexec_state, osbexec_pia0_cb2_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(osbexec_state, osbexec_pia0_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(osbexec_state, osbexec_pia0_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(osbexec_state, osbexec_pia0_a_r))
+ MCFG_PIA_READPB_HANDLER(READ8(osbexec_state, osbexec_pia0_b_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(osbexec_state, osbexec_pia0_a_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(osbexec_state, osbexec_pia0_b_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(osbexec_state, osbexec_pia0_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(osbexec_state, osbexec_pia0_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(osbexec_state, osbexec_pia0_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(osbexec_state, osbexec_pia0_irq))
MCFG_DEVICE_ADD("pia_1", PIA6821, 0)
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(osbexec_state, osbexec_pia1_irq))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(osbexec_state, osbexec_pia1_irq))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(osbexec_state, osbexec_pia1_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(osbexec_state, osbexec_pia1_irq))
MCFG_Z80SIO2_ADD( "sio", MAIN_CLOCK/6, osbexec_sio_config )
diff --git a/src/mess/drivers/osborne1.c b/src/mess/drivers/osborne1.c
index 64b894ef66a..254a31cd9d5 100644
--- a/src/mess/drivers/osborne1.c
+++ b/src/mess/drivers/osborne1.c
@@ -250,19 +250,19 @@ static MACHINE_CONFIG_START( osborne1, osborne1_state )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MCFG_DEVICE_ADD("pia_0", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(DEVREAD8(IEEE488_TAG, ieee488_device, dio_r))
- MCFG_PIA6821_READPB_HANDLER(READ8(osborne1_state, ieee_pia_pb_r))
- MCFG_PIA6821_WRITEPA_HANDLER(DEVWRITE8(IEEE488_TAG, ieee488_device, dio_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(osborne1_state, ieee_pia_pb_w))
- MCFG_PIA6821_CA2_HANDLER(DEVWRITELINE(IEEE488_TAG, ieee488_device, ifc_w))
- MCFG_PIA6821_CB2_HANDLER(DEVWRITELINE(IEEE488_TAG, ieee488_device, ren_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(osborne1_state, ieee_pia_irq_a_func))
+ MCFG_PIA_READPA_HANDLER(DEVREAD8(IEEE488_TAG, ieee488_device, dio_r))
+ MCFG_PIA_READPB_HANDLER(READ8(osborne1_state, ieee_pia_pb_r))
+ MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8(IEEE488_TAG, ieee488_device, dio_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(osborne1_state, ieee_pia_pb_w))
+ MCFG_PIA_CA2_HANDLER(DEVWRITELINE(IEEE488_TAG, ieee488_device, ifc_w))
+ MCFG_PIA_CB2_HANDLER(DEVWRITELINE(IEEE488_TAG, ieee488_device, ren_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(osborne1_state, ieee_pia_irq_a_func))
MCFG_DEVICE_ADD( "pia_1", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(osborne1_state, video_pia_port_a_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(osborne1_state, video_pia_port_b_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(osborne1_state, video_pia_out_cb2_dummy))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(osborne1_state, video_pia_irq_a_func))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(osborne1_state, video_pia_port_a_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(osborne1_state, video_pia_port_b_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(osborne1_state, video_pia_out_cb2_dummy))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(osborne1_state, video_pia_irq_a_func))
MCFG_MB8877_ADD("mb8877", default_wd17xx_interface_2_drives )
diff --git a/src/mess/drivers/osi.c b/src/mess/drivers/osi.c
index 3f152f94e7f..771925f5117 100644
--- a/src/mess/drivers/osi.c
+++ b/src/mess/drivers/osi.c
@@ -838,10 +838,10 @@ static MACHINE_CONFIG_DERIVED_CLASS( c1pmf, c1p, c1pmf_state )
MCFG_CPU_PROGRAM_MAP(c1pmf_mem)
MCFG_DEVICE_ADD("pia_0", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(c1pmf_state, osi470_pia_pa_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(c1pmf_state, osi470_pia_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(c1pmf_state, osi470_pia_pb_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(c1pmf_state, osi470_pia_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(c1pmf_state, osi470_pia_pa_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(c1pmf_state, osi470_pia_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(c1pmf_state, osi470_pia_pb_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(c1pmf_state, osi470_pia_cb2_w))
/* floppy ACIA */
MCFG_ACIA6850_ADD("acia_1", osi470_acia_intf)
diff --git a/src/mess/drivers/pegasus.c b/src/mess/drivers/pegasus.c
index 2d00d0b1d92..cc3ef427c33 100644
--- a/src/mess/drivers/pegasus.c
+++ b/src/mess/drivers/pegasus.c
@@ -488,19 +488,19 @@ static MACHINE_CONFIG_START( pegasus, pegasus_state )
/* devices */
MCFG_DEVICE_ADD("pia_s", PIA6821, 0)
- MCFG_PIA6821_READPB_HANDLER(READ8(pegasus_state, pegasus_keyboard_r))
- MCFG_PIA6821_READCA1_HANDLER(READLINE(pegasus_state, pegasus_cassette_r))
- MCFG_PIA6821_READCB1_HANDLER(READLINE(pegasus_state, pegasus_keyboard_irq))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(pegasus_state, pegasus_keyboard_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(pegasus_state, pegasus_controls_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(pegasus_state, pegasus_cassette_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(pegasus_state, pegasus_firq_clr))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
+ MCFG_PIA_READPB_HANDLER(READ8(pegasus_state, pegasus_keyboard_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(pegasus_state, pegasus_cassette_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(pegasus_state, pegasus_keyboard_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(pegasus_state, pegasus_keyboard_w))
+ 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_DEVICE_ADD( "pia_u", PIA6821, 0)
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
+ MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
MCFG_CARTSLOT_ADD("cart1")
MCFG_CARTSLOT_EXTENSION_LIST("bin")
diff --git a/src/mess/drivers/pet.c b/src/mess/drivers/pet.c
index 9e47fa62f8b..e5a79b2a22f 100644
--- a/src/mess/drivers/pet.c
+++ b/src/mess/drivers/pet.c
@@ -1397,23 +1397,23 @@ static MACHINE_CONFIG_START( pet, pet_state )
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(pet_state, via_irq_w))
MCFG_DEVICE_ADD(M6520_1_TAG, PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(pet_state, pia1_pa_r))
- MCFG_PIA6821_READPB_HANDLER(READ8(pet_state, pia1_pb_r))
- MCFG_PIA6821_READCA1_HANDLER(DEVREADLINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, read))
- MCFG_PIA6821_READCB1_HANDLER(READLINE(pet_state, pia1_cb1_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(pet_state, pia1_pa_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(pet_state, pia1_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(DEVWRITELINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, motor_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(pet_state, pia1_irqa_w))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(pet_state, pia1_irqb_w))
+ MCFG_PIA_READPA_HANDLER(READ8(pet_state, pia1_pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(pet_state, pia1_pb_r))
+ MCFG_PIA_READCA1_HANDLER(DEVREADLINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, read))
+ MCFG_PIA_READCB1_HANDLER(READLINE(pet_state, pia1_cb1_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(pet_state, pia1_pa_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(pet_state, pia1_ca2_w))
+ MCFG_PIA_CB2_HANDLER(DEVWRITELINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, motor_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(pet_state, pia1_irqa_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(pet_state, pia1_irqb_w))
MCFG_DEVICE_ADD(M6520_2_TAG, PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(DEVREAD8(IEEE488_TAG, ieee488_device, dio_r))
- MCFG_PIA6821_WRITEPB_HANDLER(DEVWRITE8(IEEE488_TAG, ieee488_device, dio_w))
- MCFG_PIA6821_CA2_HANDLER(DEVWRITELINE(IEEE488_TAG, ieee488_device, ndac_w))
- MCFG_PIA6821_CB2_HANDLER(DEVWRITELINE(IEEE488_TAG, ieee488_device, dav_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(pet_state, pia2_irqa_w))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(pet_state, pia2_irqb_w))
+ MCFG_PIA_READPA_HANDLER(DEVREAD8(IEEE488_TAG, ieee488_device, dio_r))
+ MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8(IEEE488_TAG, ieee488_device, dio_w))
+ MCFG_PIA_CA2_HANDLER(DEVWRITELINE(IEEE488_TAG, ieee488_device, ndac_w))
+ MCFG_PIA_CB2_HANDLER(DEVWRITELINE(IEEE488_TAG, ieee488_device, dav_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(pet_state, pia2_irqa_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(pet_state, pia2_irqb_w))
MCFG_CBM_IEEE488_ADD("c4040")
MCFG_IEEE488_SRQ_CALLBACK(DEVWRITELINE(M6520_2_TAG, pia6821_device, cb1_w))
@@ -1543,7 +1543,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED_CLASS( pet2001b, pet2001n, pet2001b_state )
MCFG_DEVICE_MODIFY(M6520_1_TAG)
- MCFG_PIA6821_READPB_HANDLER(READ8(pet2001b_state, pia1_pb_r))
+ MCFG_PIA_READPB_HANDLER(READ8(pet2001b_state, pia1_pb_r))
MACHINE_CONFIG_END
@@ -1714,23 +1714,23 @@ static MACHINE_CONFIG_START( pet80, pet80_state )
MCFG_VIA6522_IRQ_HANDLER(WRITELINE(pet_state, via_irq_w))
MCFG_DEVICE_ADD(M6520_1_TAG, PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(pet_state, pia1_pa_r))
- MCFG_PIA6821_READPB_HANDLER(READ8(pet_state, pia1_pb_r))
- MCFG_PIA6821_READCA1_HANDLER(DEVREADLINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, read))
- MCFG_PIA6821_READCB1_HANDLER(READLINE(pet_state, pia1_cb1_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(pet_state, pia1_pa_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(pet_state, pia1_ca2_w))
- MCFG_PIA6821_CB2_HANDLER(DEVWRITELINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, motor_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(pet_state, pia1_irqa_w))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(pet_state, pia1_irqb_w))
+ MCFG_PIA_READPA_HANDLER(READ8(pet_state, pia1_pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(pet_state, pia1_pb_r))
+ MCFG_PIA_READCA1_HANDLER(DEVREADLINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, read))
+ MCFG_PIA_READCB1_HANDLER(READLINE(pet_state, pia1_cb1_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(pet_state, pia1_pa_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(pet_state, pia1_ca2_w))
+ MCFG_PIA_CB2_HANDLER(DEVWRITELINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, motor_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(pet_state, pia1_irqa_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(pet_state, pia1_irqb_w))
MCFG_DEVICE_ADD(M6520_2_TAG, PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(DEVREAD8(IEEE488_TAG, ieee488_device, dio_r))
- MCFG_PIA6821_WRITEPB_HANDLER(DEVWRITE8(IEEE488_TAG, ieee488_device, dio_w))
- MCFG_PIA6821_CA2_HANDLER(DEVWRITELINE(IEEE488_TAG, ieee488_device, ndac_w))
- MCFG_PIA6821_CB2_HANDLER(DEVWRITELINE(IEEE488_TAG, ieee488_device, dav_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(pet_state, pia2_irqa_w))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(pet_state, pia2_irqb_w))
+ MCFG_PIA_READPA_HANDLER(DEVREAD8(IEEE488_TAG, ieee488_device, dio_r))
+ MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8(IEEE488_TAG, ieee488_device, dio_w))
+ MCFG_PIA_CA2_HANDLER(DEVWRITELINE(IEEE488_TAG, ieee488_device, ndac_w))
+ MCFG_PIA_CB2_HANDLER(DEVWRITELINE(IEEE488_TAG, ieee488_device, dav_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(pet_state, pia2_irqa_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(pet_state, pia2_irqb_w))
MCFG_CBM_IEEE488_ADD("c8050")
MCFG_IEEE488_SRQ_CALLBACK(DEVWRITELINE(M6520_2_TAG, pia6821_device, cb1_w))
diff --git a/src/mess/drivers/poly.c b/src/mess/drivers/poly.c
index d5740289f00..591eab9b505 100644
--- a/src/mess/drivers/poly.c
+++ b/src/mess/drivers/poly.c
@@ -182,14 +182,14 @@ static MACHINE_CONFIG_START( poly, poly_state )
MCFG_SAA5050_ADD("saa5050", 6000000, poly_saa5050_intf)
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
+ MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA6821_READPB_HANDLER(READ8(poly_state, pia1_b_in))
+ MCFG_PIA_READPB_HANDLER(READ8(poly_state, pia1_b_in))
// CB1 kbd strobe
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
+ MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
MCFG_PTM6840_ADD("ptm", poly_ptm_intf)
MCFG_ACIA6850_ADD("acia", acia_intf)
diff --git a/src/mess/drivers/tavernie.c b/src/mess/drivers/tavernie.c
index d0b24e06965..3431938769e 100644
--- a/src/mess/drivers/tavernie.c
+++ b/src/mess/drivers/tavernie.c
@@ -339,12 +339,12 @@ static MACHINE_CONFIG_START( cpu09, tavernie_state )
MCFG_RS232_OUT_CTS_HANDLER(DEVWRITELINE("acia", acia6850_device, write_cts))
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(tavernie_state, pa_r))
- MCFG_PIA6821_READCA1_HANDLER(READLINE(tavernie_state, ca1_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(tavernie_state, pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(tavernie_state, pb_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line))
+ MCFG_PIA_READPA_HANDLER(READ8(tavernie_state, pa_r))
+ 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_PTM6840_ADD("ptm", mc6840_intf)
MCFG_ACIA6850_ADD("acia", mc6850_intf)
@@ -376,9 +376,9 @@ static MACHINE_CONFIG_DERIVED( ivg09, cpu09 )
MCFG_MC6845_ADD("crtc", MC6845, "screen", 1008000, mc6845_intf) // unknown clock
MCFG_DEVICE_ADD("pia_ivg", PIA6821, 0)
- MCFG_PIA6821_READPB_HANDLER(READ8(tavernie_state, pb_ivg_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(tavernie_state, pa_ivg_w))
- MCFG_PIA6821_CB2_HANDLER(DEVWRITELINE("beeper", beep_device, set_state))
+ MCFG_PIA_READPB_HANDLER(READ8(tavernie_state, pb_ivg_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(tavernie_state, pa_ivg_w))
+ MCFG_PIA_CB2_HANDLER(DEVWRITELINE("beeper", beep_device, set_state))
MCFG_FD1795x_ADD("fdc", XTAL_8MHz / 8)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ifd09_floppies, "525dd", floppy_image_device::default_floppy_formats)
diff --git a/src/mess/drivers/tek405x.c b/src/mess/drivers/tek405x.c
index 9774b97fad1..d983c43ac7a 100644
--- a/src/mess/drivers/tek405x.c
+++ b/src/mess/drivers/tek405x.c
@@ -1029,62 +1029,62 @@ static MACHINE_CONFIG_START( tek4051, tek4051_state )
MCFG_TIMER_DRIVER_ADD_PERIODIC("keyboard", tek4051_state, keyboard_tick, attotime::from_hz(XTAL_12_5MHz/15/4))
MCFG_DEVICE_ADD(MC6820_X_TAG, PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(tek4051_state, x_pia_pa_r))
+ MCFG_PIA_READPA_HANDLER(READ8(tek4051_state, x_pia_pa_r))
// CB1 viewcause
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(tek4051_state, x_pia_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(tek4051_state, x_pia_pb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(tek4051_state, adot_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(tek4051_state, bufclk_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(tek4051_state, x_pia_irqa_w))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(tek4051_state, x_pia_irqb_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(tek4051_state, x_pia_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(tek4051_state, x_pia_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(tek4051_state, adot_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(tek4051_state, bufclk_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(tek4051_state, x_pia_irqa_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(tek4051_state, x_pia_irqb_w))
MCFG_DEVICE_ADD(MC6820_Y_TAG, PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(tek4051_state, sa_r))
+ MCFG_PIA_READPA_HANDLER(READ8(tek4051_state, sa_r))
// CA1 rdbyte
// CB1 mdata
// CB2 fmark
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(tek4051_state, y_pia_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(tek4051_state, sb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(tek4051_state, sot_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(tek4051_state, y_pia_irqa_w))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(tek4051_state, y_pia_irqb_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(tek4051_state, y_pia_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(tek4051_state, sb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(tek4051_state, sot_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(tek4051_state, y_pia_irqa_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(tek4051_state, y_pia_irqb_w))
MCFG_DEVICE_ADD(MC6820_KB_TAG, PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(tek4051_state, kb_pia_pa_r))
- MCFG_PIA6821_READPB_HANDLER(READ8(tek4051_state, kb_pia_pb_r))
+ MCFG_PIA_READPA_HANDLER(READ8(tek4051_state, kb_pia_pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(tek4051_state, kb_pia_pb_r))
// CA1 key
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(tek4051_state, kb_pia_pb_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(tek4051_state, kb_halt_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(tek4051_state, kb_pia_irqa_w))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(tek4051_state, kb_pia_irqb_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(tek4051_state, kb_pia_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(tek4051_state, kb_halt_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(tek4051_state, kb_pia_irqa_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(tek4051_state, kb_pia_irqb_w))
MCFG_DEVICE_ADD(MC6820_TAPE_TAG, PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(tek4051_state, tape_pia_pa_r))
+ MCFG_PIA_READPA_HANDLER(READ8(tek4051_state, tape_pia_pa_r))
// CA1 rmark
// CB1 lohole
// CA2 filfnd
// CB2 uphole
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(tek4051_state, tape_pia_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(tek4051_state, tape_pia_pb_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(tek4051_state, tape_pia_irqa_w))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(tek4051_state, tape_pia_irqb_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(tek4051_state, tape_pia_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(tek4051_state, tape_pia_pb_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(tek4051_state, tape_pia_irqa_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(tek4051_state, tape_pia_irqb_w))
MCFG_DEVICE_ADD(MC6820_GPIB_TAG, PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(DEVREAD8(IEEE488_TAG, ieee488_device, dio_r))
- MCFG_PIA6821_READPB_HANDLER(READ8(tek4051_state, gpib_pia_pb_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(tek4051_state, dio_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(tek4051_state, gpib_pia_pb_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(tek4051_state, talk_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(tek4051_state, gpib_pia_irqa_w))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(tek4051_state, gpib_pia_irqb_w))
+ MCFG_PIA_READPA_HANDLER(DEVREAD8(IEEE488_TAG, ieee488_device, dio_r))
+ MCFG_PIA_READPB_HANDLER(READ8(tek4051_state, gpib_pia_pb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(tek4051_state, dio_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(tek4051_state, gpib_pia_pb_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(tek4051_state, talk_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(tek4051_state, gpib_pia_irqa_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(tek4051_state, gpib_pia_irqb_w))
MCFG_DEVICE_ADD(MC6820_COM_TAG, PIA6821, 0)
- MCFG_PIA6821_READPB_HANDLER(READ8(tek4051_state, com_pia_pb_r))
+ MCFG_PIA_READPB_HANDLER(READ8(tek4051_state, com_pia_pb_r))
//CA1 - SRX (RS-232 pin 12)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(tek4051_state, com_pia_pa_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(tek4051_state, com_pia_pb_w))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(tek4051_state, com_pia_irqa_w))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(tek4051_state, com_pia_irqb_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(tek4051_state, com_pia_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(tek4051_state, com_pia_pb_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(tek4051_state, com_pia_irqa_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(tek4051_state, com_pia_irqb_w))
MCFG_ACIA6850_ADD(MC6850_TAG, acia_intf)
diff --git a/src/mess/drivers/thomson.c b/src/mess/drivers/thomson.c
index af9c0a534d1..4b818a50fde 100644
--- a/src/mess/drivers/thomson.c
+++ b/src/mess/drivers/thomson.c
@@ -673,29 +673,29 @@ static MACHINE_CONFIG_START( to7, thomson_state )
/* pia */
MCFG_DEVICE_ADD(THOM_PIA_SYS, PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(thomson_state, to7_sys_porta_in))
- MCFG_PIA6821_READPB_HANDLER(READ8(thomson_state, to7_sys_portb_in))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(thomson_state, to7_sys_portb_out))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(thomson_state, to7_set_cassette_motor))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(thomson_state, to7_sys_cb2_out))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(thomson_state, thom_firq_1))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(thomson_state, thom_firq_1))
+ MCFG_PIA_READPA_HANDLER(READ8(thomson_state, to7_sys_porta_in))
+ MCFG_PIA_READPB_HANDLER(READ8(thomson_state, to7_sys_portb_in))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(thomson_state, to7_sys_portb_out))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(thomson_state, to7_set_cassette_motor))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(thomson_state, to7_sys_cb2_out))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(thomson_state, thom_firq_1))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(thomson_state, thom_firq_1))
MCFG_DEVICE_ADD(THOM_PIA_IO, PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(DEVREAD8("to7_io", to7_io_line_device, porta_in))
- MCFG_PIA6821_WRITEPA_HANDLER(DEVWRITE8("to7_io", to7_io_line_device, porta_out))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(thomson_state, to7_io_portb_out))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(thomson_state, to7_io_cb2_out))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(thomson_state, thom_firq_1))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(thomson_state, thom_firq_1))
+ MCFG_PIA_READPA_HANDLER(DEVREAD8("to7_io", to7_io_line_device, porta_in))
+ MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("to7_io", to7_io_line_device, porta_out))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(thomson_state, to7_io_portb_out))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(thomson_state, to7_io_cb2_out))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(thomson_state, thom_firq_1))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(thomson_state, thom_firq_1))
MCFG_DEVICE_ADD(THOM_PIA_GAME, PIA6821, 0)
- MCFG_PIA6821_READPA_HANDLER(READ8(thomson_state, to7_game_porta_in))
- MCFG_PIA6821_READPB_HANDLER(READ8(thomson_state, to7_game_portb_in))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(thomson_state, to7_game_portb_out))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(thomson_state, to7_game_cb2_out))
- MCFG_PIA6821_IRQA_HANDLER(WRITELINE(thomson_state, thom_irq_1))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(thomson_state, thom_irq_1))
+ MCFG_PIA_READPA_HANDLER(READ8(thomson_state, to7_game_porta_in))
+ MCFG_PIA_READPB_HANDLER(READ8(thomson_state, to7_game_portb_in))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(thomson_state, to7_game_portb_out))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(thomson_state, to7_game_cb2_out))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(thomson_state, thom_irq_1))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(thomson_state, thom_irq_1))
MCFG_DEVICE_ADD(THOM_PIA_MODEM, PIA6821, 0)
@@ -896,10 +896,10 @@ static MACHINE_CONFIG_DERIVED( to770, to7 )
MCFG_CPU_PROGRAM_MAP ( to770)
MCFG_DEVICE_MODIFY(THOM_PIA_SYS)
- MCFG_PIA6821_READPA_HANDLER(READ8(thomson_state, to770_sys_porta_in))
- MCFG_PIA6821_READPB_HANDLER(NULL)
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(thomson_state, to770_sys_portb_out))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(thomson_state, to770_sys_cb2_out))
+ MCFG_PIA_READPA_HANDLER(READ8(thomson_state, to770_sys_porta_in))
+ MCFG_PIA_READPB_HANDLER(NULL)
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(thomson_state, to770_sys_portb_out))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(thomson_state, to770_sys_cb2_out))
MCFG_MC6846_MODIFY( "mc6846", to770_timer )
@@ -1088,13 +1088,13 @@ static MACHINE_CONFIG_DERIVED( mo5, to7 )
MCFG_DEVICE_REMOVE( "mc6846" )
MCFG_DEVICE_MODIFY(THOM_PIA_SYS)
- MCFG_PIA6821_READPA_HANDLER(READ8(thomson_state, mo5_sys_porta_in))
- MCFG_PIA6821_READPB_HANDLER(READ8(thomson_state, mo5_sys_portb_in))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(thomson_state, mo5_sys_porta_out))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(thomson_state, mo5_sys_portb_out))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(thomson_state, mo5_set_cassette_motor))
- MCFG_PIA6821_CB2_HANDLER(NULL)
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(thomson_state, thom_irq_1)) /* WARNING: differs from TO7 ! */
+ MCFG_PIA_READPA_HANDLER(READ8(thomson_state, mo5_sys_porta_in))
+ MCFG_PIA_READPB_HANDLER(READ8(thomson_state, mo5_sys_portb_in))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(thomson_state, mo5_sys_porta_out))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(thomson_state, mo5_sys_portb_out))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(thomson_state, mo5_set_cassette_motor))
+ MCFG_PIA_CB2_HANDLER(NULL)
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(thomson_state, thom_irq_1)) /* WARNING: differs from TO7 ! */
MCFG_CARTSLOT_MODIFY("cart")
MCFG_CARTSLOT_EXTENSION_LIST("m5,rom")
@@ -1432,12 +1432,12 @@ static MACHINE_CONFIG_DERIVED( to9, to7 )
MCFG_CPU_PROGRAM_MAP ( to9)
MCFG_DEVICE_MODIFY(THOM_PIA_SYS)
- MCFG_PIA6821_READPA_HANDLER(READ8(thomson_state, to9_sys_porta_in))
- MCFG_PIA6821_READPB_HANDLER(NULL)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(thomson_state, to9_sys_porta_out))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(thomson_state, to9_sys_portb_out))
- MCFG_PIA6821_CB2_HANDLER(NULL)
- MCFG_PIA6821_IRQA_HANDLER(NULL)
+ MCFG_PIA_READPA_HANDLER(READ8(thomson_state, to9_sys_porta_in))
+ MCFG_PIA_READPB_HANDLER(NULL)
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(thomson_state, to9_sys_porta_out))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(thomson_state, to9_sys_portb_out))
+ MCFG_PIA_CB2_HANDLER(NULL)
+ MCFG_PIA_IRQA_HANDLER(NULL)
MCFG_DEVICE_REMOVE( THOM_PIA_IO )
@@ -1656,12 +1656,12 @@ static MACHINE_CONFIG_DERIVED( to8, to7 )
MCFG_CPU_PROGRAM_MAP ( to8)
MCFG_DEVICE_MODIFY(THOM_PIA_SYS)
- MCFG_PIA6821_READPA_HANDLER(READ8(thomson_state, to8_sys_porta_in))
- MCFG_PIA6821_READPB_HANDLER(NULL)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(thomson_state, to9_sys_porta_out))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(thomson_state, to8_sys_portb_out))
- MCFG_PIA6821_CB2_HANDLER(NULL)
- MCFG_PIA6821_IRQA_HANDLER(NULL)
+ MCFG_PIA_READPA_HANDLER(READ8(thomson_state, to8_sys_porta_in))
+ MCFG_PIA_READPB_HANDLER(NULL)
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(thomson_state, to9_sys_porta_out))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(thomson_state, to8_sys_portb_out))
+ MCFG_PIA_CB2_HANDLER(NULL)
+ MCFG_PIA_IRQA_HANDLER(NULL)
MCFG_DEVICE_REMOVE( THOM_PIA_IO )
@@ -1810,13 +1810,13 @@ static MACHINE_CONFIG_DERIVED( to9p, to7 )
MCFG_CPU_PROGRAM_MAP ( to9p)
MCFG_DEVICE_MODIFY(THOM_PIA_SYS)
- MCFG_PIA6821_READPA_HANDLER(READ8(thomson_state, to9_sys_porta_in))
- MCFG_PIA6821_READPB_HANDLER(NULL)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(thomson_state, to9_sys_porta_out))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(thomson_state, to8_sys_portb_out))
- MCFG_PIA6821_CB2_HANDLER(NULL)
- MCFG_PIA6821_IRQA_HANDLER(NULL)
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(thomson_state, thom_firq_1))
+ MCFG_PIA_READPA_HANDLER(READ8(thomson_state, to9_sys_porta_in))
+ MCFG_PIA_READPB_HANDLER(NULL)
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(thomson_state, to9_sys_porta_out))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(thomson_state, to8_sys_portb_out))
+ MCFG_PIA_CB2_HANDLER(NULL)
+ MCFG_PIA_IRQA_HANDLER(NULL)
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(thomson_state, thom_firq_1))
MCFG_DEVICE_REMOVE( THOM_PIA_IO )
@@ -2152,19 +2152,19 @@ static MACHINE_CONFIG_DERIVED( mo6, to7 )
MCFG_DEVICE_REMOVE( "mc6846" )
MCFG_DEVICE_MODIFY(THOM_PIA_SYS)
- MCFG_PIA6821_READPA_HANDLER(READ8(thomson_state, mo6_sys_porta_in))
- MCFG_PIA6821_READPB_HANDLER(READ8(thomson_state, mo6_sys_portb_in))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(thomson_state, mo6_sys_porta_out))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(thomson_state, mo6_sys_portb_out))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(thomson_state, mo5_set_cassette_motor))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(thomson_state, mo6_sys_cb2_out))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(thomson_state, thom_irq_1)) /* differs from TO */
+ MCFG_PIA_READPA_HANDLER(READ8(thomson_state, mo6_sys_porta_in))
+ MCFG_PIA_READPB_HANDLER(READ8(thomson_state, mo6_sys_portb_in))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(thomson_state, mo6_sys_porta_out))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(thomson_state, mo6_sys_portb_out))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(thomson_state, mo5_set_cassette_motor))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(thomson_state, mo6_sys_cb2_out))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(thomson_state, thom_irq_1)) /* differs from TO */
MCFG_DEVICE_REMOVE( THOM_PIA_IO )
MCFG_DEVICE_MODIFY(THOM_PIA_GAME)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(thomson_state, mo6_game_porta_out))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(thomson_state, mo6_game_cb2_out))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(thomson_state, mo6_game_porta_out))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(thomson_state, mo6_game_cb2_out))
MCFG_DEVICE_REMOVE("centronics")
MCFG_CENTRONICS_PRINTER_ADD("centronics", mo6_centronics_config)
@@ -2388,18 +2388,18 @@ static MACHINE_CONFIG_DERIVED( mo5nr, to7 )
MCFG_DEVICE_REMOVE( "mc6846" )
MCFG_DEVICE_MODIFY(THOM_PIA_SYS)
- MCFG_PIA6821_READPA_HANDLER(READ8(thomson_state, mo6_sys_porta_in))
- MCFG_PIA6821_READPB_HANDLER(READ8(thomson_state, mo5nr_sys_portb_in))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(thomson_state, mo5nr_sys_porta_out))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(thomson_state, mo6_sys_portb_out))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(thomson_state, mo5_set_cassette_motor))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(thomson_state, mo6_sys_cb2_out))
- MCFG_PIA6821_IRQB_HANDLER(WRITELINE(thomson_state, thom_irq_1)) /* differs from TO */
+ MCFG_PIA_READPA_HANDLER(READ8(thomson_state, mo6_sys_porta_in))
+ MCFG_PIA_READPB_HANDLER(READ8(thomson_state, mo5nr_sys_portb_in))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(thomson_state, mo5nr_sys_porta_out))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(thomson_state, mo6_sys_portb_out))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(thomson_state, mo5_set_cassette_motor))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(thomson_state, mo6_sys_cb2_out))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(thomson_state, thom_irq_1)) /* differs from TO */
MCFG_DEVICE_REMOVE( THOM_PIA_IO )
MCFG_DEVICE_MODIFY(THOM_PIA_GAME)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(thomson_state, mo6_game_porta_out))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(thomson_state, mo6_game_porta_out))
MCFG_DEVICE_REMOVE("centronics")
MCFG_CENTRONICS_PRINTER_ADD("centronics", standard_centronics)
diff --git a/src/mess/drivers/v6809.c b/src/mess/drivers/v6809.c
index 1788ecc2644..a9de0584c0b 100644
--- a/src/mess/drivers/v6809.c
+++ b/src/mess/drivers/v6809.c
@@ -354,15 +354,15 @@ static MACHINE_CONFIG_START( v6809, v6809_state )
// port A = drive select and 2 control lines ; port B = keyboard
// CB2 connects to the interrupt pin of the RTC (the rtc code doesn't support it)
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA6821_READPB_HANDLER(READ8(v6809_state, pb_r))
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(v6809_state, pa_w))
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809_device, irq_line))
+ 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))
// no idea what this does
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809_device, irq_line))
- MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809_device, irq_line))
+ MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809_device, irq_line))
+ MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809_device, irq_line))
MCFG_PTM6840_ADD("ptm", mc6840_intf)
MCFG_ACIA6850_ADD("acia0", mc6850_intf)
diff --git a/src/mess/drivers/z100.c b/src/mess/drivers/z100.c
index 34a48bc3f72..d9fe5fa7a7c 100644
--- a/src/mess/drivers/z100.c
+++ b/src/mess/drivers/z100.c
@@ -748,10 +748,10 @@ static MACHINE_CONFIG_START( z100, z100_state )
MCFG_PIC8259_ADD( "pic8259_slave", DEVWRITELINE("pic8259_master", pic8259_device, ir3_w), GND, NULL )
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(z100_state, video_pia_A_w))
- MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(z100_state, video_pia_B_w))
- MCFG_PIA6821_CA2_HANDLER(WRITELINE(z100_state, video_pia_CA2_w))
- MCFG_PIA6821_CB2_HANDLER(WRITELINE(z100_state, video_pia_CB2_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(z100_state, video_pia_A_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(z100_state, video_pia_B_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(z100_state, video_pia_CA2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(z100_state, video_pia_CB2_w))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
diff --git a/src/mess/drivers/zorba.c b/src/mess/drivers/zorba.c
index a0ca09af552..f5685cb7750 100644
--- a/src/mess/drivers/zorba.c
+++ b/src/mess/drivers/zorba.c
@@ -425,7 +425,7 @@ static MACHINE_CONFIG_START( zorba, zorba_state )
// port A - disk select etc, beeper
// port B - parallel interface
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(zorba_state, pia0_porta_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(zorba_state, pia0_porta_w))
// IEEE488 interface
MCFG_DEVICE_ADD("pia1", PIA6821, 0)