Use strobe macros. Clean up and reformat.

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

diff --git a/bertos/emul/emul.cpp b/bertos/emul/emul.cpp
index 9b06fb90269236d1a34a07164ce9b9af2b47291a..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>
@@ -91,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;
 }
@@ -99,6 +100,5 @@ extern "C" void emul_idle()
 {
        // We process GUI events when the application is idle.
        emul->emulApp->processEvents();
-       usleep(1000);
 }