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

Trk: Added preventive disconnects.

Browse Source 
Reviewed-by: hjk
This commit is contained in:
Robert Loehning
2009-10-20 17:51:10 +02:00
parent 1006be240d
commit 30745d049f
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/debugger/gdb/trkgdbadapter.cpp
View File

@@ -413,6 +413,7 @@ void TrkGdbAdapter::waitForTrkConnect()
} }
m_trkDevice.sendTrkInitialPing(); m_trkDevice.sendTrkInitialPing();
sendTrkMessage(0x02); // Disconnect, as trk might be still connected
sendTrkMessage(0x01); // Connect sendTrkMessage(0x01); // Connect
sendTrkMessage(0x05, TrkCB(handleSupportMask)); sendTrkMessage(0x05, TrkCB(handleSupportMask));
sendTrkMessage(0x06, TrkCB(handleCpuType)); sendTrkMessage(0x06, TrkCB(handleCpuType));

1
src/shared/trk/launcher.cpp
View File

@@ -150,6 +150,7 @@ bool Launcher::startServer(QString *errorMessage)
if (!d->m_device.open(d->m_trkServerName, errorMessage)) if (!d->m_device.open(d->m_trkServerName, errorMessage))
return false; return false;
d->m_device.sendTrkInitialPing(); d->m_device.sendTrkInitialPing();
d->m_device.sendTrkMessage(TrkDisconnect); // Disconnect, as trk might be still connected
d->m_device.sendTrkMessage(TrkSupported, TrkCallback(this, &Launcher::handleSupportMask)); d->m_device.sendTrkMessage(TrkSupported, TrkCallback(this, &Launcher::handleSupportMask));
d->m_device.sendTrkMessage(TrkCpuType, TrkCallback(this, &Launcher::handleCpuType)); d->m_device.sendTrkMessage(TrkCpuType, TrkCallback(this, &Launcher::handleCpuType));
d->m_device.sendTrkMessage(TrkVersions, TrkCallback(this, &Launcher::handleTrkVersion)); d->m_device.sendTrkMessage(TrkVersions, TrkCallback(this, &Launcher::handleTrkVersion));