diff options
Diffstat (limited to 'src/devices/mem24')
-rw-r--r-- | src/devices/mem24/gui/mem24_hex_view.cpp | 2 | ||||
-rw-r--r-- | src/devices/mem24/mem24/mem24_memory.cpp | 6 | ||||
-rw-r--r-- | src/devices/mem24/prog/mem24_prog.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/devices/mem24/gui/mem24_hex_view.cpp b/src/devices/mem24/gui/mem24_hex_view.cpp index 7ded854..7c30e9f 100644 --- a/src/devices/mem24/gui/mem24_hex_view.cpp +++ b/src/devices/mem24/gui/mem24_hex_view.cpp @@ -34,5 +34,5 @@ BitValue Mem24::HexView::checksum() const BitValue cs = 0x0000; for (uint i=0; i<static_cast<const Data &>(_memory->device()).nbBytes(); i++) cs += static_cast<const Memory *>(_memory)->byte(i); - return cs.tqmaskWith(0xFFFF); + return cs.maskWith(0xFFFF); } diff --git a/src/devices/mem24/mem24/mem24_memory.cpp b/src/devices/mem24/mem24/mem24_memory.cpp index b09aa79..a29cee7 100644 --- a/src/devices/mem24/mem24/mem24_memory.cpp +++ b/src/devices/mem24/mem24/mem24_memory.cpp @@ -34,7 +34,7 @@ void Mem24::Memory::copyFrom(const Device::Memory &memory) Device::Array Mem24::Memory::arrayForWriting() const { Device::Array data(_data.count()); - for (uint i=0; i<data.count(); i++) data[i] = _data[i].tqmaskWith(0xFF); + for (uint i=0; i<data.count(); i++) data[i] = _data[i].maskWith(0xFF); return data; } @@ -55,7 +55,7 @@ BitValue Mem24::Memory::checksum() const { BitValue cs = 0x0000; for (uint i=0; i<_data.count(); i++) cs += _data[i]; - return cs.tqmaskWith(0xFFFF); + return cs.maskWith(0xFFFF); } //----------------------------------------------------------------------------- @@ -86,7 +86,7 @@ void Mem24::Memory::fromHexBuffer(const HexBuffer &hb, WarningTypes &result, warnings += i18n("At least one word (at offset %1) is larger (%2) than the corresponding tqmask (%3).") .tqarg(toHexLabel(k, 8)).tqarg(toHexLabel(_data[k], 8)).tqarg(toHexLabel(tqmask, 8)); } - _data[k] = _data[k].tqmaskWith(tqmask); + _data[k] = _data[k].maskWith(tqmask); } } } diff --git a/src/devices/mem24/prog/mem24_prog.cpp b/src/devices/mem24/prog/mem24_prog.cpp index 338c217..82c596c 100644 --- a/src/devices/mem24/prog/mem24_prog.cpp +++ b/src/devices/mem24/prog/mem24_prog.cpp @@ -32,8 +32,8 @@ bool Programmer::Mem24DeviceSpecific::write(const Device::Array &data) bool Programmer::Mem24DeviceSpecific::verifyByte(uint index, BitValue d, const VerifyData &vdata) { BitValue v = static_cast<const Mem24::Memory &>(vdata.memory).byte(index); - v = v.tqmaskWith(0xFF); - d = d.tqmaskWith(0xFF); + v = v.maskWith(0xFF); + d = d.maskWith(0xFF); if ( v==d ) return true; Address address = index; if ( vdata.actions & BlankCheckVerify ) |