diff options
author | 2014-01-06 16:30:13 +0000 | |
---|---|---|
committer | 2014-01-06 16:30:13 +0000 | |
commit | 9207c04fb1ce8727cf817b220efbe6eac30ab70f (patch) | |
tree | 417986acdd0a683b7a2514da9529a4f1f993269d /src/mess/drivers | |
parent | 5a625a2f0bb81bb01dfcafef8ecee96fb1b02159 (diff) |
fixed swapped cb1 & ca2 read callbacks during conversion (nw)
Diffstat (limited to 'src/mess/drivers')
-rw-r--r-- | src/mess/drivers/apf.c | 8 | ||||
-rw-r--r-- | src/mess/drivers/bw12.c | 2 | ||||
-rw-r--r-- | src/mess/drivers/crvision.c | 4 | ||||
-rw-r--r-- | src/mess/drivers/csc.c | 2 | ||||
-rw-r--r-- | src/mess/drivers/d6800.c | 4 | ||||
-rw-r--r-- | src/mess/drivers/eacc.c | 4 | ||||
-rw-r--r-- | src/mess/drivers/mekd2.c | 2 | ||||
-rw-r--r-- | src/mess/drivers/pegasus.c | 2 | ||||
-rw-r--r-- | src/mess/drivers/pet.c | 8 | ||||
-rw-r--r-- | src/mess/drivers/poly.c | 2 | ||||
-rw-r--r-- | src/mess/drivers/tek405x.c | 10 |
11 files changed, 24 insertions, 24 deletions
diff --git a/src/mess/drivers/apf.c b/src/mess/drivers/apf.c index a3d6c06eccc..f7d27f628f5 100644 --- a/src/mess/drivers/apf.c +++ b/src/mess/drivers/apf.c @@ -679,8 +679,8 @@ static MACHINE_CONFIG_START( apf_imagination, apf_state ) 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_READCA1_HANDLER(READLINE(apf_state, apf_m1000_pia_in_ca1_func)) - MCFG_PIA6821_READCA2_HANDLER(READLINE(apf_state, apf_m1000_pia_in_cb1_func)) - MCFG_PIA6821_READCB1_HANDLER(READLINE(apf_state, apf_m1000_pia_in_ca2_func)) + MCFG_PIA6821_READCB1_HANDLER(READLINE(apf_state, apf_m1000_pia_in_cb1_func)) + MCFG_PIA6821_READCA2_HANDLER(READLINE(apf_state, apf_m1000_pia_in_ca2_func)) MCFG_PIA6821_READCB2_HANDLER(READLINE(apf_state, apf_m1000_pia_in_cb2_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)) @@ -693,8 +693,8 @@ static MACHINE_CONFIG_START( apf_imagination, apf_state ) 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_READCA1_HANDLER(READLINE(apf_state, apf_imagination_pia_in_ca1_func)) - MCFG_PIA6821_READCA2_HANDLER(READLINE(apf_state, apf_imagination_pia_in_cb1_func)) - MCFG_PIA6821_READCB1_HANDLER(READLINE(apf_state, apf_imagination_pia_in_ca2_func)) + MCFG_PIA6821_READCB1_HANDLER(READLINE(apf_state, apf_imagination_pia_in_cb1_func)) + MCFG_PIA6821_READCA2_HANDLER(READLINE(apf_state, apf_imagination_pia_in_ca2_func)) MCFG_PIA6821_READCB2_HANDLER(READLINE(apf_state, apf_imagination_pia_in_cb2_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)) diff --git a/src/mess/drivers/bw12.c b/src/mess/drivers/bw12.c index e2340e5a766..e234118ceee 100644 --- a/src/mess/drivers/bw12.c +++ b/src/mess/drivers/bw12.c @@ -639,7 +639,7 @@ static MACHINE_CONFIG_START( common, bw12_state ) 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_READCA2_HANDLER(READLINE(bw12_state, pia_cb1_r)) + MCFG_PIA6821_READCB1_HANDLER(READLINE(bw12_state, pia_cb1_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)) diff --git a/src/mess/drivers/crvision.c b/src/mess/drivers/crvision.c index 628000c26d4..cb1785d6afe 100644 --- a/src/mess/drivers/crvision.c +++ b/src/mess/drivers/crvision.c @@ -916,7 +916,7 @@ static MACHINE_CONFIG_START( creativision, crvision_state ) 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_READCA2_HANDLER(DEVREADLINE(SN76489_TAG, sn76496_base_device, ready_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)) @@ -984,7 +984,7 @@ static MACHINE_CONFIG_START( lasr2001, laser2001_state ) 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_READCA2_HANDLER(READLINE(laser2001_state, pia_cb1_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)) diff --git a/src/mess/drivers/csc.c b/src/mess/drivers/csc.c index 9d9f2949fbe..0ae7793d74f 100644 --- a/src/mess/drivers/csc.c +++ b/src/mess/drivers/csc.c @@ -314,7 +314,7 @@ static MACHINE_CONFIG_START( csc, csc_state ) 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_READCA2_HANDLER(READLINE(csc_state, pia1_cb1_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)) diff --git a/src/mess/drivers/d6800.c b/src/mess/drivers/d6800.c index da8a74ddc86..c875f994aa3 100644 --- a/src/mess/drivers/d6800.c +++ b/src/mess/drivers/d6800.c @@ -437,8 +437,8 @@ static MACHINE_CONFIG_START( d6800, d6800_state ) MCFG_PIA6821_READPA_HANDLER(READ8(d6800_state, d6800_keyboard_r)) MCFG_PIA6821_READPB_HANDLER(READ8(d6800_state, d6800_cassette_r)) MCFG_PIA6821_READCA1_HANDLER(READLINE(d6800_state, d6800_keydown_r)) - MCFG_PIA6821_READCA2_HANDLER(READLINE(d6800_state, d6800_rtc_pulse)) - MCFG_PIA6821_READCB1_HANDLER(READLINE(d6800_state, d6800_fn_key_r)) + MCFG_PIA6821_READCB1_HANDLER(READLINE(d6800_state, d6800_rtc_pulse)) + MCFG_PIA6821_READCA2_HANDLER(READLINE(d6800_state, d6800_fn_key_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)) diff --git a/src/mess/drivers/eacc.c b/src/mess/drivers/eacc.c index 19af8344ded..ba4361fe02b 100644 --- a/src/mess/drivers/eacc.c +++ b/src/mess/drivers/eacc.c @@ -247,8 +247,8 @@ static MACHINE_CONFIG_START( eacc, eacc_state ) 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_READCA2_HANDLER(READLINE(eacc_state, eacc_cb1_r)) - MCFG_PIA6821_READCB1_HANDLER(READLINE(eacc_state, eacc_fuel_sensor_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)) diff --git a/src/mess/drivers/mekd2.c b/src/mess/drivers/mekd2.c index e2c2f05ea03..a63f5952530 100644 --- a/src/mess/drivers/mekd2.c +++ b/src/mess/drivers/mekd2.c @@ -386,7 +386,7 @@ 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_READCA2_HANDLER(READLINE(mekd2_state, mekd2_key40_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)) diff --git a/src/mess/drivers/pegasus.c b/src/mess/drivers/pegasus.c index 7ccc0c14c2a..2d00d0b1d92 100644 --- a/src/mess/drivers/pegasus.c +++ b/src/mess/drivers/pegasus.c @@ -490,7 +490,7 @@ static MACHINE_CONFIG_START( pegasus, pegasus_state ) 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_READCA2_HANDLER(READLINE(pegasus_state, pegasus_keyboard_irq)) + 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)) diff --git a/src/mess/drivers/pet.c b/src/mess/drivers/pet.c index d37afe62a02..c7aefcf612f 100644 --- a/src/mess/drivers/pet.c +++ b/src/mess/drivers/pet.c @@ -1400,7 +1400,7 @@ static MACHINE_CONFIG_START( pet, pet_state ) 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_READCA2_HANDLER(READLINE(pet_state, pia1_cb1_r)) + 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)) @@ -1410,7 +1410,7 @@ static MACHINE_CONFIG_START( pet, pet_state ) MCFG_DEVICE_ADD(M6520_2_TAG, PIA6821, 0) MCFG_PIA6821_READPA_HANDLER(DEVREAD8(IEEE488_TAG, ieee488_device, dio_r)) MCFG_PIA6821_READCA1_HANDLER(DEVREADLINE(IEEE488_TAG, ieee488_device, atn_r)) - MCFG_PIA6821_READCA2_HANDLER(DEVREADLINE(IEEE488_TAG, ieee488_device, srq_r)) + MCFG_PIA6821_READCB1_HANDLER(DEVREADLINE(IEEE488_TAG, ieee488_device, srq_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)) @@ -1719,7 +1719,7 @@ static MACHINE_CONFIG_START( pet80, pet80_state ) 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_READCA2_HANDLER(READLINE(pet_state, pia1_cb1_r)) + 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)) @@ -1729,7 +1729,7 @@ static MACHINE_CONFIG_START( pet80, pet80_state ) MCFG_DEVICE_ADD(M6520_2_TAG, PIA6821, 0) MCFG_PIA6821_READPA_HANDLER(DEVREAD8(IEEE488_TAG, ieee488_device, dio_r)) MCFG_PIA6821_READCA1_HANDLER(DEVREADLINE(IEEE488_TAG, ieee488_device, atn_r)) - MCFG_PIA6821_READCA2_HANDLER(DEVREADLINE(IEEE488_TAG, ieee488_device, srq_r)) + MCFG_PIA6821_READCB1_HANDLER(DEVREADLINE(IEEE488_TAG, ieee488_device, srq_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)) diff --git a/src/mess/drivers/poly.c b/src/mess/drivers/poly.c index 932d8ff8c2f..e63b212a67a 100644 --- a/src/mess/drivers/poly.c +++ b/src/mess/drivers/poly.c @@ -194,7 +194,7 @@ static MACHINE_CONFIG_START( poly, poly_state ) MCFG_DEVICE_ADD("pia1", PIA6821, 0) MCFG_PIA6821_READPB_HANDLER(READ8(poly_state, pia1_b_in)) - MCFG_PIA6821_READCA2_HANDLER(READLINE(poly_state, pia1_cb1_in)) + MCFG_PIA6821_READCB1_HANDLER(READLINE(poly_state, pia1_cb1_in)) MCFG_PIA6821_IRQA_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line)) MCFG_PIA6821_IRQB_HANDLER(DEVWRITELINE("maincpu", m6809e_device, irq_line)) diff --git a/src/mess/drivers/tek405x.c b/src/mess/drivers/tek405x.c index 6052561a239..107da9770db 100644 --- a/src/mess/drivers/tek405x.c +++ b/src/mess/drivers/tek405x.c @@ -1075,7 +1075,7 @@ static MACHINE_CONFIG_START( tek4051, tek4051_state ) MCFG_DEVICE_ADD(MC6820_X_TAG, PIA6821, 0) MCFG_PIA6821_READPA_HANDLER(READ8(tek4051_state, x_pia_pa_r)) - MCFG_PIA6821_READCA2_HANDLER(READLINE(tek4051_state, viewcause_r)) + MCFG_PIA6821_READCB1_HANDLER(READLINE(tek4051_state, viewcause_r)) 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)) @@ -1086,7 +1086,7 @@ static MACHINE_CONFIG_START( tek4051, tek4051_state ) MCFG_DEVICE_ADD(MC6820_Y_TAG, PIA6821, 0) MCFG_PIA6821_READPA_HANDLER(READ8(tek4051_state, sa_r)) MCFG_PIA6821_READCA1_HANDLER(READLINE(tek4051_state, rdbyte_r)) - MCFG_PIA6821_READCA2_HANDLER(READLINE(tek4051_state, mdata_r)) + MCFG_PIA6821_READCB1_HANDLER(READLINE(tek4051_state, mdata_r)) MCFG_PIA6821_READCB2_HANDLER(READLINE(tek4051_state, fmark_r)) MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(tek4051_state, y_pia_pa_w)) MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(tek4051_state, sb_w)) @@ -1106,8 +1106,8 @@ static MACHINE_CONFIG_START( tek4051, tek4051_state ) MCFG_DEVICE_ADD(MC6820_TAPE_TAG, PIA6821, 0) MCFG_PIA6821_READPA_HANDLER(READ8(tek4051_state, tape_pia_pa_r)) MCFG_PIA6821_READCA1_HANDLER(READLINE(tek4051_state, rmark_r)) - MCFG_PIA6821_READCA2_HANDLER(READLINE(tek4051_state, lohole_r)) - MCFG_PIA6821_READCB1_HANDLER(READLINE(tek4051_state, filfnd_r)) + MCFG_PIA6821_READCB1_HANDLER(READLINE(tek4051_state, lohole_r)) + MCFG_PIA6821_READCA2_HANDLER(READLINE(tek4051_state, filfnd_r)) MCFG_PIA6821_READCB2_HANDLER(READLINE(tek4051_state, uphole_r)) MCFG_PIA6821_WRITEPA_HANDLER(WRITE8(tek4051_state, tape_pia_pa_w)) MCFG_PIA6821_WRITEPB_HANDLER(WRITE8(tek4051_state, tape_pia_pb_w)) @@ -1118,7 +1118,7 @@ static MACHINE_CONFIG_START( tek4051, tek4051_state ) MCFG_PIA6821_READPA_HANDLER(DEVREAD8(IEEE488_TAG, ieee488_device, dio_r)) MCFG_PIA6821_READPB_HANDLER(READ8(tek4051_state, gpib_pia_pb_r)) MCFG_PIA6821_READCA1_HANDLER(DEVREADLINE(IEEE488_TAG, ieee488_device, eoi_r)) - MCFG_PIA6821_READCA2_HANDLER(DEVREADLINE(IEEE488_TAG, ieee488_device, srq_r)) + MCFG_PIA6821_READCB1_HANDLER(DEVREADLINE(IEEE488_TAG, ieee488_device, srq_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)) |