Revert "Fix lwip implementation of retransmission timers."

[bertos.git] / bertos / emul / emul.cpp

diff --git a/bertos/emul/emul.cpp b/bertos/emul/emul.cpp
index e26c680e7a0ecfb05f58c13094b86b09db40a2c7..4e8d00fa901fb6639f829495a649f3380e7ad450 100644 (file)
--- a/bertos/emul/emul.cpp
+++ b/bertos/emul/emul.cpp
@@ -32,15 +32,12 @@
  *
  * \brief Qt-based emulator framework for embedded applications (implementation)
  *
- * \version $Id$
  * \author Bernie Innocenti <bernie@codewiz.org>
  */
 
 #include "emul.h"
 #include "emulwin.h"
 
-#include "cfg/cfg_kern.h"
-
 #include <cfg/module.h>
 
 #include <QtGui/qapplication.h>
@@ -50,17 +47,6 @@
 /// The global emulator instance.
 Emulator *emul;
 
-#if CONFIG_KERNEL
-       #include <struct/list.h>
-
-       /// List of process stacks
-       List StackFreeList;
-
-       // HACK: Reserve 64KB of stack space for kernel processes
-       const int NPROC = 8;
-       int stacks[NPROC][(64 * 1024) / sizeof(int)];
-#endif
-
 Emulator::Emulator(int &argc, char **argv) :
        emulApp(new QApplication(argc, argv)),
        emulWin(new EmulWin(this))
@@ -95,12 +81,6 @@ extern "C" void emul_init(int *argc, char *argv[])
        // setup global emulator pointer
        emul = new Emulator(*argc, argv);
 
-#if CONFIG_KERNEL
-       LIST_INIT(&StackFreeList);
-       for (int i = 0; i < NPROC; i++)
-               ADDTAIL(&StackFreeList, (Node *)stacks[i]);
-#endif
-
        MOD_INIT(emul);
 }
 
@@ -108,6 +88,10 @@ extern "C" void emul_cleanup()
 {
        MOD_CLEANUP(emul);
 
+       // Timer must be made inactive before we destroy the emulator
+       extern bool timer_initialized;
+       ASSERT(!timer_initialized);
+
        delete emul;
        emul = NULL;
 }
@@ -116,6 +100,5 @@ extern "C" void emul_idle()
 {
        // We process GUI events when the application is idle.
        emul->emulApp->processEvents();
-       usleep(1000);
 }