diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:57:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:57:30 -0600 |
| commit | ad1fc5fc8eadb9b63e8767e57ac41cbac84f7eb7 (patch) | |
| tree | c47273eb6595f763c282d33fb89affe1f8866120 /src/progs/direct/base/direct_mem24.cpp | |
| parent | 9d6927a7d6a543332f828bffedf65eecf6774c6d (diff) | |
| download | piklab-ad1fc5fc8eadb9b63e8767e57ac41cbac84f7eb7.tar.gz piklab-ad1fc5fc8eadb9b63e8767e57ac41cbac84f7eb7.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 9d6927a7d6a543332f828bffedf65eecf6774c6d.
Diffstat (limited to 'src/progs/direct/base/direct_mem24.cpp')
| -rw-r--r-- | src/progs/direct/base/direct_mem24.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/progs/direct/base/direct_mem24.cpp b/src/progs/direct/base/direct_mem24.cpp index f2a00ff..98b5f9a 100644 --- a/src/progs/direct/base/direct_mem24.cpp +++ b/src/progs/direct/base/direct_mem24.cpp @@ -68,18 +68,18 @@ uint Direct::Mem24DeviceSpecific::controlByte(uint address, Operation operation) bool Direct::Mem24DeviceSpecific::setAddress(uint address) { - log(Log::DebugLevel::Extra, TQString("set address %1").arg(toHexLabel(address, nbChars(NumberBase::Hex, address)))); + log(Log::DebugLevel::Extra, TQString("set address %1").tqarg(toHexLabel(address, nbChars(NumberBase::Hex, address)))); if ( !start() ) return false; uint bsize = device().nbBytes() / device().nbBlocks(); uint block = address / bsize; - log(Log::DebugLevel::Extra, TQString(" in block #%1/%2").arg(block).arg(device().nbBlocks())); + log(Log::DebugLevel::Extra, TQString(" in block #%1/%2").tqarg(block).tqarg(device().nbBlocks())); uint cbyte = controlByte(address, Write); - log(Log::DebugLevel::Max, TQString(" control byte is %1").arg(toHexLabel(cbyte, 2))); + log(Log::DebugLevel::Max, TQString(" control byte is %1").tqarg(toHexLabel(cbyte, 2))); if ( !writeByteAck(cbyte) ) return false; uint nb = nbBytes(bsize-1); for (int i=nb-1; i>=0; i--) { uint add = (address >> 8*i) & 0xFF; - log(Log::DebugLevel::Max, TQString(" byte #%1: %2").arg(i).arg(toHexLabel(add, 2))); + log(Log::DebugLevel::Max, TQString(" byte #%1: %2").tqarg(i).tqarg(toHexLabel(add, 2))); if ( !writeByteAck(add) ) return false; } return true; @@ -107,7 +107,7 @@ bool Direct::Mem24DeviceSpecific::doWrite(const Device::Array &data) // page by page (page_size==1: byte by byte) uint nbPages = device().nbBytes() / device().nbBytesPage(); for (uint i=0; i<nbPages; i++) { - log(Log::DebugLevel::Extra, TQString("write page #%1/%2").arg(i).arg(nbPages)); + log(Log::DebugLevel::Extra, TQString("write page #%1/%2").tqarg(i).tqarg(nbPages)); uint address = i * device().nbBytesPage(); // write bytes if ( !setAddress(address) ) return false; @@ -122,7 +122,7 @@ bool Direct::Mem24DeviceSpecific::doWrite(const Device::Array &data) if ( !writeByte(controlByte(address, Write), acked) ) return false; if (acked) break; if ( time.elapsed()>200 ) { // 200 ms timeout - log(Log::LineType::Error, i18n("Timeout writing at address %1").arg(toHexLabel(address, nbChars(device().nbBytes())))); + log(Log::LineType::Error, i18n("Timeout writing at address %1").tqarg(toHexLabel(address, nbChars(device().nbBytes())))); return false; } } |