summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2002-05-24 15:40:14 +0000
committerBjörn Stenberg <bjorn@haxx.se>2002-05-24 15:40:14 +0000
commit88f7fb02bd9977a43e5368db8783b3bcca25df72 (patch)
treec296272a206336d450a3405da1d23e5ca791e963
parentd45a2d2cc852d2009906c51a3c389dc1ff6a3d60 (diff)
downloadrockbox-88f7fb02bd9977a43e5368db8783b3bcca25df72.zip
rockbox-88f7fb02bd9977a43e5368db8783b3bcca25df72.tar.gz
rockbox-88f7fb02bd9977a43e5368db8783b3bcca25df72.tar.bz2
rockbox-88f7fb02bd9977a43e5368db8783b3bcca25df72.tar.xz
Added linker pool symbols and mpeg_init()
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@700 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/main.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/apps/main.c b/apps/main.c
index 44a218a..dc36ce6 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -27,6 +27,9 @@
#include "tree.h"
#include "panic.h"
#include "menu.h"
+#include "dmalloc.h"
+#include "bmalloc.h"
+#include "mpeg.h"
void app_main(void)
{
@@ -35,9 +38,18 @@ void app_main(void)
}
#ifndef SIMULATOR
+
+/* defined in linker script */
+extern int poolstart[];
+extern int poolend[];
+
int init(void)
{
int rc;
+
+ dmalloc_initialize();
+ bmalloc_add_pool(poolstart, poolend-poolstart);
+
debug_init();
kernel_init();
set_irq_level(0);
@@ -55,6 +67,7 @@ int init(void)
panicf("mount: %d",rc);
button_init();
+ mpeg_init();
return 0;
}