diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/main.c | 6 | ||||
-rw-r--r-- | apps/playlist.c | 2 | ||||
-rw-r--r-- | apps/recorder/bmp.c | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/apps/main.c b/apps/main.c index 39609e6a26..a6e90eed3c 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -33,13 +33,9 @@ | |||
33 | #include "powermgmt.h" | 33 | #include "powermgmt.h" |
34 | #include "adc.h" | 34 | #include "adc.h" |
35 | #include "i2c.h" | 35 | #include "i2c.h" |
36 | #ifndef SIMULATOR | ||
37 | #include "dmalloc.h" | ||
38 | #include "bmalloc.h" | ||
39 | #ifndef DEBUG | 36 | #ifndef DEBUG |
40 | #include "serial.h" | 37 | #include "serial.h" |
41 | #endif | 38 | #endif |
42 | #endif | ||
43 | #include "mpeg.h" | 39 | #include "mpeg.h" |
44 | #include "main_menu.h" | 40 | #include "main_menu.h" |
45 | #include "thread.h" | 41 | #include "thread.h" |
@@ -95,8 +91,6 @@ void init(void) | |||
95 | 91 | ||
96 | settings_reset(); | 92 | settings_reset(); |
97 | 93 | ||
98 | dmalloc_initialize(); | ||
99 | bmalloc_add_pool(poolstart, poolend-poolstart); | ||
100 | lcd_init(); | 94 | lcd_init(); |
101 | 95 | ||
102 | show_logo(); | 96 | show_logo(); |
diff --git a/apps/playlist.c b/apps/playlist.c index 0d9df36e32..692ec4b989 100644 --- a/apps/playlist.c +++ b/apps/playlist.c | |||
@@ -18,8 +18,6 @@ | |||
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | 19 | ||
20 | #include <stdio.h> | 20 | #include <stdio.h> |
21 | #include <malloc.h> | ||
22 | |||
23 | #include <stdlib.h> | 21 | #include <stdlib.h> |
24 | #include <string.h> | 22 | #include <string.h> |
25 | #include "playlist.h" | 23 | #include "playlist.h" |
diff --git a/apps/recorder/bmp.c b/apps/recorder/bmp.c index d02e9d4b15..a92d521ce0 100644 --- a/apps/recorder/bmp.c +++ b/apps/recorder/bmp.c | |||
@@ -32,6 +32,8 @@ | |||
32 | 32 | ||
33 | #include "file.h" | 33 | #include "file.h" |
34 | 34 | ||
35 | #if 0 | ||
36 | |||
35 | #ifdef __GNUC__ | 37 | #ifdef __GNUC__ |
36 | #define STRUCT_PACKED __attribute__((packed)) | 38 | #define STRUCT_PACKED __attribute__((packed)) |
37 | #else | 39 | #else |
@@ -585,3 +587,5 @@ int main(int argc, char **argv) | |||
585 | } | 587 | } |
586 | 588 | ||
587 | #endif | 589 | #endif |
590 | |||
591 | #endif /* 0 */ | ||