diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-01 13:22:13 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-01 13:22:13 -0600 |
commit | 9abf98be4f3111c54f13dcb44902a275bd2d7169 (patch) | |
tree | d6771816657222c79deae56c23c2d6339cba27e3 /src/progs/icd2/base | |
parent | 2b18f76290022900fe896ebac6b2b6da30a9f136 (diff) | |
download | piklab-9abf98be4f3111c54f13dcb44902a275bd2d7169.tar.gz piklab-9abf98be4f3111c54f13dcb44902a275bd2d7169.zip |
Rename additional global TQt functions
Diffstat (limited to 'src/progs/icd2/base')
-rw-r--r-- | src/progs/icd2/base/icd2.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/progs/icd2/base/icd2.cpp b/src/progs/icd2/base/icd2.cpp index 073dd26..5ae7415 100644 --- a/src/progs/icd2/base/icd2.cpp +++ b/src/progs/icd2/base/icd2.cpp @@ -311,7 +311,7 @@ bool Icd2::Hardware::selfTest(TestData &test) bool Icd2::Hardware::readBlock(uint nbBytesWord, uint nbWords, Device::Array &data) { - //qDebug("readBlock %i %s", nbBytesWord, toHex(nbWords, 8).data()); + //tqDebug("readBlock %i %s", nbBytesWord, toHex(nbWords, 8).data()); // receive data uint length = 2*nbBytesWord*nbWords+4; TQString s; @@ -337,7 +337,7 @@ bool Icd2::Hardware::readBlock(uint nbBytesWord, uint nbWords, Device::Array &da TQ_UINT8 chk = 0; for (uint i=0; i<nbWords; i++) { TQString ts = s.mid(1+2*nbBytesWord*i, 2*nbBytesWord); - //if ( i<10 ) qDebug("%i: %s", i, ts.data()); + //if ( i<10 ) tqDebug("%i: %s", i, ts.data()); data[i] = 0; for (int k=nbBytesWord-1; k>=0; k--) { data[i] = data[i] << 8; @@ -366,12 +366,12 @@ bool Icd2::Hardware::readMemory(Pic::MemoryRangeType type, uint wordOffset, Address start = device().range(type).start; // address uint todo = inc * data.count(); // address uint offset = inc * wordOffset; // address - //qDebug("read size=%s div=%i nbBytes=%i", toHex(size, 8).data(), div, nbBytesWord); + //tqDebug("read size=%s div=%i nbBytes=%i", toHex(size, 8).data(), div, nbBytesWord); data.resize(0); do { uint size = TQMIN(todo, uint(0x1000)); // addresses uint nb = size / inc; // word - //qDebug("read %s start=%s size=%s", Pic::MEMORY_RANGE_TYPE_DATA[type].label, toHex(start+offset, 8).data(), toHex(nb, 8).data()); + //tqDebug("read %s start=%s size=%s", Pic::MEMORY_RANGE_TYPE_DATA[type].label, toHex(start+offset, 8).data(), toHex(nb, 8).data()); TQString cmd = r + toHex(start+offset, 8) + toHex(nb/div, 8); if ( !command(cmd, 0) ) return false; Device::Array pdata; @@ -400,7 +400,7 @@ bool Icd2::Hardware::writeBlock(uint nbBytesWord, const Device::Array &data, uin for (uint i=0; i<nbWords; i++) { TQString ts = toHex(data[wordIndex+i], 2*nbBytesWord); for (int k=nbBytesWord-1; k>=0; k--) { - //if ( i<10 || i>=nbWords-10 ) qDebug("send: %i-%i %s", i, k, ts.mid(2*k, 2).data()); + //if ( i<10 || i>=nbWords-10 ) tqDebug("send: %i-%i %s", i, k, ts.mid(2*k, 2).data()); s += ts.mid(2*k, 2); chk += ts[2*k].latin1() + ts[2*k+1].latin1(); } @@ -422,13 +422,13 @@ bool Icd2::Hardware::writeBlock(uint nbBytesWord, const Device::Array &data, uin i += size; } - //qDebug("done sending %i words (chk=%s)", nbWords, toHex(chk, 2).data()); + //tqDebug("done sending %i words (chk=%s)", nbWords, toHex(chk, 2).data()); return true; } bool Icd2::Hardware::writeMemory(Pic::MemoryRangeType type, uint wordOffset, const Device::Array &data) { - //qDebug("write memory: offset:%s nbWords:%s (size: %s)", toHex(wordOffset, 4).data(), toHex(nbWords, 4).data(), toHex(data.size(), 4).data()); + //tqDebug("write memory: offset:%s nbWords:%s (size: %s)", toHex(wordOffset, 4).data(), toHex(nbWords, 4).data(), toHex(data.size(), 4).data()); const char *w = writeCommand(type); if ( w==0 ) return true; uint nbBytesWord = device().nbBytesWord(type); @@ -439,11 +439,11 @@ bool Icd2::Hardware::writeMemory(Pic::MemoryRangeType type, uint wordOffset, con uint todo = inc * data.count(); // address uint offset = inc * wordOffset; // address uint index = 0; - //qDebug("write todo=%s div=%i nbBytes=%i dataSize=%i", toHex(todo, 8).data(), div, nbBytesWord, data.size()); + //tqDebug("write todo=%s div=%i nbBytes=%i dataSize=%i", toHex(todo, 8).data(), div, nbBytesWord, data.size()); do { uint size = TQMIN(todo, uint(0x1000)); // address uint nb = size / inc; // word - //qDebug("write %s start=%s nbWords=%s", Pic::MEMORY_RANGE_TYPE_DATA[type].label, toHex(start+offset, 8).data(), toHex(nb, 8).data()); + //tqDebug("write %s start=%s nbWords=%s", Pic::MEMORY_RANGE_TYPE_DATA[type].label, toHex(start+offset, 8).data(), toHex(nb, 8).data()); TQString cmd = w + toHex(start+offset+index, 8) + toHex(nb/div, 8); if ( !command(cmd, 0) ) return false; if ( !writeBlock(nbBytesWord, data, index/inc, nb) ) return false; |