Revert "S60: Handle TrkNotifyStopped (crash) when running."

This reverts commit 607e545218f7b2faa65ee301593a10774fcb126f.

4 files changed, 8 insertions, 22 deletions

diff --git a/src/plugins/debugger/gdb/trkgdbadapter.cpp b/src/plugins/debugger/gdb/trkgdbadapter.cpp
index b129beb1ab..77c4ac9359 100644
--- a/src/plugins/debugger/gdb/trkgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/trkgdbadapter.cpp
@@ -28,7 +28,6 @@
 **************************************************************************/
 
 #include "trkgdbadapter.h"
-#include "launcher.h"
 #include "trkoptions.h"
 #include "trkoptionspage.h"
 #include "s60debuggerbluetoothstarter.h"
@@ -992,18 +991,16 @@ void TrkGdbAdapter::handleTrkResult(const TrkResult &result)
             logMessage(logMsg);
             break;
         }
-        case TrkNotifyStopped: { // Notified Stopped	   
+        case 0x90: { // Notified Stopped
             // 90 01   78 6a 40 40   00 00 07 23   00 00 07 24  00 00
             debugMessage(_("RESET SNAPSHOT (NOTIFY STOPPED)"));
             m_snapshot.reset();
-            QString reason;
-            uint addr;
-            uint pid;
-            uint tid;
-            trk::Launcher::parseNotifyStopped(result.data, &pid, &tid, &addr, &reason);
-            const QString msg = trk::Launcher::msgStopped(pid, tid, addr, reason);
-            logMessage(prefix + msg);
-            m_engine->manager()->showDebuggerOutput(LogMisc, msg);
+            const char *data = result.data.data();
+            const uint addr = extractInt(data);
+            const uint pid = extractInt(data + 4);
+            const uint tid = extractInt(data + 8);
+            logMessage(prefix + _("NOTE: PID %1/TID %2 "
+                "STOPPED at 0x%3").arg(pid).arg(tid).arg(addr, 0, 16));
             sendTrkAck(result.token);
             if (addr) {
                 // Todo: Do not send off GdbMessages if a synced gdb
@@ -1022,7 +1019,7 @@ void TrkGdbAdapter::handleTrkResult(const TrkResult &result)
                 trkReadRegistersMessage());
             break;
         }
-        case TrkNotifyException: { // Notify Exception (obsolete)
+        case 0x91: { // Notify Exception (obsolete)
             debugMessage(_("RESET SNAPSHOT (NOTIFY EXCEPTION)"));
             m_snapshot.reset();
             logMessage(prefix + "NOTE: EXCEPTION  " + str);
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index e230758e15..94dfb99aec 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -602,8 +602,6 @@ void S60DeviceRunControlBase::signsisProcessFinished()
     connect(m_launcher, SIGNAL(canNotInstall(QString,QString)), this, SLOT(printInstallFailed(QString,QString)));
     connect(m_launcher, SIGNAL(copyProgress(int)), this, SLOT(printCopyProgress(int)));
     connect(m_launcher, SIGNAL(stateChanged(int)), this, SLOT(slotLauncherStateChanged(int)));
-    connect(m_launcher, SIGNAL(processStopped(uint,uint,uint,QString)),
-            this, SLOT(processStopped(uint,uint,uint,QString)));
 
     //TODO sisx destination and file path user definable
     m_launcher->setTrkServerName(m_serialPortName);
@@ -690,12 +688,6 @@ void S60DeviceRunControlBase::launcherFinished()
     handleLauncherFinished();
 }
 
-void S60DeviceRunControlBase::processStopped(uint pc, uint pid, uint tid, const QString& reason)
-{
-    emit addToOutputWindow(this, trk::Launcher::msgStopped(pid, tid, pc, reason));
-    m_launcher->terminate();
-}
-
 QMessageBox *S60DeviceRunControlBase::createTrkWaitingMessageBox(const QString &port, QWidget *parent)
 {
     const QString title  = QCoreApplication::translate("Qt4ProjectManager::Internal::S60DeviceRunControlBase",
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
index 52fa3ed200..04616bf109 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
@@ -155,7 +155,6 @@ protected slots:
     void printApplicationOutput(const QString &output);
 
 private slots:
-    void processStopped(uint pc, uint pid, uint tid, const QString& reason);
     void readStandardError();
     void readStandardOutput();
     void makesisProcessFailed();
diff --git a/tests/manual/trklauncher/main.cpp b/tests/manual/trklauncher/main.cpp
index fc0c589009..9938f84793 100644
--- a/tests/manual/trklauncher/main.cpp
+++ b/tests/manual/trklauncher/main.cpp
@@ -136,8 +136,6 @@ int main(int argc, char *argv[])
         return 1;
     }
     QObject::connect(launcher.data(), SIGNAL(finished()), &app, SLOT(quit()));
-    QObject::connect(launcher.data(), SIGNAL(processStopped(uint,uint,uint,QString)),
-                     launcher.data(), SLOT(terminate()));
     // BLuetooth: Open with prompt
     QString errorMessage;
     if (bluetooth && !trk::ConsoleBluetoothStarter::startBluetooth(launcher->trkDevice(),