diff options
Diffstat (limited to 'src/devices/pic/prog/pic_prog.cpp')
-rw-r--r-- | src/devices/pic/prog/pic_prog.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/devices/pic/prog/pic_prog.cpp b/src/devices/pic/prog/pic_prog.cpp index 42eeafb..f0c917d 100644 --- a/src/devices/pic/prog/pic_prog.cpp +++ b/src/devices/pic/prog/pic_prog.cpp @@ -256,7 +256,7 @@ bool Programmer::PicBase::verifyDeviceId() BitValue rawId = readDeviceId(); if ( hasError() ) return false; uint nbChars = device()->nbWords(Pic::MemoryRangeType::DeviceId) * device()->nbCharsWord(Pic::MemoryRangeType::DeviceId); - if ( rawId==0x0 || rawId==device()->tqmask(Pic::MemoryRangeType::DeviceId) ) { + if ( rawId==0x0 || rawId==device()->mask(Pic::MemoryRangeType::DeviceId) ) { log(Log::LineType::Error, i18n("Missing or incorrect device (Read id is %1).").tqarg(toHexLabel(rawId, nbChars))); return false; } @@ -366,16 +366,16 @@ bool Programmer::PicBase::restoreBandGapBits() if ( !specific()->canReadRange(Pic::MemoryRangeType::Config) ) return true; bool hasProtectedBits = false; for (uint i=0; i<device()->nbWords(Pic::MemoryRangeType::Config); i++) - if ( device()->config()._words[i].ptqmask!=0 ) hasProtectedBits = true; + if ( device()->config()._words[i].pmask!=0 ) hasProtectedBits = true; if ( !hasProtectedBits ) return true; Device::Array cdata; if ( !specific()->read(Pic::MemoryRangeType::Config, cdata, 0) ) return false; Device::Array data = _deviceMemory->arrayForWriting(Pic::MemoryRangeType::Config); for (uint i=0; i<cdata.count(); i++) { - BitValue ptqmask = device()->config()._words[i].ptqmask; - if ( ptqmask==0 ) continue; - cdata[i] = cdata[i].clearMaskBits(ptqmask); - cdata[i] |= data[i].maskWith(ptqmask); + BitValue pmask = device()->config()._words[i].pmask; + if ( pmask==0 ) continue; + cdata[i] = cdata[i].clearMaskBits(pmask); + cdata[i] |= data[i].maskWith(pmask); } if ( !specific()->canWriteRange(Pic::MemoryRangeType::Config) ) { log(Log::LineType::Warning, i18n("Could not restore band gap bits because programmer does not support writing config bits.")); |