From 281d1fadb34242347da379ddeba75d2195148b4c Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Sun, 5 Jan 2014 01:22:19 +0100 Subject: Do not include kernel.h in system.h. system.h doesn't need it on its own and this change makes it less dependant on Rockbox internals. Change-Id: I4e1e4108a52a7b599627a829204eb82b392fc6d6 --- apps/codec_thread.c | 1 + apps/rbcodecconfig.h | 3 +++ apps/recorder/bmp.c | 4 +++- apps/recorder/resize.c | 8 +++++--- apps/voice_thread.c | 2 ++ 5 files changed, 14 insertions(+), 4 deletions(-) (limited to 'apps') diff --git a/apps/codec_thread.c b/apps/codec_thread.c index 8f9f5a3..f2039d1 100644 --- a/apps/codec_thread.c +++ b/apps/codec_thread.c @@ -20,6 +20,7 @@ * KIND, either express or implied. * ****************************************************************************/ + #include "config.h" #include "system.h" #include "kernel.h" diff --git a/apps/rbcodecconfig.h b/apps/rbcodecconfig.h index c924159..9258418 100644 --- a/apps/rbcodecconfig.h +++ b/apps/rbcodecconfig.h @@ -18,6 +18,9 @@ * {,U}INT{8,16,32,64}_{MIN,MAX} */ #include "system.h" +/* HZ, TIME_AFTER */ +#include "kernel.h" + /* Structure to record some info during processing call */ struct dsp_loop_context { diff --git a/apps/recorder/bmp.c b/apps/recorder/bmp.c index e4eb588..dfd6a04 100644 --- a/apps/recorder/bmp.c +++ b/apps/recorder/bmp.c @@ -38,6 +38,7 @@ ahead by whole lines, or read the next chunk of the current line */ +#define ROCKBOX_DEBUG_BMP_LOADER #include #include #include @@ -53,7 +54,7 @@ #include "lcd-remote.h" #endif #ifdef ROCKBOX_DEBUG_BMP_LOADER -#define BDEBUGF DEBUGF +#define BDEBUGF printf #else #define BDEBUGF(...) #endif @@ -774,6 +775,7 @@ int read_bmp_fd(int fd, #endif .alpha_detected = false, .first_alpha_byte = 0x80, .order = order, + .buf = NULL, }; #if (LCD_DEPTH > 1 || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1)) && \ diff --git a/apps/recorder/resize.c b/apps/recorder/resize.c index 1e45b66..3238453 100644 --- a/apps/recorder/resize.c +++ b/apps/recorder/resize.c @@ -31,12 +31,14 @@ * ****************************************************************************/ -#include #include #include #include -#include -#include "inttypes.h" +#include + +#include "general.h" +#include "kernel.h" +#include "system.h" #ifndef PLUGIN #include "debug.h" #endif diff --git a/apps/voice_thread.c b/apps/voice_thread.c index 7788f65..3b6fe5b 100644 --- a/apps/voice_thread.c +++ b/apps/voice_thread.c @@ -18,8 +18,10 @@ * KIND, either express or implied. * ****************************************************************************/ + #include "config.h" #include "system.h" +#include "kernel.h" #include "core_alloc.h" #include "thread.h" #include "appevents.h" -- cgit v1.1