X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Femul%2Femul.cpp;h=4e8d00fa901fb6639f829495a649f3380e7ad450;hb=7911a6f01bc8a19f220f98e2fdc8595f65996853;hp=4b0627f4798531fcbc837f04743a0e2dd79456a9;hpb=4cc44c9888a0336b9d01121ec0b7ad95f4a76195;p=bertos.git

diff --git a/bertos/emul/emul.cpp b/bertos/emul/emul.cpp
index 4b0627f4..4e8d00fa 100644
--- a/bertos/emul/emul.cpp
+++ b/bertos/emul/emul.cpp
@@ -27,45 +27,26 @@
  * the GNU General Public License.
  *
  * Copyright 2006 Develer S.r.l. (http://www.develer.com/)
- * Copyright 2000, 2001 Bernie Innocenti <bernie@codewiz.org>
- *
+ * Copyright 2000, 2001, 2008 Bernie Innocenti <bernie@codewiz.org>
  * -->
  *
- * \version $Id$
+ * \brief Qt-based emulator framework for embedded applications (implementation)
  *
  * \author Bernie Innocenti <bernie@codewiz.org>
- *
- * \brief Qt-based emulator framework for embedded applications (implementation)
  */
 
 #include "emul.h"
 #include "emulwin.h"
 
-#include "cfg/cfg_kern.h"
-
 #include <cfg/module.h>
 
-
-
-#include <cstdlib> // std::exit()
-
 #include <QtGui/qapplication.h>
+#include <cstdlib> // std::exit()
 
 
 /// The global emulator instance.
 Emulator *emul;
 
-#if CONFIG_KERNEL
-	#include <mware/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))
@@ -100,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);
 }
 
@@ -113,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;
 }
@@ -121,6 +100,5 @@ extern "C" void emul_idle()
 {
 	// We process GUI events when the application is idle.
 	emul->emulApp->processEvents();
-	usleep(1000);
 }