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/devices/bus/tiki100/hdc.h | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/tiki100/hdc.h')
-rw-r--r-- | src/devices/bus/tiki100/hdc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/bus/tiki100/hdc.h b/src/devices/bus/tiki100/hdc.h index d38927ff004..1c0447acff5 100644 --- a/src/devices/bus/tiki100/hdc.h +++ b/src/devices/bus/tiki100/hdc.h @@ -36,8 +36,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_tiki100bus_card_interface overrides - virtual uint8_t iorq_r(offs_t offset, uint8_t data) override; - virtual void iorq_w(offs_t offset, uint8_t data) override; + virtual uint8_t iorq_r(address_space &space, offs_t offset, uint8_t data) override; + virtual void iorq_w(address_space &space, offs_t offset, uint8_t data) override; private: required_device<wd2010_device> m_hdc; |