diff options
Diffstat (limited to 'src/devices/machine/mc6852.h')
-rw-r--r-- | src/devices/machine/mc6852.h | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/src/devices/machine/mc6852.h b/src/devices/machine/mc6852.h index 798529db3ef..3f05182ed6f 100644 --- a/src/devices/machine/mc6852.h +++ b/src/devices/machine/mc6852.h @@ -32,30 +32,6 @@ //************************************************************************** -// INTERFACE CONFIGURATION MACROS -//************************************************************************** - -#define MCFG_MC6852_RX_CLOCK(_clock) \ - downcast<mc6852_device &>(*device).set_rx_clock(_clock); - -#define MCFG_MC6852_TX_CLOCK(_clock) \ - downcast<mc6852_device &>(*device).set_tx_clock(_clock); - -#define MCFG_MC6852_TX_DATA_CALLBACK(_write) \ - downcast<mc6852_device &>(*device).set_tx_data_wr_callback(DEVCB_##_write); - -#define MCFG_MC6852_IRQ_CALLBACK(_write) \ - downcast<mc6852_device &>(*device).set_irq_wr_callback(DEVCB_##_write); - -#define MCFG_MC6852_SM_DTR_CALLBACK(_write) \ - downcast<mc6852_device &>(*device).set_sm_dtr_wr_callback(DEVCB_##_write); - -#define MCFG_MC6852_TUF_CALLBACK(_write) \ - downcast<mc6852_device &>(*device).set_tuf_wr_callback(DEVCB_##_write); - - - -//************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -70,18 +46,14 @@ public: void set_rx_clock(int clock) { m_rx_clock = clock; } void set_tx_clock(int clock) { m_tx_clock = clock; } - template <class Object> devcb_base &set_tx_data_wr_callback(Object &&cb) { return m_write_tx_data.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_irq_wr_callback(Object &&cb) { return m_write_irq.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_sm_dtr_wr_callback(Object &&cb) { return m_write_sm_dtr.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_tuf_wr_callback(Object &&cb) { return m_write_tuf.set_callback(std::forward<Object>(cb)); } auto tx_data_callback() { return m_write_tx_data.bind(); } auto irq_callback() { return m_write_irq.bind(); } auto sm_dtr_callback() { return m_write_sm_dtr.bind(); } auto tuf_callback() { return m_write_tuf.bind(); } - DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( write ); + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER( rx_data_w ) { device_serial_interface::rx_w(state); } DECLARE_WRITE_LINE_MEMBER( rx_clk_w ) { rx_clock_w(state); } |