diff options
author | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
---|---|---|
committer | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/mame/machine/midwayic.h | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/mame/machine/midwayic.h')
-rw-r--r-- | src/mame/machine/midwayic.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/mame/machine/midwayic.h b/src/mame/machine/midwayic.h index 4e0a18a36d8..e5a422782b5 100644 --- a/src/mame/machine/midwayic.h +++ b/src/mame/machine/midwayic.h @@ -25,9 +25,9 @@ public: void set_upper(int upper) { m_upper = upper; } - u8 read(); - void write(u8 data); - u8 status_r(); + DECLARE_READ8_MEMBER( read ); + DECLARE_WRITE8_MEMBER( write ); + DECLARE_READ8_MEMBER( status_r ); DECLARE_WRITE_LINE_MEMBER( reset_w ); protected: @@ -35,17 +35,12 @@ protected: // device-level overrides virtual void device_start() override; - virtual void device_reset() override; - virtual ioport_constructor device_input_ports() const override; void generate_serial_data(int upper); void serial_register_state(); - required_ioport m_io_serial_digit; - uint8_t m_data[16]; // reused by other devices int m_upper; - private: uint8_t m_buff; uint8_t m_idx; @@ -100,9 +95,9 @@ public: void set_yearoffs(int yearoffs) { m_yearoffs = yearoffs; } - u8 read(); - void write(u8 data); - u8 status_r(); + DECLARE_READ8_MEMBER( read ); + DECLARE_WRITE8_MEMBER( write ); + DECLARE_READ8_MEMBER( status_r ); void set_default_nvram(const uint8_t *nvram); |