From c8c13800b8d45f8b4ce614220c12722c776f34eb Mon Sep 17 00:00:00 2001 From: smf- Date: Wed, 1 Jan 2014 14:39:45 +0000 Subject: [PATCH] removed ca1/cb1/ca2/cb2 callback, they don't do anything [smf] --- src/mess/drivers/cat.c | 74 ++++++------------------------------------ 1 file changed, 10 insertions(+), 64 deletions(-) diff --git a/src/mess/drivers/cat.c b/src/mess/drivers/cat.c index e701381d79a..51c0f8953d3 100644 --- a/src/mess/drivers/cat.c +++ b/src/mess/drivers/cat.c @@ -460,15 +460,11 @@ public: DECLARE_WRITE8_MEMBER(swyft_via0_w); DECLARE_READ8_MEMBER(via0_pa_r); DECLARE_WRITE8_MEMBER(via0_pa_w); - DECLARE_READ_LINE_MEMBER(via0_ca1_r); DECLARE_WRITE_LINE_MEMBER(via0_ca1_w); - DECLARE_READ_LINE_MEMBER(via0_ca2_r); DECLARE_WRITE_LINE_MEMBER(via0_ca2_w); DECLARE_READ8_MEMBER(via0_pb_r); DECLARE_WRITE8_MEMBER(via0_pb_w); - DECLARE_READ_LINE_MEMBER(via0_cb1_r); DECLARE_WRITE_LINE_MEMBER(via0_cb1_w); - DECLARE_READ_LINE_MEMBER(via0_cb2_r); DECLARE_WRITE_LINE_MEMBER(via0_cb2_w); DECLARE_WRITE_LINE_MEMBER(via0_int_w); @@ -476,15 +472,11 @@ public: DECLARE_WRITE8_MEMBER(swyft_via1_w); DECLARE_READ8_MEMBER(via1_pa_r); DECLARE_WRITE8_MEMBER(via1_pa_w); - DECLARE_READ_LINE_MEMBER(via1_ca1_r); DECLARE_WRITE_LINE_MEMBER(via1_ca1_w); - DECLARE_READ_LINE_MEMBER(via1_ca2_r); DECLARE_WRITE_LINE_MEMBER(via1_ca2_w); DECLARE_READ8_MEMBER(via1_pb_r); DECLARE_WRITE8_MEMBER(via1_pb_w); - DECLARE_READ_LINE_MEMBER(via1_cb1_r); DECLARE_WRITE_LINE_MEMBER(via1_cb1_w); - DECLARE_READ_LINE_MEMBER(via1_cb2_r); DECLARE_WRITE_LINE_MEMBER(via1_cb2_w); DECLARE_WRITE_LINE_MEMBER(via1_int_w); @@ -1269,6 +1261,16 @@ ADDRESS_MAP_END MACHINE_START_MEMBER(cat_state,swyft) { //m_6ms_timer = timer_alloc(TIMER_COUNTER_6MS); // CRUDE HACK + + m_via0->write_ca1(1); + m_via0->write_ca2(1); + m_via0->write_cb1(1); + m_via0->write_cb2(1); + + m_via1->write_ca1(1); + m_via1->write_ca2(1); + m_via1->write_cb1(1); + m_via1->write_cb2(1); } MACHINE_RESET_MEMBER(cat_state,swyft) @@ -1378,23 +1380,11 @@ WRITE8_MEMBER( cat_state::via0_pa_w ) logerror("VIA0: Port A written with data of 0x%02x!\n", data); } -READ_LINE_MEMBER ( cat_state::via0_ca1_r ) -{ - logerror("VIA0: CA1 read!\n"); - return 1; -} - WRITE_LINE_MEMBER ( cat_state::via0_ca1_w ) { logerror("VIA0: CA1 written with %d!\n", state); } -READ_LINE_MEMBER ( cat_state::via0_ca2_r ) -{ - logerror("VIA0: CA2 read!\n"); - return 1; -} - WRITE_LINE_MEMBER ( cat_state::via0_ca2_w ) { logerror("VIA0: CA2 written with %d!\n", state); @@ -1411,23 +1401,11 @@ WRITE8_MEMBER( cat_state::via0_pb_w ) logerror("VIA0: Port B written with data of 0x%02x!\n", data); } -READ_LINE_MEMBER ( cat_state::via0_cb1_r ) -{ - logerror("VIA0: CB1 read!\n"); - return 1; -} - WRITE_LINE_MEMBER ( cat_state::via0_cb1_w ) { logerror("VIA0: CB1 written with %d!\n", state); } -READ_LINE_MEMBER ( cat_state::via0_cb2_r ) -{ - logerror("VIA0: CB2 read!\n"); - return 1; -} - WRITE_LINE_MEMBER ( cat_state::via0_cb2_w ) { logerror("VIA0: CB2 written with %d!\n", state); @@ -1450,23 +1428,11 @@ WRITE8_MEMBER( cat_state::via1_pa_w ) logerror(" VIA1: Port A written with data of 0x%02x!\n", data); } -READ_LINE_MEMBER ( cat_state::via1_ca1_r ) -{ - logerror(" VIA1: CA1 read!\n"); - return 1; -} - WRITE_LINE_MEMBER ( cat_state::via1_ca1_w ) { logerror(" VIA1: CA1 written with %d!\n", state); } -READ_LINE_MEMBER ( cat_state::via1_ca2_r ) -{ - logerror(" VIA1: CA2 read!\n"); - return 1; -} - WRITE_LINE_MEMBER ( cat_state::via1_ca2_w ) { logerror(" VIA1: CA2 written with %d!\n", state); @@ -1483,23 +1449,11 @@ WRITE8_MEMBER( cat_state::via1_pb_w ) logerror(" VIA1: Port B written with data of 0x%02x!\n", data); } -READ_LINE_MEMBER ( cat_state::via1_cb1_r ) -{ - logerror(" VIA1: CB1 read!\n"); - return 1; -} - WRITE_LINE_MEMBER ( cat_state::via1_cb1_w ) { logerror(" VIA1: CB1 written with %d!\n", state); } -READ_LINE_MEMBER ( cat_state::via1_cb2_r ) -{ - logerror(" VIA1: CB2 read!\n"); - return 1; -} - WRITE_LINE_MEMBER ( cat_state::via1_cb2_w ) { logerror(" VIA1: CB2 written with %d!\n", state); @@ -1536,10 +1490,6 @@ static MACHINE_CONFIG_START( swyft, cat_state ) MCFG_DEVICE_ADD("via6522_0", VIA6522, XTAL_15_8976MHz/16) // unknown clock, GUESSED MCFG_VIA6522_READPA_HANDLER(READ8(cat_state, via0_pa_r)) MCFG_VIA6522_READPB_HANDLER(READ8(cat_state, via0_pb_r)) - MCFG_VIA6522_READCA1_HANDLER(READLINE(cat_state, via0_ca1_r)) - MCFG_VIA6522_READCB1_HANDLER(READLINE(cat_state, via0_cb1_r)) - MCFG_VIA6522_READCA2_HANDLER(READLINE(cat_state, via0_ca2_r)) - MCFG_VIA6522_READCB2_HANDLER(READLINE(cat_state, via0_cb2_r)) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(cat_state, via0_pa_w)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(cat_state, via0_pb_w)) MCFG_VIA6522_CA1_HANDLER(WRITELINE(cat_state, via0_ca1_w)) @@ -1551,10 +1501,6 @@ static MACHINE_CONFIG_START( swyft, cat_state ) MCFG_DEVICE_ADD("via6522_1", VIA6522, XTAL_15_8976MHz/16) // unknown clock, GUESSED MCFG_VIA6522_READPA_HANDLER(READ8(cat_state, via1_pa_r)) MCFG_VIA6522_READPB_HANDLER(READ8(cat_state, via1_pb_r)) - MCFG_VIA6522_READCA1_HANDLER(READLINE(cat_state, via1_ca1_r)) - MCFG_VIA6522_READCB1_HANDLER(READLINE(cat_state, via1_cb1_r)) - MCFG_VIA6522_READCA2_HANDLER(READLINE(cat_state, via1_ca2_r)) - MCFG_VIA6522_READCB2_HANDLER(READLINE(cat_state, via1_cb2_r)) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(cat_state, via1_pa_w)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(cat_state, via1_pb_w)) MCFG_VIA6522_CA1_HANDLER(WRITELINE(cat_state, via1_ca1_w))