X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Femul%2Femul.cpp;h=6327a5bf0ca454e161b26c0de74e7cbbdbe60e9c;hb=68ac3bfba91119369e42240a732f542c0c6d2736;hp=29ab59db00bb5769ae5e13654ebd127ce43bba7d;hpb=c22fe24a0da896a52dbc3882390ec18a440ef56a;p=bertos.git

diff --git a/bertos/emul/emul.cpp b/bertos/emul/emul.cpp
index 29ab59db..6327a5bf 100644
--- a/bertos/emul/emul.cpp
+++ b/bertos/emul/emul.cpp
@@ -27,45 +27,27 @@
  * the GNU General Public License.
  *
  * Copyright 2006 Develer S.r.l. (http://www.develer.com/)
- * Copyright 2000, 2001 Bernardo Innocenti <bernie@codewiz.org>
- *
+ * Copyright 2000, 2001, 2008 Bernie Innocenti <bernie@codewiz.org>
  * -->
  *
- * \version $Id$
- *
- * \author Bernardo Innocenti <bernie@develer.com>
- *
  * \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 <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 +82,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 +89,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;
 }