Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-06 10:29:38 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

removed removed unused rxd callback from MC6854 (this also appears to be mostly a skeleton). Removed dependency clutter from econet [smf]

Browse Source
This commit is contained in:
smf- 2013-12-23 12:07:07 +00:00
parent e0cfadb855
commit 81383a5c52
8 changed files with 16 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/emu/bus/econet/e01.c
View File

@ -154,11 +154,6 @@ WRITE_LINE_MEMBER( e01_device::adlc_irq_w )
update_interrupts();
}
READ_LINE_MEMBER( e01_device::econet_data_r )
{
return m_econet->data_r();
}
WRITE_LINE_MEMBER( e01_device::econet_data_w )
{
m_econet->data_w(this, state);
@ -167,7 +162,6 @@ WRITE_LINE_MEMBER( e01_device::econet_data_w )
static const mc6854_interface adlc_intf =
{
DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, e01_device, adlc_irq_w),
DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, e01_device, econet_data_r),
DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, e01_device, econet_data_w),
NULL,
DEVCB_NULL,
@ -763,6 +757,16 @@ WRITE8_MEMBER( e01_device::rtc_data_w )
}
//-------------------------------------------------
// econet_clk_w -
//-------------------------------------------------
void e01_device::econet_data(int state)
{
m_adlc->set_rx(state);
}
//-------------------------------------------------
// econet_clk_w -
//-------------------------------------------------

2
src/emu/bus/econet/e01.h
View File

@ -58,7 +58,6 @@ public:
DECLARE_WRITE8_MEMBER( rtc_data_w );
DECLARE_WRITE_LINE_MEMBER( rtc_irq_w );
DECLARE_WRITE_LINE_MEMBER( adlc_irq_w );
DECLARE_READ_LINE_MEMBER( econet_data_r );
DECLARE_WRITE_LINE_MEMBER( econet_data_w );
DECLARE_WRITE_LINE_MEMBER( via_irq_w );
DECLARE_WRITE_LINE_MEMBER( clk_en_w );
@ -81,6 +80,7 @@ protected:
virtual ioport_constructor device_input_ports() const;
// device_econet_interface overrides
virtual void econet_data(int state);
virtual void econet_clk(int state);
required_device<m65c02_device> m_maincpu;

23
src/emu/bus/econet/econet.c
View File

@ -297,26 +297,6 @@ econet_device::daisy_entry::daisy_entry(device_t *device)
}
//-------------------------------------------------
// clk_r -
//-------------------------------------------------
READ_LINE_MEMBER( econet_device::clk_r )
{
return get_signal(CLK);
}
//-------------------------------------------------
// data_r -
//-------------------------------------------------
READ_LINE_MEMBER( econet_device::data_r )
{
return get_signal(DATA);
}
//-------------------------------------------------
// clk_w -
//-------------------------------------------------
@ -361,6 +341,9 @@ void econet_device::data_w(device_t *device, int state)
// SLOT_INTERFACE( econet_devices )
//-------------------------------------------------
// slot devices
#include "e01.h"
SLOT_INTERFACE_START( econet_devices )
SLOT_INTERFACE("e01", E01)
SLOT_INTERFACE("e01s", E01S)

10
src/emu/bus/econet/econet.h
View File

@ -72,10 +72,6 @@ public:
void add_device(device_t *target, int address);
// reads for both host and peripherals
DECLARE_READ_LINE_MEMBER( clk_r );
DECLARE_READ_LINE_MEMBER( data_r );
// writes for host (driver_device)
DECLARE_WRITE_LINE_MEMBER( clk_w );
DECLARE_WRITE_LINE_MEMBER( data_w );
@ -159,9 +155,8 @@ public:
device_econet_interface *next() const { return m_next; }
device_econet_interface *m_next;
// optional operation overrides
virtual void econet_clk(int state) = 0;
virtual void econet_data(int state) { };
virtual void econet_data(int state) = 0;
econet_device *m_econet;
UINT8 m_address;
@ -173,9 +168,6 @@ extern const device_type ECONET;
extern const device_type ECONET_SLOT;
// slot devices
#include "e01.h"
SLOT_INTERFACE_EXTERN( econet_devices );

2
src/emu/machine/mc6854.c
View File

@ -214,7 +214,6 @@ void mc6854_device::device_config_complete()
else
{
memset(&m_out_irq_cb, 0, sizeof(m_out_irq_cb));
memset(&m_in_rxd_cb, 0, sizeof(m_in_rxd_cb));
memset(&m_out_txd_cb, 0, sizeof(m_out_txd_cb));
memset(&m_out_rts_cb, 0, sizeof(m_out_rts_cb));
memset(&m_out_dtr_cb, 0, sizeof(m_out_dtr_cb));
@ -228,7 +227,6 @@ void mc6854_device::device_config_complete()
void mc6854_device::device_start()
{
m_out_irq_func.resolve(m_out_irq_cb, *this);
m_in_rxd_func.resolve(m_in_rxd_cb, *this);
m_out_txd_func.resolve(m_out_txd_cb, *this);
m_out_rts_func.resolve(m_out_rts_cb, *this);
m_out_dtr_func.resolve(m_out_dtr_cb, *this);

2
src/emu/machine/mc6854.h
View File

@ -24,7 +24,6 @@ struct mc6854_interface
devcb_write_line m_out_irq_cb; /* interrupt request */
/* low-level, bit-based interface */
devcb_read_line m_in_rxd_cb; /* receive bit */
devcb_write_line m_out_txd_cb; /* transmit bit */
/* high-level, frame-based interface */
@ -70,7 +69,6 @@ protected:
private:
// internal state
devcb_resolved_write_line m_out_irq_func;
devcb_resolved_read_line m_in_rxd_func;
devcb_resolved_write_line m_out_txd_func;
devcb_resolved_write_line m_out_rts_func;
devcb_resolved_write_line m_out_dtr_func;

3
src/mess/drivers/bbc.c
View File

@ -598,7 +598,6 @@ static SAA5050_INTERFACE( trom_intf )
static const mc6854_interface adlc_intf =
{
DEVCB_NULL,
DEVCB_DEVICE_LINE_MEMBER(ECONET_TAG, econet_device, data_r),
DEVCB_DEVICE_LINE_MEMBER(ECONET_TAG, econet_device, data_w),
NULL,
DEVCB_NULL,
@ -623,7 +622,7 @@ WRITE_LINE_MEMBER(bbc_state::econet_clk_w)
static ECONET_INTERFACE( econet_intf )
{
DEVCB_DRIVER_LINE_MEMBER(bbc_state, econet_clk_w),
DEVCB_NULL
DEVCB_DEVICE_LINE_MEMBER("mc6854", mc6854_device, set_rx)
};
static MACHINE_CONFIG_FRAGMENT( bbc_cartslot )

1
src/mess/machine/thomflop.c
View File

@ -1678,7 +1678,6 @@ static void to7_network_got_frame( device_t *device, UINT8* data, int length )
const mc6854_interface to7_network_iface =
{
DEVCB_NULL,
DEVCB_NULL,
DEVCB_NULL,
to7_network_got_frame,