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/pet/64k.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/pet/64k.cpp')
-rw-r--r-- | src/devices/bus/pet/64k.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/devices/bus/pet/64k.cpp b/src/devices/bus/pet/64k.cpp index 85f91114386..34249220f3e 100644 --- a/src/devices/bus/pet/64k.cpp +++ b/src/devices/bus/pet/64k.cpp @@ -113,7 +113,7 @@ void pet_64k_expansion_device::device_reset() // pet_norom_r - NO ROM read //------------------------------------------------- -int pet_64k_expansion_device::pet_norom_r(offs_t offset, int sel) +int pet_64k_expansion_device::pet_norom_r(address_space &space, offs_t offset, int sel) { return !BIT(m_ctrl, 7); } @@ -123,7 +123,7 @@ int pet_64k_expansion_device::pet_norom_r(offs_t offset, int sel) // pet_bd_r - buffered data read //------------------------------------------------- -uint8_t pet_64k_expansion_device::pet_bd_r(offs_t offset, uint8_t data, int &sel) +uint8_t pet_64k_expansion_device::pet_bd_r(address_space &space, offs_t offset, uint8_t data, int &sel) { if (BIT(m_ctrl, 7)) { @@ -164,7 +164,7 @@ uint8_t pet_64k_expansion_device::pet_bd_r(offs_t offset, uint8_t data, int &sel // pet_bd_w - buffered data write //------------------------------------------------- -void pet_64k_expansion_device::pet_bd_w(offs_t offset, uint8_t data, int &sel) +void pet_64k_expansion_device::pet_bd_w(address_space &space, offs_t offset, uint8_t data, int &sel) { if (BIT(m_ctrl, 7)) { |