summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/ins8250.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine/ins8250.h')
-rw-r--r--src/devices/machine/ins8250.h60
1 files changed, 30 insertions, 30 deletions
diff --git a/src/devices/machine/ins8250.h b/src/devices/machine/ins8250.h
index 3047b8d6c05..5f9a6bd1793 100644
--- a/src/devices/machine/ins8250.h
+++ b/src/devices/machine/ins8250.h
@@ -27,8 +27,8 @@ public:
auto out_out1_callback() { return m_out_out1_cb.bind(); }
auto out_out2_callback() { return m_out_out2_cb.bind(); }
- DECLARE_WRITE8_MEMBER(ins8250_w);
- DECLARE_READ8_MEMBER(ins8250_r);
+ void ins8250_w(offs_t offset, u8 data);
+ u8 ins8250_r(offs_t offset);
DECLARE_WRITE_LINE_MEMBER(dcd_w);
DECLARE_WRITE_LINE_MEMBER(dsr_w);
@@ -46,7 +46,7 @@ protected:
NS16550A
};
- ins8250_uart_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, dev_type device_type);
+ ins8250_uart_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, dev_type device_type);
virtual void device_start() override;
virtual void device_reset() override;
@@ -54,9 +54,9 @@ protected:
virtual void tra_complete() override;
virtual void tra_callback() override;
- virtual void set_fcr(uint8_t data) { }
- virtual void push_tx(uint8_t data) { }
- virtual uint8_t pop_rx() { return 0; }
+ virtual void set_fcr(u8 data) { }
+ virtual void push_tx(u8 data) { }
+ virtual u8 pop_rx() { return 0; }
void trigger_int(int flag);
void clear_int(int flag);
@@ -65,20 +65,20 @@ protected:
const dev_type m_device_type;
struct {
- 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 */
+ u8 thr; /* 0 -W transmitter holding register */
+ u8 rbr; /* 0 R- receiver buffer register */
+ u8 ier; /* 1 RW interrupt enable register */
+ u16 dl; /* 0/1 RW divisor latch (if DLAB = 1) */
+ u8 iir; /* 2 R- interrupt identification register */
+ u8 fcr;
+ u8 lcr; /* 3 RW line control register (bit 7: DLAB) */
+ u8 mcr; /* 4 RW modem control register */
+ u8 lsr; /* 5 R- line status register */
+ u8 msr; /* 6 R- modem status register */
+ u8 scr; /* 7 RW scratch register */
} m_regs;
private:
- uint8_t m_int_pending;
+ u8 m_int_pending;
devcb_write_line m_out_tx_cb;
devcb_write_line m_out_dtr_cb;
@@ -101,34 +101,34 @@ private:
class ins8250_device : public ins8250_uart_device
{
public:
- ins8250_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ ins8250_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
};
class ns16450_device : public ins8250_uart_device
{
public:
- ns16450_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ ns16450_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
};
class ns16550_device : public ins8250_uart_device
{
public:
- ns16550_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ ns16550_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 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_t data) override;
- virtual void push_tx(uint8_t data) override;
- virtual uint8_t pop_rx() override;
+ virtual void set_fcr(u8 data) override;
+ virtual void push_tx(u8 data) override;
+ virtual u8 pop_rx() override;
private:
void set_timer() { m_timeout->adjust(attotime::from_hz((clock()*4*8)/(m_regs.dl*16))); }
int m_rintlvl;
- uint8_t m_rfifo[16];
- uint8_t m_efifo[16];
- uint8_t m_tfifo[16];
+ u8 m_rfifo[16];
+ u8 m_efifo[16];
+ u8 m_tfifo[16];
int m_rhead, m_rtail, m_rnum;
int m_thead, m_ttail;
emu_timer *m_timeout;
@@ -137,10 +137,10 @@ private:
class pc16552_device : public device_t
{
public:
- pc16552_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ pc16552_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 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); }
+ u8 read(offs_t offset) { return ((offset & 8) ? m_chan1 : m_chan0)->ins8250_r(offset & 7); }
+ void write(offs_t offset, u8 data) { ((offset & 8) ? m_chan1 : m_chan0)->ins8250_w(offset & 7, data); }
protected:
virtual void device_start() override;