From 281d1fadb34242347da379ddeba75d2195148b4c Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Sun, 5 Jan 2014 01:22:19 +0100 Subject: [PATCH] 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 ++ firmware/buflib.c | 1 + firmware/drivers/audio/as3514.c | 2 ++ firmware/export/system.h | 5 +++-- firmware/font.c | 10 ++++++---- firmware/general.c | 5 +++-- firmware/target/arm/as3525/debug-as3525.c | 3 ++- firmware/target/arm/as3525/lcd-fuze.c | 5 +++-- .../target/arm/as3525/sansa-fuzev2/button-fuzev2.c | 1 + firmware/target/arm/pp/system-target.h | 3 ++- firmware/target/hosted/android/pcm-android.c | 3 ++- firmware/target/hosted/kernel-unix.c | 3 ++- 16 files changed, 41 insertions(+), 18 deletions(-) diff --git a/apps/codec_thread.c b/apps/codec_thread.c index 8f9f5a3c74..f2039d10e6 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 c92415979f..92584187ea 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 e4eb588eb3..dfd6a0474e 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 1e45b66a24..32384537d4 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 7788f659b0..3b6fe5b3ba 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" diff --git a/firmware/buflib.c b/firmware/buflib.c index d7a24b8722..db09d3efc9 100644 --- a/firmware/buflib.c +++ b/firmware/buflib.c @@ -27,6 +27,7 @@ #include /* for abs() */ #include /* for snprintf() */ +#include /* for ptrdiff_t */ #include "buflib.h" #include "string-extra.h" /* strlcpy() */ #include "debug.h" diff --git a/firmware/drivers/audio/as3514.c b/firmware/drivers/audio/as3514.c index 1f79277423..6f531be095 100644 --- a/firmware/drivers/audio/as3514.c +++ b/firmware/drivers/audio/as3514.c @@ -21,9 +21,11 @@ * KIND, either express or implied. * ****************************************************************************/ + #include "cpu.h" #include "debug.h" #include "system.h" +#include "kernel.h" #include "audio.h" #include "sound.h" diff --git a/firmware/export/system.h b/firmware/export/system.h index b1959c496d..25f9287618 100644 --- a/firmware/export/system.h +++ b/firmware/export/system.h @@ -22,9 +22,10 @@ #ifndef __SYSTEM_H__ #define __SYSTEM_H__ +#include +#include + #include "cpu.h" -#include "stdbool.h" -#include "kernel.h" #include "gcc_extensions.h" /* for LIKELY/UNLIKELY */ extern void system_reboot (void); diff --git a/firmware/font.c b/firmware/font.c index 06f104054f..e7a574f0dd 100644 --- a/firmware/font.c +++ b/firmware/font.c @@ -24,14 +24,16 @@ * loaded at startup, as well as their mapping into * the FONT_SYSFIXED, FONT_UI and FONT_MP3 ids. */ -#include "config.h" - #include #include #include -#include "inttypes.h" -#include "lcd.h" +#include +#include + +#include "config.h" #include "system.h" +#include "kernel.h" +#include "lcd.h" #include "font.h" #include "file.h" #include "core_alloc.h" diff --git a/firmware/general.c b/firmware/general.c index 8e6d5af9a0..d6c1d2f465 100644 --- a/firmware/general.c +++ b/firmware/general.c @@ -19,8 +19,10 @@ * ****************************************************************************/ -#include "config.h" #include +#include "config.h" +#include "system.h" +#include "kernel.h" #include "general.h" #include "file.h" #include "dir.h" @@ -28,7 +30,6 @@ #include "limits.h" #include "stdlib.h" #include "string-extra.h" -#include "system.h" #include "time.h" #include "timefuncs.h" diff --git a/firmware/target/arm/as3525/debug-as3525.c b/firmware/target/arm/as3525/debug-as3525.c index 514eebd390..ab70f73165 100644 --- a/firmware/target/arm/as3525/debug-as3525.c +++ b/firmware/target/arm/as3525/debug-as3525.c @@ -20,10 +20,11 @@ ****************************************************************************/ #include +#include "system.h" +#include "kernel.h" #include "button.h" #include "lcd.h" #include "font.h" -#include "system.h" #include "cpu.h" #include "pl180.h" #include "ascodec.h" diff --git a/firmware/target/arm/as3525/lcd-fuze.c b/firmware/target/arm/as3525/lcd-fuze.c index b2033738b6..df4d668ab0 100644 --- a/firmware/target/arm/as3525/lcd-fuze.c +++ b/firmware/target/arm/as3525/lcd-fuze.c @@ -19,11 +19,12 @@ * KIND, either express or implied. * ****************************************************************************/ -#include "config.h" +#include "config.h" #include "cpu.h" -#include "lcd.h" #include "system.h" +#include "kernel.h" +#include "lcd.h" #include "file.h" #include "clock-target.h" #include "dbop-as3525.h" diff --git a/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c b/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c index 8244c475fa..1b30e112fd 100644 --- a/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c +++ b/firmware/target/arm/as3525/sansa-fuzev2/button-fuzev2.c @@ -21,6 +21,7 @@ #include "config.h" #include "system.h" +#include "kernel.h" #include "button.h" #include "backlight.h" diff --git a/firmware/target/arm/pp/system-target.h b/firmware/target/arm/pp/system-target.h index 84419edd77..742044b7be 100644 --- a/firmware/target/arm/pp/system-target.h +++ b/firmware/target/arm/pp/system-target.h @@ -22,9 +22,10 @@ #ifndef SYSTEM_TARGET_H #define SYSTEM_TARGET_H +#include #include "config.h" #include "system-arm.h" -#include +#include "kernel.h" /* TODO: This header could be split in 2 */ diff --git a/firmware/target/hosted/android/pcm-android.c b/firmware/target/hosted/android/pcm-android.c index 0608e971a7..23a003ff73 100644 --- a/firmware/target/hosted/android/pcm-android.c +++ b/firmware/target/hosted/android/pcm-android.c @@ -22,8 +22,9 @@ #include #include #define _SYSTEM_WITH_JNI /* for getJavaEnvironment */ -#include #include +#include "system.h" +#include "kernel.h" #include "debug.h" #include "pcm.h" #include "pcm-internal.h" diff --git a/firmware/target/hosted/kernel-unix.c b/firmware/target/hosted/kernel-unix.c index a0167d46c5..e3c492a8cc 100644 --- a/firmware/target/hosted/kernel-unix.c +++ b/firmware/target/hosted/kernel-unix.c @@ -26,8 +26,10 @@ #include #include #include + #include "config.h" #include "system.h" +#include "kernel.h" #include "button.h" #include "audio.h" #include "panic.h" @@ -165,4 +167,3 @@ void timer_unregister(void) timer_delete(timer_tid); timer_prio = -1; } -