diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/bus/wangpc/mvc.h | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/wangpc/mvc.h')
-rw-r--r-- | src/devices/bus/wangpc/mvc.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/devices/bus/wangpc/mvc.h b/src/devices/bus/wangpc/mvc.h index aee0cdf51b2..4620126c04e 100644 --- a/src/devices/bus/wangpc/mvc.h +++ b/src/devices/bus/wangpc/mvc.h @@ -36,10 +36,10 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_wangpcbus_card_interface overrides - virtual uint16_t wangpcbus_mrdc_r(offs_t offset, uint16_t mem_mask) override; - virtual void wangpcbus_amwc_w(offs_t offset, uint16_t mem_mask, uint16_t data) override; - virtual uint16_t wangpcbus_iorc_r(offs_t offset, uint16_t mem_mask) override; - virtual void wangpcbus_aiowc_w(offs_t offset, uint16_t mem_mask, uint16_t data) override; + virtual uint16_t wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask) override; + virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override; + virtual uint16_t wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) override; + virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override; private: MC6845_UPDATE_ROW( crtc_update_row ); |