summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/z80scc.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine/z80scc.h')
-rw-r--r--src/devices/machine/z80scc.h42
1 files changed, 21 insertions, 21 deletions
diff --git a/src/devices/machine/z80scc.h b/src/devices/machine/z80scc.h
index 4a44c3c9c2c..18d6ffffc55 100644
--- a/src/devices/machine/z80scc.h
+++ b/src/devices/machine/z80scc.h
@@ -122,12 +122,12 @@ public:
void m_rx_fifo_rp_step();
uint8_t m_rx_fifo_rp_data();
- DECLARE_WRITE_LINE_MEMBER( write_rx );
- DECLARE_WRITE_LINE_MEMBER( cts_w );
- DECLARE_WRITE_LINE_MEMBER( dcd_w );
- DECLARE_WRITE_LINE_MEMBER( rxc_w );
- DECLARE_WRITE_LINE_MEMBER( txc_w );
- DECLARE_WRITE_LINE_MEMBER( sync_w );
+ void write_rx(int state);
+ void cts_w(int state);
+ void dcd_w(int state);
+ void rxc_w(int state);
+ void txc_w(int state);
+ void sync_w(int state);
int m_rxc;
int m_txc;
@@ -369,8 +369,8 @@ public:
uint8_t cb_r(offs_t offset) { return m_chanB->control_read(); }
void cb_w(offs_t offset, uint8_t data) { m_chanB->control_write(data); }
- DECLARE_READ8_MEMBER( zbus_r );
- DECLARE_WRITE8_MEMBER( zbus_w );
+ uint8_t zbus_r(offs_t offset);
+ void zbus_w(offs_t offset, uint8_t data);
// interrupt acknowledge
int m1_r();
@@ -378,19 +378,19 @@ public:
// Single registers instances accessed from both channels
uint8_t m_wr9; // REG_WR9_MASTER_INT_CTRL
- DECLARE_WRITE_LINE_MEMBER( rxa_w ) { m_chanA->write_rx(state); }
- DECLARE_WRITE_LINE_MEMBER( rxb_w ) { m_chanB->write_rx(state); }
- DECLARE_WRITE_LINE_MEMBER( ctsa_w ) { m_chanA->cts_w(state); }
- DECLARE_WRITE_LINE_MEMBER( ctsb_w ) { m_chanB->cts_w(state); }
- DECLARE_WRITE_LINE_MEMBER( dcda_w ) { m_chanA->dcd_w(state); }
- DECLARE_WRITE_LINE_MEMBER( dcdb_w ) { m_chanB->dcd_w(state); }
- DECLARE_WRITE_LINE_MEMBER( rxca_w ) { m_chanA->rxc_w(state); }
- DECLARE_WRITE_LINE_MEMBER( rxcb_w ) { m_chanB->rxc_w(state); }
- DECLARE_WRITE_LINE_MEMBER( txca_w ) { m_chanA->txc_w(state); }
- DECLARE_WRITE_LINE_MEMBER( txcb_w ) { m_chanB->txc_w(state); }
- DECLARE_WRITE_LINE_MEMBER( rxtxcb_w ) { m_chanB->rxc_w(state); m_chanB->txc_w(state); }
- DECLARE_WRITE_LINE_MEMBER( synca_w ) { m_chanA->sync_w(state); }
- DECLARE_WRITE_LINE_MEMBER( syncb_w ) { m_chanB->sync_w(state); }
+ void rxa_w(int state) { m_chanA->write_rx(state); }
+ void rxb_w(int state) { m_chanB->write_rx(state); }
+ void ctsa_w(int state) { m_chanA->cts_w(state); }
+ void ctsb_w(int state) { m_chanB->cts_w(state); }
+ void dcda_w(int state) { m_chanA->dcd_w(state); }
+ void dcdb_w(int state) { m_chanB->dcd_w(state); }
+ void rxca_w(int state) { m_chanA->rxc_w(state); }
+ void rxcb_w(int state) { m_chanB->rxc_w(state); }
+ void txca_w(int state) { m_chanA->txc_w(state); }
+ void txcb_w(int state) { m_chanB->txc_w(state); }
+ void rxtxcb_w(int state) { m_chanB->rxc_w(state); m_chanB->txc_w(state); }
+ void synca_w(int state) { m_chanA->sync_w(state); }
+ void syncb_w(int state) { m_chanB->sync_w(state); }
int update_extint(int i);
int get_extint_priority(int type);