forked from qt-creator/qt-creator
Symbian: Fixed the 'Adapter start failed' bug
Task-number: QTCREATORBUG-4325 Reviewed-by: Friedemann Kleint
This commit is contained in:
@@ -127,7 +127,8 @@ CodaGdbAdapter::CodaGdbAdapter(GdbEngine *engine) :
|
|||||||
m_uid(0),
|
m_uid(0),
|
||||||
m_verbose(0),
|
m_verbose(0),
|
||||||
m_firstResumableExeLoadedEvent(false),
|
m_firstResumableExeLoadedEvent(false),
|
||||||
m_registerRequestPending(false)
|
m_registerRequestPending(false),
|
||||||
|
m_firstHelloEvent(true)
|
||||||
{
|
{
|
||||||
m_bufferedMemoryRead = true;
|
m_bufferedMemoryRead = true;
|
||||||
// Disable buffering if gdb's dcache is used.
|
// Disable buffering if gdb's dcache is used.
|
||||||
@@ -316,8 +317,11 @@ void CodaGdbAdapter::codaEvent(const CodaEvent &e)
|
|||||||
|
|
||||||
switch (e.type()) {
|
switch (e.type()) {
|
||||||
case CodaEvent::LocatorHello:
|
case CodaEvent::LocatorHello:
|
||||||
|
if (state() == EngineSetupRequested && m_firstHelloEvent) {
|
||||||
|
m_firstHelloEvent = false;
|
||||||
m_codaDevice->sendLoggingAddListenerCommand(CodaCallback());
|
m_codaDevice->sendLoggingAddListenerCommand(CodaCallback());
|
||||||
startGdb(); // Commands are only accepted after hello
|
startGdb(); // Commands are only accepted after hello
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case CodaEvent::RunControlModuleLoadSuspended: // A module was loaded
|
case CodaEvent::RunControlModuleLoadSuspended: // A module was loaded
|
||||||
handleCodaRunControlModuleLoadContextSuspendedEvent(
|
handleCodaRunControlModuleLoadContextSuspendedEvent(
|
||||||
@@ -1027,6 +1031,7 @@ void CodaGdbAdapter::startAdapter()
|
|||||||
m_session.reset();
|
m_session.reset();
|
||||||
m_firstResumableExeLoadedEvent = true;
|
m_firstResumableExeLoadedEvent = true;
|
||||||
m_tcfProcessId.clear();
|
m_tcfProcessId.clear();
|
||||||
|
m_firstHelloEvent = true;
|
||||||
|
|
||||||
// Retrieve parameters.
|
// Retrieve parameters.
|
||||||
const DebuggerStartParameters ¶meters = startParameters();
|
const DebuggerStartParameters ¶meters = startParameters();
|
||||||
|
|||||||
@@ -199,6 +199,7 @@ private:
|
|||||||
bool m_registerRequestPending;
|
bool m_registerRequestPending;
|
||||||
QByteArray m_tcfProcessId;
|
QByteArray m_tcfProcessId;
|
||||||
LocalGdbProcess m_gdbProc;
|
LocalGdbProcess m_gdbProc;
|
||||||
|
bool m_firstHelloEvent;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Internal
|
} // namespace Internal
|
||||||
|
|||||||
Reference in New Issue
Block a user