Previous 199869 Revisions Next

r26713 Monday 23rd December, 2013 at 12:07:07 UTC by smf
removed removed unused rxd callback from MC6854 (this also appears to be mostly a skeleton). Removed dependency clutter from econet [smf]
[src/emu/bus/econet]e01.c e01.h econet.c econet.h
[src/emu/machine]mc6854.c mc6854.h
[src/mess/drivers]bbc.c
[src/mess/machine]thomflop.c

trunk/src/emu/machine/mc6854.c
r26712r26713
214214   else
215215   {
216216      memset(&m_out_irq_cb, 0, sizeof(m_out_irq_cb));
217      memset(&m_in_rxd_cb, 0, sizeof(m_in_rxd_cb));
218217      memset(&m_out_txd_cb, 0, sizeof(m_out_txd_cb));
219218      memset(&m_out_rts_cb, 0, sizeof(m_out_rts_cb));
220219      memset(&m_out_dtr_cb, 0, sizeof(m_out_dtr_cb));
r26712r26713
228227void mc6854_device::device_start()
229228{
230229   m_out_irq_func.resolve(m_out_irq_cb, *this);
231   m_in_rxd_func.resolve(m_in_rxd_cb, *this);
232230   m_out_txd_func.resolve(m_out_txd_cb, *this);
233231   m_out_rts_func.resolve(m_out_rts_cb, *this);
234232   m_out_dtr_func.resolve(m_out_dtr_cb, *this);
trunk/src/emu/machine/mc6854.h
r26712r26713
2424   devcb_write_line  m_out_irq_cb; /* interrupt request */
2525
2626   /* low-level, bit-based interface */
27   devcb_read_line   m_in_rxd_cb; /* receive bit */
2827   devcb_write_line  m_out_txd_cb; /* transmit bit */
2928
3029   /* high-level, frame-based interface */
r26712r26713
7069private:
7170   // internal state
7271   devcb_resolved_write_line   m_out_irq_func;
73   devcb_resolved_read_line    m_in_rxd_func;
7472   devcb_resolved_write_line   m_out_txd_func;
7573   devcb_resolved_write_line   m_out_rts_func;
7674   devcb_resolved_write_line   m_out_dtr_func;
trunk/src/emu/bus/econet/econet.c
r26712r26713
298298
299299
300300//-------------------------------------------------
301//  clk_r -
302//-------------------------------------------------
303
304READ_LINE_MEMBER( econet_device::clk_r )
305{
306   return get_signal(CLK);
307}
308
309
310//-------------------------------------------------
311//  data_r -
312//-------------------------------------------------
313
314READ_LINE_MEMBER( econet_device::data_r )
315{
316   return get_signal(DATA);
317}
318
319
320//-------------------------------------------------
321301//  clk_w -
322302//-------------------------------------------------
323303
r26712r26713
361341//  SLOT_INTERFACE( econet_devices )
362342//-------------------------------------------------
363343
344// slot devices
345#include "e01.h"
346
364347SLOT_INTERFACE_START( econet_devices )
365348   SLOT_INTERFACE("e01", E01)
366349   SLOT_INTERFACE("e01s", E01S)
trunk/src/emu/bus/econet/econet.h
r26712r26713
7272
7373   void add_device(device_t *target, int address);
7474
75   // reads for both host and peripherals
76   DECLARE_READ_LINE_MEMBER( clk_r );
77   DECLARE_READ_LINE_MEMBER( data_r );
78
7975   // writes for host (driver_device)
8076   DECLARE_WRITE_LINE_MEMBER( clk_w );
8177   DECLARE_WRITE_LINE_MEMBER( data_w );
r26712r26713
159155   device_econet_interface *next() const { return m_next; }
160156   device_econet_interface *m_next;
161157
162   // optional operation overrides
163158   virtual void econet_clk(int state) = 0;
164   virtual void econet_data(int state) { };
159   virtual void econet_data(int state) = 0;
165160
166161   econet_device  *m_econet;
167162   UINT8 m_address;
r26712r26713
173168extern const device_type ECONET_SLOT;
174169
175170
176// slot devices
177#include "e01.h"
178
179171SLOT_INTERFACE_EXTERN( econet_devices );
180172
181173
trunk/src/emu/bus/econet/e01.c
r26712r26713
154154   update_interrupts();
155155}
156156
157READ_LINE_MEMBER( e01_device::econet_data_r )
158{
159   return m_econet->data_r();
160}
161
162157WRITE_LINE_MEMBER( e01_device::econet_data_w )
163158{
164159   m_econet->data_w(this, state);
r26712r26713
167162static const mc6854_interface adlc_intf =
168163{
169164   DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, e01_device, adlc_irq_w),
170   DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, e01_device, econet_data_r),
171165   DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, e01_device, econet_data_w),
172166   NULL,
173167   DEVCB_NULL,
r26712r26713
767761//  econet_clk_w -
768762//-------------------------------------------------
769763
764void e01_device::econet_data(int state)
765{
766   m_adlc->set_rx(state);
767}
768
769
770//-------------------------------------------------
771//  econet_clk_w -
772//-------------------------------------------------
773
770774void e01_device::econet_clk(int state)
771775{
772776   m_adlc->rxc_w(state);
trunk/src/emu/bus/econet/e01.h
r26712r26713
5858   DECLARE_WRITE8_MEMBER( rtc_data_w );
5959   DECLARE_WRITE_LINE_MEMBER( rtc_irq_w );
6060   DECLARE_WRITE_LINE_MEMBER( adlc_irq_w );
61   DECLARE_READ_LINE_MEMBER( econet_data_r );
6261   DECLARE_WRITE_LINE_MEMBER( econet_data_w );
6362   DECLARE_WRITE_LINE_MEMBER( via_irq_w );
6463   DECLARE_WRITE_LINE_MEMBER( clk_en_w );
r26712r26713
8180   virtual ioport_constructor device_input_ports() const;
8281
8382   // device_econet_interface overrides
83   virtual void econet_data(int state);
8484   virtual void econet_clk(int state);
8585
8686   required_device<m65c02_device> m_maincpu;
trunk/src/mess/machine/thomflop.c
r26712r26713
16801680{
16811681   DEVCB_NULL,
16821682   DEVCB_NULL,
1683   DEVCB_NULL,
16841683   to7_network_got_frame,
16851684   DEVCB_NULL,
16861685   DEVCB_NULL
trunk/src/mess/drivers/bbc.c
r26712r26713
598598static const mc6854_interface adlc_intf =
599599{
600600   DEVCB_NULL,
601   DEVCB_DEVICE_LINE_MEMBER(ECONET_TAG, econet_device, data_r),
602601   DEVCB_DEVICE_LINE_MEMBER(ECONET_TAG, econet_device, data_w),
603602   NULL,
604603   DEVCB_NULL,
r26712r26713
623622static ECONET_INTERFACE( econet_intf )
624623{
625624   DEVCB_DRIVER_LINE_MEMBER(bbc_state, econet_clk_w),
626   DEVCB_NULL
625   DEVCB_DEVICE_LINE_MEMBER("mc6854", mc6854_device, set_rx)
627626};
628627
629628static MACHINE_CONFIG_FRAGMENT( bbc_cartslot )

Previous 199869 Revisions Next

© 1997-2024 The MAME Team