diff options
author | 2019-03-25 22:44:58 +0100 | |
---|---|---|
committer | 2019-03-25 22:44:58 +0100 | |
commit | c24473ddff715ecec2e258a6eb38960cf8c8e98e (patch) | |
tree | 8ea44b6396a6129913c0aac13859b5de9965e972 /src/devices/bus/pet/64k.cpp | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
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 34249220f3e..85f91114386 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(address_space &space, offs_t offset, int sel) +int pet_64k_expansion_device::pet_norom_r(offs_t offset, int sel) { return !BIT(m_ctrl, 7); } @@ -123,7 +123,7 @@ int pet_64k_expansion_device::pet_norom_r(address_space &space, offs_t offset, i // pet_bd_r - buffered data read //------------------------------------------------- -uint8_t pet_64k_expansion_device::pet_bd_r(address_space &space, offs_t offset, uint8_t data, int &sel) +uint8_t pet_64k_expansion_device::pet_bd_r(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(address_space &space, offs_t offset, // pet_bd_w - buffered data write //------------------------------------------------- -void pet_64k_expansion_device::pet_bd_w(address_space &space, offs_t offset, uint8_t data, int &sel) +void pet_64k_expansion_device::pet_bd_w(offs_t offset, uint8_t data, int &sel) { if (BIT(m_ctrl, 7)) { |