diff options
Diffstat (limited to 'src/progs/icd2/base/icd.cpp')
| -rw-r--r-- | src/progs/icd2/base/icd.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/progs/icd2/base/icd.cpp b/src/progs/icd2/base/icd.cpp index bfb1129..d458981 100644 --- a/src/progs/icd2/base/icd.cpp +++ b/src/progs/icd2/base/icd.cpp @@ -37,9 +37,9 @@ Device::Array Icd::DeviceSpecific::prepareRange(Pic::MemoryRangeType type, const if ( wordOffset!=data.count() ) { uint end = (force ? data.count() : findNonMaskEnd(type, data)); nbWords = end - wordOffset + 1; - log(Log::DebugLevel::Normal, QString(" start=%1 nbWords=%2 total=%3 force=%4") - .arg(toHexLabel(wordOffset, device().nbCharsAddress())).arg(toHexLabel(nbWords, device().nbCharsAddress())) - .arg(toHexLabel(data.count(), device().nbCharsAddress())).arg(force ? "true" : "false")); + log(Log::DebugLevel::Normal, TQString(" start=%1 nbWords=%2 total=%3 force=%4") + .tqarg(toHexLabel(wordOffset, device().nbCharsAddress())).tqarg(toHexLabel(nbWords, device().nbCharsAddress())) + .tqarg(toHexLabel(data.count(), device().nbCharsAddress())).tqarg(force ? "true" : "false")); } _base.progressMonitor().addTaskProgress(data.count()-nbWords); return data.mid(wordOffset, nbWords); @@ -52,7 +52,7 @@ bool Icd::DeviceSpecific::doWrite(Pic::MemoryRangeType type, const Device::Array uint nb = device().nbWordsWriteAlignment(Pic::MemoryRangeType::Code); if ( device().architecture()==Pic::Architecture::P18J && type==Pic::MemoryRangeType::Config ) { Q_ASSERT( data.count()%2==0 ); - int delta = nb - data.count()/2; // config memory words contains 1 byte + int delta = nb - data.count()/2; // config memory words tqcontains 1 byte Q_ASSERT( delta>=0 ); Device::Array rdata(delta); uint wordOffset = device().nbWords(Pic::MemoryRangeType::Code) - delta; @@ -87,7 +87,7 @@ bool Icd::DeviceSpecific::doErase(bool) { if ( device().architecture()==Pic::Architecture::P18J ) { // ### also true for others ? Device::Array data(device().nbWords(Pic::MemoryRangeType::Config)); - for (uint i=0; i<data.size(); i++) data[i] = device().config()._words[i].wmask; + for (uint i=0; i<data.size(); i++) data[i] = device().config()._words[i].wtqmask; if ( !doWrite(Pic::MemoryRangeType::Config, data, true) ) return false; } return hardware().eraseAll(); |