diff options
Diffstat (limited to 'src/devices/machine/z80pio.h')
-rw-r--r-- | src/devices/machine/z80pio.h | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/src/devices/machine/z80pio.h b/src/devices/machine/z80pio.h index 623f586891f..bc8cbf531f7 100644 --- a/src/devices/machine/z80pio.h +++ b/src/devices/machine/z80pio.h @@ -80,7 +80,7 @@ public: }; // construction/destruction - z80pio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + z80pio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); template<class _Object> static devcb_base &set_out_int_callback(device_t &device, _Object object) { return downcast<z80pio_device &>(device).m_out_int_cb.set_callback(object); } template<class _Object> static devcb_base &set_in_pa_callback(device_t &device, _Object object) { return downcast<z80pio_device &>(device).m_in_pa_cb.set_callback(object); } @@ -99,27 +99,27 @@ public: DECLARE_WRITE_LINE_MEMBER( strobe_b ) { strobe(PORT_B, state); } // control register I/O - UINT8 control_read(); - void control_write(int offset, UINT8 data) { m_port[offset & 1].control_write(data); } - void control_a_write(UINT8 data) { control_write(PORT_A, data); } - void control_b_write(UINT8 data) { control_write(PORT_B, data); } + uint8_t control_read(); + void control_write(int offset, uint8_t data) { m_port[offset & 1].control_write(data); } + void control_a_write(uint8_t data) { control_write(PORT_A, data); } + void control_b_write(uint8_t data) { control_write(PORT_B, data); } // data register I/O - UINT8 data_read(int offset) { return m_port[offset & 1].data_read(); } - void data_write(int offset, UINT8 data) { m_port[offset & 1].data_write(data); } - UINT8 data_a_read() { return data_read(PORT_A); } - UINT8 data_b_read() { return data_read(PORT_B); } - void data_a_write(UINT8 data) { data_write(PORT_A, data); } - void data_b_write(UINT8 data) { data_write(PORT_B, data); } + uint8_t data_read(int offset) { return m_port[offset & 1].data_read(); } + void data_write(int offset, uint8_t data) { m_port[offset & 1].data_write(data); } + uint8_t data_a_read() { return data_read(PORT_A); } + uint8_t data_b_read() { return data_read(PORT_B); } + void data_a_write(uint8_t data) { data_write(PORT_A, data); } + void data_b_write(uint8_t data) { data_write(PORT_B, data); } // port I/O - UINT8 port_read(int offset) { return m_port[offset & 1].read(); } - void port_write(int offset, UINT8 data) { m_port[offset & 1].write(data); } + uint8_t port_read(int offset) { return m_port[offset & 1].read(); } + void port_write(int offset, uint8_t data) { m_port[offset & 1].write(data); } void port_write(int offset, int bit, int state) { port_write(offset, (m_port[offset & 1].m_input & ~(1 << bit)) | (state << bit)); } - UINT8 port_a_read() { return port_read(PORT_A); } - UINT8 port_b_read() { return port_read(PORT_B); } - void port_a_write(UINT8 data) { port_write(PORT_A, data); } - void port_b_write(UINT8 data) { port_write(PORT_B, data); } + uint8_t port_a_read() { return port_read(PORT_A); } + uint8_t port_b_read() { return port_read(PORT_B); } + void port_a_write(uint8_t data) { port_write(PORT_A, data); } + void port_b_write(uint8_t data) { port_write(PORT_B, data); } DECLARE_WRITE8_MEMBER( pa_w ) { port_a_write(data); } DECLARE_READ8_MEMBER( pa_r ) { return port_a_read(); } DECLARE_WRITE8_MEMBER( pb_w ) { port_b_write(data); } @@ -207,13 +207,13 @@ private: void set_mode(int mode); void strobe(bool state); - UINT8 read(); - void write(UINT8 data); + uint8_t read(); + void write(uint8_t data); - void control_write(UINT8 data); + void control_write(uint8_t data); - UINT8 data_read(); - void data_write(UINT8 data); + uint8_t data_read(); + void data_write(uint8_t data); private: void check_interrupts() { m_device->check_interrupts(); } @@ -223,9 +223,9 @@ private: int m_mode; // mode register int m_next_control_word; // next control word - UINT8 m_input; // input latch - UINT8 m_output; // output latch - UINT8 m_ior; // input/output register + uint8_t m_input; // input latch + uint8_t m_output; // output latch + uint8_t m_ior; // input/output register bool m_rdy; // ready bool m_stb; // strobe @@ -233,9 +233,9 @@ private: bool m_ie; // interrupt enabled bool m_ip; // interrupt pending bool m_ius; // interrupt under service - UINT8 m_icw; // interrupt control word - UINT8 m_vector; // interrupt vector - UINT8 m_mask; // interrupt mask + uint8_t m_icw; // interrupt control word + uint8_t m_vector; // interrupt vector + uint8_t m_mask; // interrupt mask bool m_match; // logic equation match }; |