From 6806f5b3bf4ada3d031851c93694077ebe3e78b0 Mon Sep 17 00:00:00 2001 From: smf- Date: Wed, 1 Jan 2014 15:33:08 +0000 Subject: [PATCH] removed ca1/cb1 callbacks as the values are already pushed [smf] --- src/emu/bus/ieee488/c2040.c | 22 ---------------------- src/emu/bus/ieee488/c2040.h | 2 -- src/emu/bus/vic20/vic1112.c | 1 - src/mess/drivers/pet.c | 2 -- 4 files changed, 27 deletions(-) diff --git a/src/emu/bus/ieee488/c2040.c b/src/emu/bus/ieee488/c2040.c index 7dbf3d9ff11..146dfe7d31b 100644 --- a/src/emu/bus/ieee488/c2040.c +++ b/src/emu/bus/ieee488/c2040.c @@ -622,16 +622,6 @@ WRITE8_MEMBER( c2040_device::via_pb_w ) m_bit_timer->enable(!mtr1 || !mtr0); } -READ_LINE_MEMBER( c2040_device::ready_r ) -{ - return m_ready; -} - -READ_LINE_MEMBER( c2040_device::err_r ) -{ - return ERROR; -} - WRITE_LINE_MEMBER( c2040_device::mode_sel_w ) { // mode select @@ -1053,8 +1043,6 @@ static MACHINE_CONFIG_FRAGMENT( c2040 ) MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_16MHz/16) MCFG_VIA6522_READPA_HANDLER(READ8(c2040_device, via_pa_r)) - MCFG_VIA6522_READCA1_HANDLER(READLINE(c2040_device, ready_r)) - MCFG_VIA6522_READCB1_HANDLER(READLINE(c2040_device, err_r)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c2040_device, via_pb_w)) MCFG_VIA6522_CA2_HANDLER(WRITELINE(c2040_device, mode_sel_w)) MCFG_VIA6522_CB2_HANDLER(WRITELINE(c2040_device, rw_sel_w)) @@ -1094,8 +1082,6 @@ static MACHINE_CONFIG_FRAGMENT( c4040 ) MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_16MHz/16) MCFG_VIA6522_READPA_HANDLER(READ8(c2040_device, via_pa_r)) - MCFG_VIA6522_READCA1_HANDLER(READLINE(c2040_device, ready_r)) - MCFG_VIA6522_READCB1_HANDLER(READLINE(c2040_device, err_r)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c2040_device, via_pb_w)) MCFG_VIA6522_CA2_HANDLER(WRITELINE(c2040_device, mode_sel_w)) MCFG_VIA6522_CB2_HANDLER(WRITELINE(c2040_device, rw_sel_w)) @@ -1136,8 +1122,6 @@ static MACHINE_CONFIG_FRAGMENT( c8050 ) MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_12MHz/12) MCFG_VIA6522_READPA_HANDLER(READ8(c2040_device, via_pa_r)) MCFG_VIA6522_READPB_HANDLER(READ8(c8050_device, via_pb_r)) - MCFG_VIA6522_READCA1_HANDLER(READLINE(c2040_device, ready_r)) - MCFG_VIA6522_READCB1_HANDLER(READLINE(c2040_device, err_r)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c8050_device, via_pb_w)) MCFG_VIA6522_CA2_HANDLER(WRITELINE(c2040_device, mode_sel_w)) MCFG_VIA6522_CB2_HANDLER(WRITELINE(c2040_device, rw_sel_w)) @@ -1178,8 +1162,6 @@ static MACHINE_CONFIG_FRAGMENT( c8250 ) MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_12MHz/12) MCFG_VIA6522_READPA_HANDLER(READ8(c2040_device, via_pa_r)) MCFG_VIA6522_READPB_HANDLER(READ8(c8050_device, via_pb_r)) - MCFG_VIA6522_READCA1_HANDLER(READLINE(c2040_device, ready_r)) - MCFG_VIA6522_READCB1_HANDLER(READLINE(c2040_device, err_r)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c8050_device, via_pb_w)) MCFG_VIA6522_CA2_HANDLER(WRITELINE(c2040_device, mode_sel_w)) MCFG_VIA6522_CB2_HANDLER(WRITELINE(c2040_device, rw_sel_w)) @@ -1220,8 +1202,6 @@ static MACHINE_CONFIG_FRAGMENT( c8250lp ) MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_12MHz/12) MCFG_VIA6522_READPA_HANDLER(READ8(c2040_device, via_pa_r)) MCFG_VIA6522_READPB_HANDLER(READ8(c8050_device, via_pb_r)) - MCFG_VIA6522_READCA1_HANDLER(READLINE(c2040_device, ready_r)) - MCFG_VIA6522_READCB1_HANDLER(READLINE(c2040_device, err_r)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c8050_device, via_pb_w)) MCFG_VIA6522_CA2_HANDLER(WRITELINE(c2040_device, mode_sel_w)) MCFG_VIA6522_CB2_HANDLER(WRITELINE(c2040_device, rw_sel_w)) @@ -1262,8 +1242,6 @@ static MACHINE_CONFIG_FRAGMENT( sfd1001 ) MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_12MHz/12) MCFG_VIA6522_READPA_HANDLER(READ8(c2040_device, via_pa_r)) MCFG_VIA6522_READPB_HANDLER(READ8(c8050_device, via_pb_r)) - MCFG_VIA6522_READCA1_HANDLER(READLINE(c2040_device, ready_r)) - MCFG_VIA6522_READCB1_HANDLER(READLINE(c2040_device, err_r)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c8050_device, via_pb_w)) MCFG_VIA6522_CA2_HANDLER(WRITELINE(c2040_device, mode_sel_w)) MCFG_VIA6522_CB2_HANDLER(WRITELINE(c2040_device, rw_sel_w)) diff --git a/src/emu/bus/ieee488/c2040.h b/src/emu/bus/ieee488/c2040.h index 65879f2f2f8..6dadc2fcec7 100644 --- a/src/emu/bus/ieee488/c2040.h +++ b/src/emu/bus/ieee488/c2040.h @@ -58,8 +58,6 @@ public: DECLARE_WRITE8_MEMBER( riot1_pb_w ); DECLARE_READ8_MEMBER( via_pa_r ); DECLARE_WRITE8_MEMBER( via_pb_w ); - DECLARE_READ_LINE_MEMBER( ready_r ); - DECLARE_READ_LINE_MEMBER( err_r ); DECLARE_WRITE_LINE_MEMBER( mode_sel_w ); DECLARE_WRITE_LINE_MEMBER( rw_sel_w ); DECLARE_READ8_MEMBER( pi_r ); diff --git a/src/emu/bus/vic20/vic1112.c b/src/emu/bus/vic20/vic1112.c index 8a899cac8fe..93b9c13c94b 100644 --- a/src/emu/bus/vic20/vic1112.c +++ b/src/emu/bus/vic20/vic1112.c @@ -107,7 +107,6 @@ static MACHINE_CONFIG_FRAGMENT( vic1112 ) MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, 0) MCFG_VIA6522_READPB_HANDLER(DEVREAD8(IEEE488_TAG, ieee488_device, dio_r)) - MCFG_VIA6522_READCB1_HANDLER(DEVREADLINE(IEEE488_TAG, ieee488_device, srq_r)) MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(IEEE488_TAG, ieee488_device, dio_w)) MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(IEEE488_TAG, ieee488_device, atn_w)) MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(IEEE488_TAG, ieee488_device, eoi_w)) diff --git a/src/mess/drivers/pet.c b/src/mess/drivers/pet.c index 113ff5c3e2f..e0313081bdd 100644 --- a/src/mess/drivers/pet.c +++ b/src/mess/drivers/pet.c @@ -1449,7 +1449,6 @@ static MACHINE_CONFIG_START( pet, pet_state ) MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_8MHz/8) MCFG_VIA6522_READPA_HANDLER(DEVREAD8(PET_USER_PORT_TAG, pet_user_port_device, pa_r)) MCFG_VIA6522_READPB_HANDLER(READ8(pet_state, via_pb_r)) - MCFG_VIA6522_READCB1_HANDLER(DEVREADLINE(PET_DATASSETTE_PORT2_TAG, pet_datassette_port_device, read)) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(pet_state, via_pa_w)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(pet_state, via_pb_w)) MCFG_VIA6522_CA1_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, ca1_w)) @@ -1739,7 +1738,6 @@ static MACHINE_CONFIG_START( pet80, pet80_state ) MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL_16MHz/16) MCFG_VIA6522_READPA_HANDLER(DEVREAD8(PET_USER_PORT_TAG, pet_user_port_device, pa_r)) MCFG_VIA6522_READPB_HANDLER(READ8(pet_state, via_pb_r)) - MCFG_VIA6522_READCB1_HANDLER(DEVREADLINE(PET_DATASSETTE_PORT2_TAG, pet_datassette_port_device, read)) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(pet_state, via_pa_w)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(pet_state, via_pb_w)) MCFG_VIA6522_CA1_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, ca1_w))