From c838911c410a5a8c1fd707c87dac12c607ec6993 Mon Sep 17 00:00:00 2001 From: smf- Date: Wed, 1 Jan 2014 15:20:26 +0000 Subject: [PATCH] removed more ca*/ca* callbacks [smf] --- src/mess/drivers/victor9k.c | 39 +++--------------------------------- src/mess/includes/victor9k.h | 6 ------ 2 files changed, 3 insertions(+), 42 deletions(-) diff --git a/src/mess/drivers/victor9k.c b/src/mess/drivers/victor9k.c index 58816cb9532..9748fed3a7d 100644 --- a/src/mess/drivers/victor9k.c +++ b/src/mess/drivers/victor9k.c @@ -731,16 +731,6 @@ WRITE8_MEMBER( victor9k_state::via4_pb_w ) m_st[1] = data >> 4; } -READ_LINE_MEMBER( victor9k_state::ds0_r ) -{ - return m_ds0; -} - -READ_LINE_MEMBER( victor9k_state::ds1_r ) -{ - return m_ds1; -} - WRITE_LINE_MEMBER( victor9k_state::mode_w ) { } @@ -791,21 +781,6 @@ WRITE8_MEMBER( victor9k_state::via5_pb_w ) */ } -READ_LINE_MEMBER( victor9k_state::brdy_r ) -{ - return m_brdy; -} - -READ_LINE_MEMBER( victor9k_state::rdy0_r ) -{ - return m_rdy0; -} - -READ_LINE_MEMBER( victor9k_state::rdy1_r ) -{ - return m_rdy1; -} - WRITE_LINE_MEMBER( victor9k_state::via5_irq_w ) { m_via5_irq = state; @@ -943,11 +918,6 @@ WRITE8_MEMBER( victor9k_state::via6_pb_w ) m_stp[1] = BIT(data, 7); } -READ_LINE_MEMBER( victor9k_state::gcrerr_r ) -{ - return m_gcrerr; -} - WRITE_LINE_MEMBER( victor9k_state::drw_w ) { } @@ -1055,6 +1025,9 @@ void victor9k_state::machine_start() // memory banking address_space &program = m_maincpu->space(AS_PROGRAM); program.install_ram(0x00000, m_ram->size() - 1, m_ram->pointer()); + + m_via5->write_ca1(m_brdy); + m_via6->write_ca1(m_gcrerr); } @@ -1130,8 +1103,6 @@ static MACHINE_CONFIG_START( victor9k, victor9k_state ) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(victor9k_state, via3_irq_w)) MCFG_DEVICE_ADD(M6522_4_TAG, VIA6522, XTAL_30MHz/30) - MCFG_VIA6522_READCA1_HANDLER(READLINE(victor9k_state, ds0_r)) - MCFG_VIA6522_READCB1_HANDLER(READLINE(victor9k_state, ds1_r)) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(victor9k_state, via4_pa_w)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(victor9k_state, via4_pb_w)) MCFG_VIA6522_CA2_HANDLER(WRITELINE(victor9k_state, mode_w)) @@ -1139,16 +1110,12 @@ static MACHINE_CONFIG_START( victor9k, victor9k_state ) MCFG_DEVICE_ADD(M6522_5_TAG, VIA6522, XTAL_30MHz/30) MCFG_VIA6522_READPA_HANDLER(READ8(victor9k_state, via5_pa_r)) - MCFG_VIA6522_READCA1_HANDLER(READLINE(victor9k_state, brdy_r)) - MCFG_VIA6522_READCA2_HANDLER(READLINE(victor9k_state, rdy0_r)) - MCFG_VIA6522_READCB2_HANDLER(READLINE(victor9k_state, rdy1_r)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(victor9k_state, via5_pb_w)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(victor9k_state, via5_irq_w)) MCFG_DEVICE_ADD(M6522_6_TAG, VIA6522, XTAL_30MHz/30) MCFG_VIA6522_READPA_HANDLER(READ8(victor9k_state, via6_pa_r)) MCFG_VIA6522_READPB_HANDLER(READ8(victor9k_state, via6_pb_r)) - MCFG_VIA6522_READCA1_HANDLER(READLINE(victor9k_state, gcrerr_r)) MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(victor9k_state, via6_pa_w)) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(victor9k_state, via6_pb_w)) MCFG_VIA6522_CA2_HANDLER(WRITELINE(victor9k_state, drw_w)) diff --git a/src/mess/includes/victor9k.h b/src/mess/includes/victor9k.h index c4e5de50d38..e2b1d9c0732 100644 --- a/src/mess/includes/victor9k.h +++ b/src/mess/includes/victor9k.h @@ -143,23 +143,17 @@ public: DECLARE_WRITE8_MEMBER( via4_pa_w ); DECLARE_WRITE8_MEMBER( via4_pb_w ); - DECLARE_READ_LINE_MEMBER( ds0_r ); - DECLARE_READ_LINE_MEMBER( ds1_r ); DECLARE_WRITE_LINE_MEMBER( mode_w ); DECLARE_WRITE_LINE_MEMBER( via4_irq_w ); DECLARE_READ8_MEMBER( via5_pa_r ); DECLARE_WRITE8_MEMBER( via5_pb_w ); - DECLARE_READ_LINE_MEMBER( brdy_r ); - DECLARE_READ_LINE_MEMBER( rdy0_r ); - DECLARE_READ_LINE_MEMBER( rdy1_r ); DECLARE_WRITE_LINE_MEMBER( via5_irq_w ); DECLARE_READ8_MEMBER( via6_pa_r ); DECLARE_READ8_MEMBER( via6_pb_r ); DECLARE_WRITE8_MEMBER( via6_pa_w ); DECLARE_WRITE8_MEMBER( via6_pb_w ); - DECLARE_READ_LINE_MEMBER( gcrerr_r ); DECLARE_WRITE_LINE_MEMBER( drw_w ); DECLARE_WRITE_LINE_MEMBER( erase_w ); DECLARE_WRITE_LINE_MEMBER( kbrdy_w );