From e0cfadb85533ea482661737f1f6523c69650649c Mon Sep 17 00:00:00 2001 From: smf- Date: Mon, 23 Dec 2013 11:47:47 +0000 Subject: [PATCH] removed unused rxd callback from MC6852 (which is only a skeleton) [smf] --- src/emu/bus/c64/tdos.c | 3 --- src/emu/machine/mc6852.c | 16 ++++++++++------ src/emu/machine/mc6852.h | 5 ++--- src/mess/drivers/victor9k.c | 3 --- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/emu/bus/c64/tdos.c b/src/emu/bus/c64/tdos.c index 1fae5e230a9..027b9fe886b 100644 --- a/src/emu/bus/c64/tdos.c +++ b/src/emu/bus/c64/tdos.c @@ -162,9 +162,6 @@ static MC6852_INTERFACE( ssda_intf ) DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, - DEVCB_LINE_GND, - DEVCB_LINE_GND, - DEVCB_NULL, DEVCB_NULL }; diff --git a/src/emu/machine/mc6852.c b/src/emu/machine/mc6852.c index b96e1b36c25..485e4ffd0b4 100644 --- a/src/emu/machine/mc6852.c +++ b/src/emu/machine/mc6852.c @@ -128,11 +128,8 @@ void mc6852_device::device_config_complete() // or initialize to defaults if none provided else { - memset(&m_in_rx_data_cb, 0, sizeof(m_in_rx_data_cb)); memset(&m_out_tx_data_cb, 0, sizeof(m_out_tx_data_cb)); memset(&m_out_irq_cb, 0, sizeof(m_out_irq_cb)); - memset(&m_in_cts_cb, 0, sizeof(m_in_cts_cb)); - memset(&m_in_dcd_cb, 0, sizeof(m_in_dcd_cb)); memset(&m_out_sm_dtr_cb, 0, sizeof(m_out_sm_dtr_cb)); memset(&m_out_tuf_cb, 0, sizeof(m_out_tuf_cb)); } @@ -146,11 +143,8 @@ void mc6852_device::device_config_complete() void mc6852_device::device_start() { // resolve callbacks - m_in_rx_data_func.resolve(m_in_rx_data_cb, *this); m_out_tx_data_func.resolve(m_out_tx_data_cb, *this); m_out_irq_func.resolve(m_out_irq_cb, *this); - m_in_cts_func.resolve(m_in_cts_cb, *this); - m_in_dcd_func.resolve(m_in_dcd_cb, *this); m_out_sm_dtr_func.resolve(m_out_sm_dtr_cb, *this); m_out_tuf_func.resolve(m_out_tuf_cb, *this); @@ -369,3 +363,13 @@ READ_LINE_MEMBER( mc6852_device::tuf_r ) { return m_tuf; } + + +//------------------------------------------------- +// write_rx - +//------------------------------------------------- + +WRITE_LINE_MEMBER( mc6852_device::write_rx ) +{ + m_rxd = state; +} diff --git a/src/emu/machine/mc6852.h b/src/emu/machine/mc6852.h index d4ee5e11940..6ebb447a292 100644 --- a/src/emu/machine/mc6852.h +++ b/src/emu/machine/mc6852.h @@ -57,13 +57,10 @@ struct mc6852_interface UINT32 m_rx_clock; UINT32 m_tx_clock; - devcb_read_line m_in_rx_data_cb; devcb_write_line m_out_tx_data_cb; devcb_write_line m_out_irq_cb; - devcb_read_line m_in_cts_cb; - devcb_read_line m_in_dcd_cb; devcb_write_line m_out_sm_dtr_cb; devcb_write_line m_out_tuf_cb; }; @@ -81,6 +78,7 @@ public: DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); + DECLARE_WRITE_LINE_MEMBER( write_rx ); DECLARE_WRITE_LINE_MEMBER( rx_clk_w ); DECLARE_WRITE_LINE_MEMBER( tx_clk_w ); DECLARE_WRITE_LINE_MEMBER( cts_w ); @@ -122,6 +120,7 @@ private: UINT8 m_rdr; // receive data register UINT8 m_rsr; // receive shift register + int m_rxd; int m_cts; // clear to send int m_dcd; // data carrier detect int m_sm_dtr; // sync match/data terminal ready diff --git a/src/mess/drivers/victor9k.c b/src/mess/drivers/victor9k.c index 5cff6ba028b..125b5054e7d 100644 --- a/src/mess/drivers/victor9k.c +++ b/src/mess/drivers/victor9k.c @@ -415,12 +415,9 @@ static MC6852_INTERFACE( ssda_intf ) { 0, 0, - DEVCB_NULL, DEVCB_DEVICE_LINE_MEMBER(HC55516_TAG, hc55516_device, digit_w), DEVCB_DRIVER_LINE_MEMBER(victor9k_state, ssda_irq_w), DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL, DEVCB_NULL };