feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Trk: Pass on frame option

Browse Source
This commit is contained in:
Friedemann Kleint
2009-08-21 16:45:36 +02:00
parent 09dc43ba5c
commit d922b614fc
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/manual/trk/adapter.cpp
View File

@@ -150,7 +150,7 @@ private:
void reportReadMemory(const TrkResult &result); void reportReadMemory(const TrkResult &result);
void reportToGdb(const TrkResult &result); void reportToGdb(const TrkResult &result);
void clearTrkBreakpoint(const Breakpoint &bp); void clearTrkBreakpoint(const Breakpoint &bp);
void readMemory(uint addr, uint len); void readMemory(uint addr, uint len);
void startInferiorIfNeeded(); void startInferiorIfNeeded();
void interruptInferior(); void interruptInferior();
@@ -794,12 +794,14 @@ bool Adapter::openTrkPort(const QString &port, QString *errorMessage)
connect(m_socketDevice.data(), SIGNAL(messageReceived(trk::TrkResult)), this, SLOT(handleResult(trk::TrkResult))); connect(m_socketDevice.data(), SIGNAL(messageReceived(trk::TrkResult)), this, SLOT(handleResult(trk::TrkResult)));
if (m_verbose > 1) if (m_verbose > 1)
m_socketDevice->setVerbose(true); m_socketDevice->setVerbose(true);
m_socketDevice->setSerialFrame(m_serialFrame);
return true; return true;
} }
m_trkDevice = QSharedPointer<TrkWriteQueueDevice>(new TrkWriteQueueDevice); m_trkDevice = QSharedPointer<TrkWriteQueueDevice>(new TrkWriteQueueDevice);
connect(m_trkDevice.data(), SIGNAL(messageReceived(trk::TrkResult)), this, SLOT(handleResult(trk::TrkResult))); connect(m_trkDevice.data(), SIGNAL(messageReceived(trk::TrkResult)), this, SLOT(handleResult(trk::TrkResult)));
if (m_verbose > 1) if (m_verbose > 1)
m_trkDevice->setVerbose(true); m_trkDevice->setVerbose(true);
m_trkDevice->setSerialFrame(m_serialFrame);
return m_trkDevice->open(port, errorMessage); return m_trkDevice->open(port, errorMessage);
} }
@@ -853,7 +855,7 @@ void Adapter::handleResult(const TrkResult &result)
QByteArray str = result.toString().toUtf8(); QByteArray str = result.toString().toUtf8();
switch (result.code) { switch (result.code) {
case 0x80: // ACK case 0x80: // ACK
break; break;
case 0xff: { // NAK. This mostly means transmission error, not command failed. case 0xff: { // NAK. This mostly means transmission error, not command failed.
QString logMsg; QString logMsg;
QTextStream(&logMsg) << prefix << "NAK: for token=" << result.token << " ERROR: " << errorMessage(result.data.at(0)) << ' ' << str; QTextStream(&logMsg) << prefix << "NAK: for token=" << result.token << " ERROR: " << errorMessage(result.data.at(0)) << ' ' << str;