summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/z80sti.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine/z80sti.h')
-rw-r--r--src/devices/machine/z80sti.h31
1 files changed, 15 insertions, 16 deletions
diff --git a/src/devices/machine/z80sti.h b/src/devices/machine/z80sti.h
index 521630dbe13..4f893955f7e 100644
--- a/src/devices/machine/z80sti.h
+++ b/src/devices/machine/z80sti.h
@@ -64,20 +64,20 @@ public:
void set_rx_clock(int clock) { m_rx_clock = clock; }
void set_tx_clock(int clock) { m_tx_clock = clock; }
- DECLARE_READ8_MEMBER( read );
- DECLARE_WRITE8_MEMBER( write );
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
- DECLARE_WRITE_LINE_MEMBER( i0_w );
- DECLARE_WRITE_LINE_MEMBER( i1_w );
- DECLARE_WRITE_LINE_MEMBER( i2_w );
- DECLARE_WRITE_LINE_MEMBER( i3_w );
- DECLARE_WRITE_LINE_MEMBER( i4_w );
- DECLARE_WRITE_LINE_MEMBER( i5_w );
- DECLARE_WRITE_LINE_MEMBER( i6_w );
- DECLARE_WRITE_LINE_MEMBER( i7_w );
+ void i0_w(int state);
+ void i1_w(int state);
+ void i2_w(int state);
+ void i3_w(int state);
+ void i4_w(int state);
+ void i5_w(int state);
+ void i6_w(int state);
+ void i7_w(int state);
- DECLARE_WRITE_LINE_MEMBER( tc_w );
- DECLARE_WRITE_LINE_MEMBER( rc_w );
+ void tc_w(int state);
+ void rc_w(int state);
private:
enum
@@ -146,9 +146,8 @@ private:
static const int PRESCALER[];
// device-level overrides
- virtual void device_start() override;
- virtual void device_reset() override;
- virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+ virtual void device_start() override ATTR_COLD;
+ virtual void device_reset() override ATTR_COLD;
// device_serial_interface overrides
virtual void tra_callback() override;
@@ -163,7 +162,7 @@ private:
// internal helpers
void check_interrupts();
void take_interrupt(int level);
- void timer_count(int index);
+ TIMER_CALLBACK_MEMBER(timer_count);
void gpip_input(int bit, int state);
// device callbacks