projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor countFileSize to return the size directly.
[bertos.git]
/
bertos
/
emul
/
emul.cpp
diff --git
a/bertos/emul/emul.cpp
b/bertos/emul/emul.cpp
index 4b0627f4798531fcbc837f04743a0e2dd79456a9..3d0eb0a49c5b81ae7ac364816fe294a8919af8a4 100644
(file)
--- a/
bertos/emul/emul.cpp
+++ b/
bertos/emul/emul.cpp
@@
-27,15
+27,13
@@
* the GNU General Public License.
*
* Copyright 2006 Develer S.r.l. (http://www.develer.com/)
* 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)
*
*
+ * \version $Id$
* \author Bernie Innocenti <bernie@codewiz.org>
* \author Bernie Innocenti <bernie@codewiz.org>
- *
- * \brief Qt-based emulator framework for embedded applications (implementation)
*/
#include "emul.h"
*/
#include "emul.h"
@@
-45,27
+43,13
@@
#include <cfg/module.h>
#include <cfg/module.h>
-
-
-#include <cstdlib> // std::exit()
-
#include <QtGui/qapplication.h>
#include <QtGui/qapplication.h>
+#include <cstdlib> // std::exit()
/// The global emulator instance.
Emulator *emul;
/// 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))
Emulator::Emulator(int &argc, char **argv) :
emulApp(new QApplication(argc, argv)),
emulWin(new EmulWin(this))
@@
-100,12
+84,6
@@
extern "C" void emul_init(int *argc, char *argv[])
// setup global emulator pointer
emul = new Emulator(*argc, 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);
}
MOD_INIT(emul);
}
@@
-113,6
+91,10
@@
extern "C" void emul_cleanup()
{
MOD_CLEANUP(emul);
{
MOD_CLEANUP(emul);
+ // Timer must be made inactive before we destroy the emulator
+ extern bool timer_initialized;
+ ASSERT(!timer_initialized);
+
delete emul;
emul = NULL;
}
delete emul;
emul = NULL;
}