diff options
author | Björn Stenberg <bjorn@haxx.se> | 2002-05-24 15:40:14 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2002-05-24 15:40:14 +0000 |
commit | 88f7fb02bd9977a43e5368db8783b3bcca25df72 (patch) | |
tree | c296272a206336d450a3405da1d23e5ca791e963 | |
parent | d45a2d2cc852d2009906c51a3c389dc1ff6a3d60 (diff) | |
download | rockbox-88f7fb02bd9977a43e5368db8783b3bcca25df72.tar.gz rockbox-88f7fb02bd9977a43e5368db8783b3bcca25df72.zip |
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.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/apps/main.c b/apps/main.c index 44a218ac77..dc36ce63fb 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -27,6 +27,9 @@ | |||
27 | #include "tree.h" | 27 | #include "tree.h" |
28 | #include "panic.h" | 28 | #include "panic.h" |
29 | #include "menu.h" | 29 | #include "menu.h" |
30 | #include "dmalloc.h" | ||
31 | #include "bmalloc.h" | ||
32 | #include "mpeg.h" | ||
30 | 33 | ||
31 | void app_main(void) | 34 | void app_main(void) |
32 | { | 35 | { |
@@ -35,9 +38,18 @@ void app_main(void) | |||
35 | } | 38 | } |
36 | 39 | ||
37 | #ifndef SIMULATOR | 40 | #ifndef SIMULATOR |
41 | |||
42 | /* defined in linker script */ | ||
43 | extern int poolstart[]; | ||
44 | extern int poolend[]; | ||
45 | |||
38 | int init(void) | 46 | int init(void) |
39 | { | 47 | { |
40 | int rc; | 48 | int rc; |
49 | |||
50 | dmalloc_initialize(); | ||
51 | bmalloc_add_pool(poolstart, poolend-poolstart); | ||
52 | |||
41 | debug_init(); | 53 | debug_init(); |
42 | kernel_init(); | 54 | kernel_init(); |
43 | set_irq_level(0); | 55 | set_irq_level(0); |
@@ -55,6 +67,7 @@ int init(void) | |||
55 | panicf("mount: %d",rc); | 67 | panicf("mount: %d",rc); |
56 | 68 | ||
57 | button_init(); | 69 | button_init(); |
70 | mpeg_init(); | ||
58 | 71 | ||
59 | return 0; | 72 | return 0; |
60 | } | 73 | } |