diff options
Diffstat (limited to 'src/devices/machine/ins8250.h')
-rw-r--r-- | src/devices/machine/ins8250.h | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/devices/machine/ins8250.h b/src/devices/machine/ins8250.h index 547c3dea602..4da3b0fb9af 100644 --- a/src/devices/machine/ins8250.h +++ b/src/devices/machine/ins8250.h @@ -19,7 +19,7 @@ class ins8250_uart_device : public device_t, public device_serial_interface { public: - ins8250_uart_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, UINT32 clock, const char *shortname); + ins8250_uart_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, uint32_t clock, const char *shortname); template<class _Object> static devcb_base &set_out_tx_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_tx_cb.set_callback(object); } template<class _Object> static devcb_base &set_out_dtr_callback(device_t &device, _Object object) { return downcast<ins8250_uart_device &>(device).m_out_dtr_cb.set_callback(object); } @@ -44,9 +44,9 @@ protected: virtual void tra_callback() override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - virtual void set_fcr(UINT8 data) {} - virtual void push_tx(UINT8 data) {} - virtual UINT8 pop_rx() { return 0; } + virtual void set_fcr(uint8_t data) {} + virtual void push_tx(uint8_t data) {} + virtual uint8_t pop_rx() { return 0; } void trigger_int(int flag); void clear_int(int flag); @@ -60,20 +60,20 @@ protected: }; int m_device_type; struct { - UINT8 thr; /* 0 -W transmitter holding register */ - UINT8 rbr; /* 0 R- receiver buffer register */ - UINT8 ier; /* 1 RW interrupt enable register */ - UINT16 dl; /* 0/1 RW divisor latch (if DLAB = 1) */ - UINT8 iir; /* 2 R- interrupt identification register */ - UINT8 fcr; - UINT8 lcr; /* 3 RW line control register (bit 7: DLAB) */ - UINT8 mcr; /* 4 RW modem control register */ - UINT8 lsr; /* 5 R- line status register */ - UINT8 msr; /* 6 R- modem status register */ - UINT8 scr; /* 7 RW scratch register */ + uint8_t thr; /* 0 -W transmitter holding register */ + uint8_t rbr; /* 0 R- receiver buffer register */ + uint8_t ier; /* 1 RW interrupt enable register */ + uint16_t dl; /* 0/1 RW divisor latch (if DLAB = 1) */ + uint8_t iir; /* 2 R- interrupt identification register */ + uint8_t fcr; + uint8_t lcr; /* 3 RW line control register (bit 7: DLAB) */ + uint8_t mcr; /* 4 RW modem control register */ + uint8_t lsr; /* 5 R- line status register */ + uint8_t msr; /* 6 R- modem status register */ + uint8_t scr; /* 7 RW scratch register */ } m_regs; private: - UINT8 m_int_pending; + uint8_t m_int_pending; devcb_write_line m_out_tx_cb; devcb_write_line m_out_dtr_cb; @@ -96,33 +96,33 @@ private: class ins8250_device : public ins8250_uart_device { public: - ins8250_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ins8250_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); }; class ns16450_device : public ins8250_uart_device { public: - ns16450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ns16450_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); }; class ns16550_device : public ins8250_uart_device { public: - ns16550_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + ns16550_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: virtual void device_start() override; virtual void device_reset() override; virtual void rcv_complete() override; virtual void tra_complete() override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - virtual void set_fcr(UINT8 data) override; - virtual void push_tx(UINT8 data) override; - virtual UINT8 pop_rx() override; + virtual void set_fcr(uint8_t data) override; + virtual void push_tx(uint8_t data) override; + virtual uint8_t pop_rx() override; private: void set_timer() { m_timeout->adjust(attotime::from_hz((clock()*4*8)/(m_regs.dl*16))); } int m_rintlvl; - UINT8 m_rfifo[16]; - UINT8 m_tfifo[16]; + uint8_t m_rfifo[16]; + uint8_t m_tfifo[16]; int m_rhead, m_rtail, m_rnum; int m_thead, m_ttail; emu_timer *m_timeout; @@ -131,7 +131,7 @@ private: class pc16552_device : public device_t { public: - pc16552_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + pc16552_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); DECLARE_READ8_MEMBER(read) { return ((offset & 8) ? m_chan1 : m_chan0)->ins8250_r(space, offset & 7, mem_mask); } DECLARE_WRITE8_MEMBER(write) { ((offset & 8) ? m_chan1 : m_chan0)->ins8250_w(space, offset & 7, data, mem_mask); } |