diff options
Diffstat (limited to 'src/devices/machine/mc68681.h')
-rw-r--r-- | src/devices/machine/mc68681.h | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/src/devices/machine/mc68681.h b/src/devices/machine/mc68681.h index b1127642c02..fecd5feb742 100644 --- a/src/devices/machine/mc68681.h +++ b/src/devices/machine/mc68681.h @@ -47,6 +47,8 @@ public: void tx_16x_clock_w(bool state); void rx_16x_clock_w(bool state); + int get_tx_rate() const { return tx_baud_rate; } + private: /* Registers */ uint8_t CR; /* Command register */ @@ -69,10 +71,10 @@ private: int m_ch; /* Transmitter */ - uint8_t tx_enabled; - uint8_t tx_data; - uint8_t tx_ready; + uint8_t m_tx_data; + bool m_tx_data_in_buffer; bool m_tx_break; + uint8_t m_bits_transmitted; /* Rx/Tx clocking */ uint8_t m_rx_prescaler , m_tx_prescaler; @@ -105,8 +107,8 @@ public: virtual uint8_t read(offs_t offset); virtual void write(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER(rx_a_w) { m_chanA->device_serial_interface::rx_w((uint8_t)state); } - DECLARE_WRITE_LINE_MEMBER(rx_b_w) { m_chanB->device_serial_interface::rx_w((uint8_t)state); } + void rx_a_w(int state) { m_chanA->device_serial_interface::rx_w((uint8_t)state); } + void rx_b_w(int state) { m_chanB->device_serial_interface::rx_w((uint8_t)state); } auto irq_cb() { return write_irq.bind(); } auto a_tx_cb() { return write_a_tx.bind(); } @@ -115,13 +117,13 @@ public: auto outport_cb() { return write_outport.bind(); } // new-style push handlers for input port bits - DECLARE_WRITE_LINE_MEMBER(ip0_w); - DECLARE_WRITE_LINE_MEMBER(ip1_w); - DECLARE_WRITE_LINE_MEMBER(ip2_w); - DECLARE_WRITE_LINE_MEMBER(ip3_w); - DECLARE_WRITE_LINE_MEMBER(ip4_w); - DECLARE_WRITE_LINE_MEMBER(ip5_w); - DECLARE_WRITE_LINE_MEMBER(ip6_w); + void ip0_w(int state); + void ip1_w(int state); + void ip2_w(int state); + void ip3_w(int state); + void ip4_w(int state); + void ip5_w(int state); + void ip6_w(int state); bool irq_pending() const { return (ISR & IMR) != 0; } @@ -163,7 +165,9 @@ private: uint8_t half_period; emu_timer *duart_timer; - double get_ct_rate(); + bool m_irq_state; + + uint32_t get_ct_rate(); uint16_t get_ct_count(); void start_ct(int count); virtual int calc_baud(int ch, bool rx, uint8_t data); @@ -226,8 +230,8 @@ public: auto c_tx_cb() { return write_c_tx.bind(); } auto d_tx_cb() { return write_d_tx.bind(); } - DECLARE_WRITE_LINE_MEMBER(rx_c_w) { m_chanC->device_serial_interface::rx_w((uint8_t)state); } - DECLARE_WRITE_LINE_MEMBER(rx_d_w) { m_chanD->device_serial_interface::rx_w((uint8_t)state); } + void rx_c_w(int state) { m_chanC->device_serial_interface::rx_w((uint8_t)state); } + void rx_d_w(int state) { m_chanD->device_serial_interface::rx_w((uint8_t)state); } virtual uint8_t read(offs_t offset) override; virtual void write(offs_t offset, uint8_t data) override; |