diff options
author | smf- <smf-@users.noreply.github.com> | 2014-01-06 19:06:08 +0000 |
---|---|---|
committer | smf- <smf-@users.noreply.github.com> | 2014-01-06 19:06:08 +0000 |
commit | dc824e9dc2bb11e0920d4977c0826eff34558425 (patch) | |
tree | dd13d323ddb8ac5e4d370403bf0fb22b2f8a4b5d /src | |
parent | 724ccc661357bede636f3ed548937181bab216e6 (diff) |
Removed 6821 porta_r/portb_r/ca1_r/ca2_r/cb1_r/cb2_r functions as they only returned what you'd written to the chip, only a couple of those were ever used (by audio/exidy.c). Removed some ca*/cb* read callbacks that just returned what had already been pushed or always returned 0. As there are no longer any cb2 read callbacks that functionality has been removed. [smf]
Diffstat (limited to 'src')
-rw-r--r-- | src/emu/machine/6821pia.c | 70 | ||||
-rw-r--r-- | src/emu/machine/6821pia.h | 13 | ||||
-rw-r--r-- | src/mame/audio/exidy.c | 25 | ||||
-rw-r--r-- | src/mame/audio/exidy.h | 3 | ||||
-rw-r--r-- | src/mame/drivers/icecold.c | 7 | ||||
-rw-r--r-- | src/mame/drivers/s11.c | 12 | ||||
-rw-r--r-- | src/mame/drivers/s11a.c | 2 | ||||
-rw-r--r-- | src/mame/drivers/s11b.c | 2 | ||||
-rw-r--r-- | src/mame/drivers/s11c.c | 1 | ||||
-rw-r--r-- | src/mame/drivers/s8.c | 11 | ||||
-rw-r--r-- | src/mame/drivers/s9.c | 11 | ||||
-rw-r--r-- | src/mame/includes/s11.h | 2 | ||||
-rw-r--r-- | src/mess/drivers/apf.c | 56 | ||||
-rw-r--r-- | src/mess/drivers/bw12.c | 6 | ||||
-rw-r--r-- | src/mess/drivers/d6800.c | 36 | ||||
-rw-r--r-- | src/mess/drivers/poly.c | 9 | ||||
-rw-r--r-- | src/mess/drivers/tek405x.c | 63 | ||||
-rw-r--r-- | src/mess/includes/bw12.h | 1 | ||||
-rw-r--r-- | src/mess/includes/tek405x.h | 10 |
19 files changed, 43 insertions, 297 deletions
diff --git a/src/emu/machine/6821pia.c b/src/emu/machine/6821pia.c index 0a21f997c3e..714fc82abcc 100644 --- a/src/emu/machine/6821pia.c +++ b/src/emu/machine/6821pia.c @@ -54,7 +54,6 @@ pia6821_device::pia6821_device(const machine_config &mconfig, const char *tag, d m_in_ca1_handler(*this), m_in_cb1_handler(*this), m_in_ca2_handler(*this), - m_in_cb2_handler(*this), m_out_a_handler(*this), m_out_b_handler(*this), m_ca2_handler(*this), @@ -81,7 +80,6 @@ void pia6821_device::device_start() m_in_ca1_handler.resolve(); m_in_cb1_handler.resolve(); m_in_ca2_handler.resolve(); - m_in_cb2_handler.resolve(); m_out_a_handler.resolve(); m_out_b_handler.resolve(); m_ca2_handler.resolve(); @@ -550,13 +548,9 @@ UINT8 pia6821_device::control_b_r() m_logged_cb1_not_connected = true; } - if(!m_in_cb2_handler.isnull()) + if(!m_logged_cb2_not_connected && C2_INPUT(m_ctl_b) && !m_in_cb2_pushed) { - cb2_w(m_in_cb2_handler()); - } - else if(!m_logged_cb2_not_connected && C2_INPUT(m_ctl_b) && !m_in_cb2_pushed) - { - logerror("PIA #%s: Error! No CB2 read handler. Three-state pin is undefined\n", tag()); + logerror("PIA #%s: Error! Three-state pin is undefined\n", tag()); m_logged_cb2_not_connected = true; } @@ -893,16 +887,6 @@ void pia6821_device::reg_w(UINT8 offset, UINT8 data) //------------------------------------------------- -// porta_r -//------------------------------------------------- - -READ8_MEMBER( pia6821_device::porta_r ) -{ - return m_in_a; -} - - -//------------------------------------------------- // set_a_input //------------------------------------------------- @@ -941,16 +925,6 @@ UINT8 pia6821_device::a_output() //------------------------------------------------- -// ca1_r -//------------------------------------------------- - -READ_LINE_MEMBER( pia6821_device::ca1_r ) -{ - return m_in_ca1; -} - - -//------------------------------------------------- // ca1_w //------------------------------------------------- @@ -983,16 +957,6 @@ WRITE_LINE_MEMBER( pia6821_device::ca1_w ) //------------------------------------------------- -// ca2_r -//------------------------------------------------- - -READ_LINE_MEMBER( pia6821_device::ca2_r ) -{ - return m_in_ca2; -} - - -//------------------------------------------------- // ca2_w //------------------------------------------------- @@ -1046,16 +1010,6 @@ int pia6821_device::ca2_output_z() //------------------------------------------------- -// portb_r -//------------------------------------------------- - -READ8_MEMBER( pia6821_device::portb_r ) -{ - return m_in_b; -} - - -//------------------------------------------------- // portb_w //------------------------------------------------- @@ -1083,16 +1037,6 @@ UINT8 pia6821_device::b_output() //------------------------------------------------- -// cb1_r -//------------------------------------------------- - -READ_LINE_MEMBER( pia6821_device::cb1_r ) -{ - return m_in_cb1; -} - - -//------------------------------------------------- // cb1_w //------------------------------------------------- @@ -1124,16 +1068,6 @@ WRITE_LINE_MEMBER( pia6821_device::cb1_w ) //------------------------------------------------- -// cb2_r -//------------------------------------------------- - -READ_LINE_MEMBER( pia6821_device::cb2_r ) -{ - return m_in_cb2; -} - - -//------------------------------------------------- // cb2_w //------------------------------------------------- diff --git a/src/emu/machine/6821pia.h b/src/emu/machine/6821pia.h index 3a9a806453c..01345fa30db 100644 --- a/src/emu/machine/6821pia.h +++ b/src/emu/machine/6821pia.h @@ -46,9 +46,6 @@ #define MCFG_PIA6821_READCB1_HANDLER(_devcb) \ devcb = &pia6821_device::set_readcb1_handler(*device, DEVCB2_##_devcb); -#define MCFG_PIA6821_READCB2_HANDLER(_devcb) \ - devcb = &pia6821_device::set_readcb2_handler(*device, DEVCB2_##_devcb); - // TODO: CONVERT THESE TO WRITE LINE #define MCFG_PIA6821_WRITEPA_HANDLER(_devcb) \ devcb = &pia6821_device::set_writepa_handler(*device, DEVCB2_##_devcb); @@ -88,7 +85,6 @@ public: template<class _Object> static devcb2_base &set_readca1_handler(device_t &device, _Object object) { return downcast<pia6821_device &>(device).m_in_ca1_handler.set_callback(object); } template<class _Object> static devcb2_base &set_readca2_handler(device_t &device, _Object object) { return downcast<pia6821_device &>(device).m_in_ca2_handler.set_callback(object); } template<class _Object> static devcb2_base &set_readcb1_handler(device_t &device, _Object object) { return downcast<pia6821_device &>(device).m_in_cb1_handler.set_callback(object); } - template<class _Object> static devcb2_base &set_readcb2_handler(device_t &device, _Object object) { return downcast<pia6821_device &>(device).m_in_cb2_handler.set_callback(object); } // TODO: CONVERT THESE TO WRITE LINE template<class _Object> static devcb2_base &set_writepa_handler(device_t &device, _Object object) { return downcast<pia6821_device &>(device).m_out_a_handler.set_callback(object); } @@ -107,31 +103,23 @@ public: UINT8 port_b_z_mask() const { return ~m_ddr_b; } // see first note in .c void set_port_a_z_mask(UINT8 data) { m_port_a_z_mask = data; }// see second note in .c - DECLARE_READ8_MEMBER( porta_r ); - UINT8 porta_r() { return porta_r(machine().driver_data()->generic_space(), 0); } DECLARE_WRITE8_MEMBER( porta_w ); void porta_w(UINT8 data) { porta_w(machine().driver_data()->generic_space(), 0, data); } void set_a_input(UINT8 data, UINT8 z_mask); UINT8 a_output(); - DECLARE_READ_LINE_MEMBER( ca1_r ); DECLARE_WRITE_LINE_MEMBER( ca1_w ); - DECLARE_READ_LINE_MEMBER( ca2_r ); DECLARE_WRITE_LINE_MEMBER( ca2_w ); int ca2_output(); int ca2_output_z(); - DECLARE_READ8_MEMBER( portb_r ); - UINT8 portb_r() { return portb_r(machine().driver_data()->generic_space(), 0); } DECLARE_WRITE8_MEMBER( portb_w ); void portb_w(UINT8 data) { portb_w(machine().driver_data()->generic_space(), 0, data); } UINT8 b_output(); - DECLARE_READ_LINE_MEMBER( cb1_r ); DECLARE_WRITE_LINE_MEMBER( cb1_w ); - DECLARE_READ_LINE_MEMBER( cb2_r ); DECLARE_WRITE_LINE_MEMBER( cb2_w ); int cb2_output(); int cb2_output_z(); @@ -184,7 +172,6 @@ private: devcb2_read_line m_in_ca1_handler; devcb2_read_line m_in_cb1_handler; devcb2_read_line m_in_ca2_handler; - devcb2_read_line m_in_cb2_handler; devcb2_write8 m_out_a_handler; devcb2_write8 m_out_b_handler; devcb2_write_line m_ca2_handler; diff --git a/src/mame/audio/exidy.c b/src/mame/audio/exidy.c index 93f2f465ca6..ddb2d88720f 100644 --- a/src/mame/audio/exidy.c +++ b/src/mame/audio/exidy.c @@ -870,7 +870,8 @@ READ8_MEMBER( victory_sound_device::response_r ) if (VICTORY_LOG_SOUND) logerror("%04X:!!!! Sound response read = %02X\n", m_maincpu->pcbase(), ret); - m_pia1->cb1_w(0); + m_pia1_cb1 = 0; + m_pia1->cb1_w(m_pia1_cb1); return ret; } @@ -878,7 +879,7 @@ READ8_MEMBER( victory_sound_device::response_r ) READ8_MEMBER( victory_sound_device::status_r ) { - UINT8 ret = (m_pia1->ca1_r() << 7) | (m_pia1->cb1_r() << 6); + UINT8 ret = (m_pia1_ca1 << 7) | (m_pia1_cb1 << 6); if (VICTORY_LOG_SOUND) logerror("%04X:!!!! Sound status read = %02X\n", m_maincpu->pcbase(), ret); @@ -889,7 +890,8 @@ READ8_MEMBER( victory_sound_device::status_r ) TIMER_CALLBACK_MEMBER( victory_sound_device::delayed_command_w ) { m_pia1->set_a_input(param, 0); - m_pia1->ca1_w(0); + m_pia1_ca1 = 0; + m_pia1->ca1_w(m_pia1_ca1); } WRITE8_MEMBER( victory_sound_device::command_w ) @@ -904,7 +906,11 @@ WRITE_LINE_MEMBER( victory_sound_device::irq_clear_w ) { if (VICTORY_LOG_SOUND) logerror("%s:!!!! Sound IRQ clear = %02X\n", machine().describe_context(), state); - if (!state) m_pia1->ca1_w(1); + if (!state) + { + m_pia1_ca1 = 1; + m_pia1->ca1_w(m_pia1_ca1); + } } @@ -913,7 +919,10 @@ WRITE_LINE_MEMBER( victory_sound_device::main_ack_w ) if (VICTORY_LOG_SOUND) logerror("%s:!!!! Sound Main ACK W = %02X\n", machine().describe_context(), state); if (m_victory_sound_response_ack_clk && !state) - m_pia1->cb1_w(1); + { + m_pia1_cb1 = 1; + m_pia1->cb1_w(m_pia1_cb1); + } m_victory_sound_response_ack_clk = state; } @@ -979,12 +988,14 @@ void victory_sound_device::device_reset() /* the flip-flop @ F4 is reset */ m_victory_sound_response_ack_clk = 0; - m_pia1->cb1_w(1); + m_pia1_cb1 = 1; + m_pia1->cb1_w(m_pia1_cb1); /* these two lines shouldn't be needed, but it avoids the log entry as the sound CPU checks port A before the main CPU ever writes to it */ m_pia1->set_a_input(0, 0); - m_pia1->ca1_w(1); + m_pia1_ca1 = 1; + m_pia1->ca1_w(m_pia1_ca1); } //------------------------------------------------- diff --git a/src/mame/audio/exidy.h b/src/mame/audio/exidy.h index 51cfd2a8e68..28e26882a11 100644 --- a/src/mame/audio/exidy.h +++ b/src/mame/audio/exidy.h @@ -164,6 +164,9 @@ private: UINT8 m_victory_sound_response_ack_clk; /* 7474 @ F4 */ TIMER_CALLBACK_MEMBER( delayed_command_w ); + + int m_pia1_ca1; + int m_pia1_cb1; }; extern const device_type EXIDY_VICTORY; diff --git a/src/mame/drivers/icecold.c b/src/mame/drivers/icecold.c index 12d05730e00..e7b7f1ec958 100644 --- a/src/mame/drivers/icecold.c +++ b/src/mame/drivers/icecold.c @@ -35,7 +35,6 @@ public: DECLARE_WRITE8_MEMBER( ay8910_0_b_w ); DECLARE_WRITE8_MEMBER( ay8910_1_a_w ); DECLARE_WRITE8_MEMBER( ay8910_1_b_w ); - DECLARE_READ_LINE_MEMBER( sint_r ); DECLARE_WRITE8_MEMBER( motors_w ); // driver_device overrides @@ -285,11 +284,6 @@ WRITE8_MEMBER( icecold_state::ay8910_1_b_w ) } } -READ_LINE_MEMBER( icecold_state::sint_r ) -{ - return m_sint; -} - TIMER_DEVICE_CALLBACK_MEMBER(icecold_state::icecold_sint_timer) { m_sint = !m_sint; @@ -378,7 +372,6 @@ static MACHINE_CONFIG_START( icecold, icecold_state ) MCFG_DEVICE_ADD( "pia1", PIA6821, 0) MCFG_PIA6821_READPA_HANDLER(READ8(icecold_state, ay_r)) - MCFG_PIA6821_READCA1_HANDLER(READLINE(icecold_state, sint_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)) diff --git a/src/mame/drivers/s11.c b/src/mame/drivers/s11.c index c0268f46482..c593a2147d2 100644 --- a/src/mame/drivers/s11.c +++ b/src/mame/drivers/s11.c @@ -213,11 +213,10 @@ WRITE8_MEMBER( s11_state::sound_w ) WRITE_LINE_MEMBER( s11_state::pia21_ca2_w ) { // sound ns - m_ca1 = state; if(m_pias) - m_pias->ca1_w(m_ca1); + m_pias->ca1_w(state); if(m_pia40) - m_pia40->cb2_w(m_ca1); + m_pia40->cb2_w(state); } WRITE8_MEMBER( s11_state::lamp0_w ) @@ -327,11 +326,6 @@ WRITE8_MEMBER( s11_state::bank_w ) membank("bank1")->set_entry(BIT(data, 0)); } -READ_LINE_MEMBER( s11_state::pias_ca1_r ) -{ - return m_ca1; -} - WRITE_LINE_MEMBER( s11_state::pias_ca2_w ) { // speech clock @@ -470,7 +464,6 @@ static MACHINE_CONFIG_START( s11, s11_state ) MCFG_DEVICE_ADD("pias", PIA6821, 0) MCFG_PIA6821_READPA_HANDLER(READ8(s11_state, dac_r)) - MCFG_PIA6821_READCA1_HANDLER(READLINE(s11_state, pias_ca1_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)) @@ -491,7 +484,6 @@ static MACHINE_CONFIG_START( s11, s11_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50) MCFG_DEVICE_ADD("pia40", PIA6821, 0) - MCFG_PIA6821_READCA1_HANDLER(READLINE(s11_state, pias_ca1_r)) 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)) diff --git a/src/mame/drivers/s11a.c b/src/mame/drivers/s11a.c index 089d1804625..79350b2cbe5 100644 --- a/src/mame/drivers/s11a.c +++ b/src/mame/drivers/s11a.c @@ -244,7 +244,6 @@ static MACHINE_CONFIG_START( s11a, s11a_state ) MCFG_DEVICE_ADD("pias", PIA6821, 0) MCFG_PIA6821_READPA_HANDLER(READ8(s11_state, dac_r)) - MCFG_PIA6821_READCA1_HANDLER(READLINE(s11_state, pias_ca1_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)) @@ -264,7 +263,6 @@ static MACHINE_CONFIG_START( s11a, s11a_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50) MCFG_DEVICE_ADD("pia40", PIA6821, 0) - MCFG_PIA6821_READCA1_HANDLER(READLINE(s11_state, pias_ca1_r)) 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)) diff --git a/src/mame/drivers/s11b.c b/src/mame/drivers/s11b.c index 7c427e68b26..67dc34a91b1 100644 --- a/src/mame/drivers/s11b.c +++ b/src/mame/drivers/s11b.c @@ -323,7 +323,6 @@ static MACHINE_CONFIG_START( s11b, s11b_state ) MCFG_DEVICE_ADD("pias", PIA6821, 0) MCFG_PIA6821_READPA_HANDLER(READ8(s11_state, dac_r)) - MCFG_PIA6821_READCA1_HANDLER(READLINE(s11_state, pias_ca1_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)) @@ -348,7 +347,6 @@ static MACHINE_CONFIG_START( s11b, s11b_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speech", 0.50) MCFG_DEVICE_ADD("pia40", PIA6821, 0) - MCFG_PIA6821_READCA1_HANDLER(READLINE(s11_state, pias_ca1_r)) 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)) diff --git a/src/mame/drivers/s11c.c b/src/mame/drivers/s11c.c index 563514b370d..ab6232184f4 100644 --- a/src/mame/drivers/s11c.c +++ b/src/mame/drivers/s11c.c @@ -232,7 +232,6 @@ static MACHINE_CONFIG_START( s11c, s11c_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50) MCFG_DEVICE_ADD("pia40", PIA6821, 0) - MCFG_PIA6821_READCA1_HANDLER(READLINE(s11_state, pias_ca1_r)) 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)) diff --git a/src/mame/drivers/s8.c b/src/mame/drivers/s8.c index 7d4c0ca5015..1220cc3c534 100644 --- a/src/mame/drivers/s8.c +++ b/src/mame/drivers/s8.c @@ -74,7 +74,6 @@ public: DECLARE_READ8_MEMBER(dips_r); DECLARE_READ8_MEMBER(switch_r); DECLARE_WRITE8_MEMBER(switch_w); - DECLARE_READ_LINE_MEMBER(pias_ca1_r); DECLARE_READ_LINE_MEMBER(pia21_ca1_r); DECLARE_READ_LINE_MEMBER(pia28_ca1_r); DECLARE_READ_LINE_MEMBER(pia28_cb1_r); @@ -105,7 +104,6 @@ private: UINT8 m_sound_data; UINT8 m_strobe; UINT8 m_kbdrow; - bool m_ca1; bool m_data_ok; }; @@ -243,8 +241,7 @@ READ_LINE_MEMBER( s8_state::pia21_ca1_r ) WRITE_LINE_MEMBER( s8_state::pia21_ca2_w ) { // sound ns - m_ca1 = state; - m_pias->ca1_w(m_ca1); + m_pias->ca1_w(state); } WRITE8_MEMBER( s8_state::lamp0_w ) @@ -294,11 +291,6 @@ WRITE8_MEMBER( s8_state::switch_w ) m_kbdrow = data; } -READ_LINE_MEMBER( s8_state::pias_ca1_r ) -{ - return m_ca1; -} - WRITE_LINE_MEMBER( s8_state::pias_ca2_w ) { // speech clock @@ -385,7 +377,6 @@ static MACHINE_CONFIG_START( s8, s8_state ) MCFG_DEVICE_ADD("pias", PIA6821, 0) MCFG_PIA6821_READPA_HANDLER(READ8(s8_state, dac_r)) - MCFG_PIA6821_READCA1_HANDLER(READLINE(s8_state, pias_ca1_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)) diff --git a/src/mame/drivers/s9.c b/src/mame/drivers/s9.c index 528d09fedce..314c810fbb6 100644 --- a/src/mame/drivers/s9.c +++ b/src/mame/drivers/s9.c @@ -52,7 +52,6 @@ public: DECLARE_READ8_MEMBER(dips_r); DECLARE_READ8_MEMBER(switch_r); DECLARE_WRITE8_MEMBER(switch_w); - DECLARE_READ_LINE_MEMBER(pias_ca1_r); DECLARE_READ_LINE_MEMBER(pia21_ca1_r); DECLARE_READ_LINE_MEMBER(pia28_ca1_r); DECLARE_READ_LINE_MEMBER(pia28_cb1_r); @@ -84,7 +83,6 @@ private: UINT8 m_sound_data; UINT8 m_strobe; UINT8 m_kbdrow; - bool m_ca1; bool m_data_ok; }; @@ -221,8 +219,7 @@ READ_LINE_MEMBER( s9_state::pia21_ca1_r ) WRITE_LINE_MEMBER( s9_state::pia21_ca2_w ) { // sound ns - m_ca1 = state; - m_pias->ca1_w(m_ca1); + m_pias->ca1_w(state); } WRITE8_MEMBER( s9_state::lamp0_w ) @@ -272,11 +269,6 @@ WRITE8_MEMBER( s9_state::switch_w ) m_kbdrow = data; } -READ_LINE_MEMBER( s9_state::pias_ca1_r ) -{ - return m_ca1; -} - WRITE_LINE_MEMBER( s9_state::pias_ca2_w ) { // speech clock @@ -368,7 +360,6 @@ static MACHINE_CONFIG_START( s9, s9_state ) MCFG_DEVICE_ADD("pias", PIA6821, 0) MCFG_PIA6821_READPA_HANDLER(READ8(s9_state, dac_r)) - MCFG_PIA6821_READCA1_HANDLER(READLINE(s9_state, pias_ca1_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)) diff --git a/src/mame/includes/s11.h b/src/mame/includes/s11.h index 9cc481c09d8..4236f2c4722 100644 --- a/src/mame/includes/s11.h +++ b/src/mame/includes/s11.h @@ -61,7 +61,6 @@ public: DECLARE_READ8_MEMBER(dips_r); DECLARE_READ8_MEMBER(switch_r); DECLARE_WRITE8_MEMBER(switch_w); - DECLARE_READ_LINE_MEMBER(pias_ca1_r); DECLARE_READ_LINE_MEMBER(pia21_ca1_r); DECLARE_READ8_MEMBER(pia28_w7_r); DECLARE_WRITE_LINE_MEMBER(pias_ca2_w); @@ -117,7 +116,6 @@ private: UINT8 m_diag; UINT32 m_segment1; UINT32 m_segment2; - bool m_ca1; emu_timer* m_irq_timer; bool m_irq_active; }; diff --git a/src/mess/drivers/apf.c b/src/mess/drivers/apf.c index f7d27f628f5..263ab4f8b30 100644 --- a/src/mess/drivers/apf.c +++ b/src/mess/drivers/apf.c @@ -88,10 +88,6 @@ public: DECLARE_WRITE_LINE_MEMBER(apf_mc6847_fs_w); DECLARE_READ8_MEMBER(apf_m1000_pia_in_a_func); DECLARE_READ8_MEMBER(apf_m1000_pia_in_b_func); - DECLARE_READ_LINE_MEMBER(apf_m1000_pia_in_ca1_func); - DECLARE_READ_LINE_MEMBER(apf_m1000_pia_in_cb1_func); - DECLARE_READ_LINE_MEMBER(apf_m1000_pia_in_ca2_func); - DECLARE_READ_LINE_MEMBER(apf_m1000_pia_in_cb2_func); DECLARE_WRITE8_MEMBER(apf_m1000_pia_out_a_func); DECLARE_WRITE8_MEMBER(apf_m1000_pia_out_b_func); DECLARE_WRITE_LINE_MEMBER(apf_m1000_pia_out_ca2_func); @@ -100,10 +96,6 @@ public: DECLARE_WRITE_LINE_MEMBER(apf_m1000_irq_b_func); DECLARE_READ8_MEMBER(apf_imagination_pia_in_a_func); DECLARE_READ8_MEMBER(apf_imagination_pia_in_b_func); - DECLARE_READ_LINE_MEMBER(apf_imagination_pia_in_ca1_func); - DECLARE_READ_LINE_MEMBER(apf_imagination_pia_in_cb1_func); - DECLARE_READ_LINE_MEMBER(apf_imagination_pia_in_ca2_func); - DECLARE_READ_LINE_MEMBER(apf_imagination_pia_in_cb2_func); DECLARE_WRITE8_MEMBER(apf_imagination_pia_out_a_func); DECLARE_WRITE8_MEMBER(apf_imagination_pia_out_b_func); DECLARE_WRITE_LINE_MEMBER(apf_imagination_pia_out_ca2_func); @@ -166,26 +158,6 @@ READ8_MEMBER( apf_state::apf_m1000_pia_in_b_func) return 0xff; } -READ_LINE_MEMBER( apf_state::apf_m1000_pia_in_ca1_func) -{ - return 0; -} - -READ_LINE_MEMBER( apf_state::apf_m1000_pia_in_cb1_func) -{ - return 0; -} - -READ_LINE_MEMBER( apf_state::apf_m1000_pia_in_ca2_func) -{ - return 0; -} - -READ_LINE_MEMBER( apf_state::apf_m1000_pia_in_cb2_func) -{ - return 0; -} - WRITE8_MEMBER( apf_state::apf_m1000_pia_out_a_func) { @@ -257,26 +229,6 @@ READ8_MEMBER( apf_state::apf_imagination_pia_in_b_func) return data; } -READ_LINE_MEMBER( apf_state::apf_imagination_pia_in_ca1_func) -{ - return 0; -} - -READ_LINE_MEMBER( apf_state::apf_imagination_pia_in_cb1_func) -{ - return 0; -} - -READ_LINE_MEMBER( apf_state::apf_imagination_pia_in_ca2_func) -{ - return 0; -} - -READ_LINE_MEMBER( apf_state::apf_imagination_pia_in_cb2_func) -{ - return 0; -} - WRITE8_MEMBER( apf_state::apf_imagination_pia_out_a_func) { @@ -678,10 +630,6 @@ static MACHINE_CONFIG_START( apf_imagination, apf_state ) 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_READCA1_HANDLER(READLINE(apf_state, apf_m1000_pia_in_ca1_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)) MCFG_PIA6821_CA2_HANDLER(WRITELINE(apf_state, apf_m1000_pia_out_ca2_func)) @@ -692,10 +640,6 @@ static MACHINE_CONFIG_START( apf_imagination, apf_state ) 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_READCA1_HANDLER(READLINE(apf_state, apf_imagination_pia_in_ca1_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)) MCFG_PIA6821_CA2_HANDLER(WRITELINE(apf_state, apf_imagination_pia_out_ca2_func)) diff --git a/src/mess/drivers/bw12.c b/src/mess/drivers/bw12.c index e234118ceee..7d22e1374fe 100644 --- a/src/mess/drivers/bw12.c +++ b/src/mess/drivers/bw12.c @@ -401,11 +401,6 @@ READ8_MEMBER( bw12_state::pia_pa_r ) return data; } -READ_LINE_MEMBER( bw12_state::pia_cb1_r ) -{ - return m_key_stb; -} - WRITE_LINE_MEMBER( bw12_state::pia_cb2_w ) { if (state) @@ -639,7 +634,6 @@ 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_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/d6800.c b/src/mess/drivers/d6800.c index c875f994aa3..9c7fa1f8a8d 100644 --- a/src/mess/drivers/d6800.c +++ b/src/mess/drivers/d6800.c @@ -71,9 +71,6 @@ public: DECLARE_WRITE8_MEMBER( d6800_cassette_w ); DECLARE_READ8_MEMBER( d6800_keyboard_r ); DECLARE_WRITE8_MEMBER( d6800_keyboard_w ); - DECLARE_READ_LINE_MEMBER( d6800_fn_key_r ); - DECLARE_READ_LINE_MEMBER( d6800_keydown_r ); - DECLARE_READ_LINE_MEMBER( d6800_rtc_pulse ); DECLARE_WRITE_LINE_MEMBER( d6800_screen_w ); UINT32 screen_update_d6800(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(d6800_c); @@ -96,9 +93,6 @@ protected: required_ioport m_io_shift; private: UINT8 m_rtc; - bool m_ca1; - bool m_ca2; - bool m_cb1; bool m_cb2; UINT8 m_cass_data[4]; UINT8 m_portb; @@ -233,13 +227,13 @@ TIMER_DEVICE_CALLBACK_MEMBER(d6800_state::d6800_p) m_rtc = 0; UINT8 data = m_io_x0->read() & m_io_x1->read() & m_io_x2->read() & m_io_x3->read(); - m_ca1 = (data == 255) ? 0 : 1; - m_ca2 = (bool)m_io_shift->read(); - m_cb1 = (m_rtc) ? 1 : 0; + int ca1 = (data == 255) ? 0 : 1; + int ca2 = m_io_shift->read(); + int cb1 = (m_rtc) ? 1 : 0; - m_pia->ca1_w(m_ca1); - m_pia->ca2_w(m_ca2); - m_pia->cb1_w(m_cb1); + m_pia->ca1_w(ca1); + m_pia->ca2_w(ca2); + m_pia->cb1_w(cb1); /* cassette - turn 1200/2400Hz to a bit */ m_cass_data[1]++; @@ -254,21 +248,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(d6800_state::d6800_p) } -READ_LINE_MEMBER( d6800_state::d6800_rtc_pulse ) -{ - return m_cb1; -} - -READ_LINE_MEMBER( d6800_state::d6800_keydown_r ) -{ - return m_ca1; -} - -READ_LINE_MEMBER( d6800_state::d6800_fn_key_r ) -{ - return m_ca2; -} - WRITE_LINE_MEMBER( d6800_state::d6800_screen_w ) { m_cb2 = state; @@ -436,9 +415,6 @@ static MACHINE_CONFIG_START( d6800, d6800_state ) 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_READCA1_HANDLER(READLINE(d6800_state, d6800_keydown_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/poly.c b/src/mess/drivers/poly.c index e63b212a67a..d5740289f00 100644 --- a/src/mess/drivers/poly.c +++ b/src/mess/drivers/poly.c @@ -59,7 +59,6 @@ public: required_shared_ptr<UINT8> m_videoram; DECLARE_WRITE8_MEMBER(kbd_put); DECLARE_READ8_MEMBER(pia1_b_in); - DECLARE_READ_LINE_MEMBER(pia1_cb1_in); DECLARE_READ8_MEMBER(videoram_r); UINT8 m_term_data; bool m_term_key; @@ -108,12 +107,6 @@ READ8_MEMBER( poly_state::pia1_b_in ) return data; } -READ_LINE_MEMBER( poly_state::pia1_cb1_in ) -{ -// return kbd strobe value - return 0; -} - static const ptm6840_interface poly_ptm_intf = { @@ -194,7 +187,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_READCB1_HANDLER(READLINE(poly_state, pia1_cb1_in)) + // CB1 kbd strobe 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 107da9770db..bb77e05e463 100644 --- a/src/mess/drivers/tek405x.c +++ b/src/mess/drivers/tek405x.c @@ -452,11 +452,6 @@ WRITE_LINE_MEMBER( tek4051_state::adot_w ) { } -READ_LINE_MEMBER( tek4051_state::viewcause_r ) -{ - return 0; -} - WRITE_LINE_MEMBER( tek4051_state::bufclk_w ) { } @@ -529,21 +524,6 @@ WRITE8_MEMBER( tek4051_state::sb_w ) */ } -READ_LINE_MEMBER( tek4051_state::rdbyte_r ) -{ - return 0; -} - -READ_LINE_MEMBER( tek4051_state::mdata_r ) -{ - return 0; -} - -READ_LINE_MEMBER( tek4051_state::fmark_r ) -{ - return 0; -} - WRITE_LINE_MEMBER( tek4051_state::sot_w ) { } @@ -651,11 +631,6 @@ WRITE8_MEMBER( tek4051_state::kb_pia_pb_w ) m_gpib->ren_w(!BIT(data, 7)); } -READ_LINE_MEMBER( tek4051_state::key_r ) -{ - return m_key; -} - WRITE_LINE_MEMBER( tek4051_state::kb_halt_w ) { } @@ -729,26 +704,6 @@ WRITE8_MEMBER( tek4051_state::tape_pia_pb_w ) */ } -READ_LINE_MEMBER( tek4051_state::rmark_r ) -{ - return 0; -} - -READ_LINE_MEMBER( tek4051_state::lohole_r ) -{ - return 0; -} - -READ_LINE_MEMBER( tek4051_state::filfnd_r ) -{ - return 0; -} - -READ_LINE_MEMBER( tek4051_state::uphole_r ) -{ - return 0; -} - WRITE_LINE_MEMBER( tek4051_state::tape_pia_irqa_w ) { m_tape_pia_irqa = state; @@ -1075,7 +1030,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_READCB1_HANDLER(READLINE(tek4051_state, viewcause_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)) @@ -1085,9 +1040,9 @@ 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_READCB1_HANDLER(READLINE(tek4051_state, mdata_r)) - MCFG_PIA6821_READCB2_HANDLER(READLINE(tek4051_state, fmark_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)) @@ -1097,7 +1052,7 @@ static MACHINE_CONFIG_START( tek4051, tek4051_state ) 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_PIA6821_READCA1_HANDLER(READLINE(tek4051_state, key_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)) @@ -1105,10 +1060,10 @@ 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_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)) + // 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)) diff --git a/src/mess/includes/bw12.h b/src/mess/includes/bw12.h index f543bdc36b7..3cb3a1978aa 100644 --- a/src/mess/includes/bw12.h +++ b/src/mess/includes/bw12.h @@ -85,7 +85,6 @@ public: DECLARE_READ8_MEMBER( ls259_r ); DECLARE_WRITE8_MEMBER( ls259_w ); DECLARE_READ8_MEMBER( pia_pa_r ); - DECLARE_READ_LINE_MEMBER( pia_cb1_r ); DECLARE_WRITE_LINE_MEMBER( pia_cb2_w ); DECLARE_WRITE_LINE_MEMBER( pit_out2_w ); DECLARE_READ_LINE_MEMBER( ay3600_shift_r ); diff --git a/src/mess/includes/tek405x.h b/src/mess/includes/tek405x.h index f3eea941fa9..09985b75e5e 100644 --- a/src/mess/includes/tek405x.h +++ b/src/mess/includes/tek405x.h @@ -74,7 +74,6 @@ public: DECLARE_WRITE8_MEMBER( x_pia_pa_w ); DECLARE_WRITE8_MEMBER( x_pia_pb_w ); DECLARE_WRITE_LINE_MEMBER( adot_w ); - DECLARE_READ_LINE_MEMBER( viewcause_r ); DECLARE_WRITE_LINE_MEMBER( bufclk_w ); DECLARE_WRITE_LINE_MEMBER( x_pia_irqa_w ); DECLARE_WRITE_LINE_MEMBER( x_pia_irqb_w ); @@ -82,9 +81,6 @@ public: DECLARE_READ8_MEMBER( sa_r ); DECLARE_WRITE8_MEMBER( y_pia_pa_w ); DECLARE_WRITE8_MEMBER( sb_w ); - DECLARE_READ_LINE_MEMBER( rdbyte_r ); - DECLARE_READ_LINE_MEMBER( mdata_r ); - DECLARE_READ_LINE_MEMBER( fmark_r ); DECLARE_WRITE_LINE_MEMBER( sot_w ); DECLARE_WRITE_LINE_MEMBER( y_pia_irqa_w ); DECLARE_WRITE_LINE_MEMBER( y_pia_irqb_w ); @@ -92,7 +88,6 @@ public: DECLARE_READ8_MEMBER( kb_pia_pa_r ); DECLARE_READ8_MEMBER( kb_pia_pb_r ); DECLARE_WRITE8_MEMBER( kb_pia_pb_w ); - DECLARE_READ_LINE_MEMBER( key_r ); DECLARE_WRITE_LINE_MEMBER( kb_halt_w ); DECLARE_WRITE_LINE_MEMBER( kb_pia_irqa_w ); DECLARE_WRITE_LINE_MEMBER( kb_pia_irqb_w ); @@ -100,10 +95,6 @@ public: DECLARE_READ8_MEMBER( tape_pia_pa_r ); DECLARE_WRITE8_MEMBER( tape_pia_pa_w ); DECLARE_WRITE8_MEMBER( tape_pia_pb_w ); - DECLARE_READ_LINE_MEMBER( rmark_r ); - DECLARE_READ_LINE_MEMBER( lohole_r ); - DECLARE_READ_LINE_MEMBER( filfnd_r ); - DECLARE_READ_LINE_MEMBER( uphole_r ); DECLARE_WRITE_LINE_MEMBER( tape_pia_irqa_w ); DECLARE_WRITE_LINE_MEMBER( tape_pia_irqb_w ); @@ -139,7 +130,6 @@ public: // keyboard int m_kbhalt; int m_kc; - int m_key; // GPIB int m_talk; |