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
This commit is contained in:
Thomas Martitz 2014-01-05 01:22:19 +01:00
parent dd7b141736
commit 281d1fadb3
16 changed files with 41 additions and 18 deletions

View file

@ -20,6 +20,7 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
****************************************************************************/ ****************************************************************************/
#include "config.h" #include "config.h"
#include "system.h" #include "system.h"
#include "kernel.h" #include "kernel.h"

View file

@ -18,6 +18,9 @@
* {,U}INT{8,16,32,64}_{MIN,MAX} */ * {,U}INT{8,16,32,64}_{MIN,MAX} */
#include "system.h" #include "system.h"
/* HZ, TIME_AFTER */
#include "kernel.h"
/* Structure to record some info during processing call */ /* Structure to record some info during processing call */
struct dsp_loop_context struct dsp_loop_context
{ {

View file

@ -38,6 +38,7 @@
ahead by whole lines, or read the next chunk of the current line ahead by whole lines, or read the next chunk of the current line
*/ */
#define ROCKBOX_DEBUG_BMP_LOADER
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -53,7 +54,7 @@
#include "lcd-remote.h" #include "lcd-remote.h"
#endif #endif
#ifdef ROCKBOX_DEBUG_BMP_LOADER #ifdef ROCKBOX_DEBUG_BMP_LOADER
#define BDEBUGF DEBUGF #define BDEBUGF printf
#else #else
#define BDEBUGF(...) #define BDEBUGF(...)
#endif #endif
@ -774,6 +775,7 @@ int read_bmp_fd(int fd,
#endif #endif
.alpha_detected = false, .first_alpha_byte = 0x80, .alpha_detected = false, .first_alpha_byte = 0x80,
.order = order, .order = order,
.buf = NULL,
}; };
#if (LCD_DEPTH > 1 || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1)) && \ #if (LCD_DEPTH > 1 || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1)) && \

View file

@ -31,12 +31,14 @@
* *
****************************************************************************/ ****************************************************************************/
#include <system.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <general.h> #include <stdint.h>
#include "inttypes.h"
#include "general.h"
#include "kernel.h"
#include "system.h"
#ifndef PLUGIN #ifndef PLUGIN
#include "debug.h" #include "debug.h"
#endif #endif

View file

@ -18,8 +18,10 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
****************************************************************************/ ****************************************************************************/
#include "config.h" #include "config.h"
#include "system.h" #include "system.h"
#include "kernel.h"
#include "core_alloc.h" #include "core_alloc.h"
#include "thread.h" #include "thread.h"
#include "appevents.h" #include "appevents.h"

View file

@ -27,6 +27,7 @@
#include <stdlib.h> /* for abs() */ #include <stdlib.h> /* for abs() */
#include <stdio.h> /* for snprintf() */ #include <stdio.h> /* for snprintf() */
#include <stddef.h> /* for ptrdiff_t */
#include "buflib.h" #include "buflib.h"
#include "string-extra.h" /* strlcpy() */ #include "string-extra.h" /* strlcpy() */
#include "debug.h" #include "debug.h"

View file

@ -21,9 +21,11 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
****************************************************************************/ ****************************************************************************/
#include "cpu.h" #include "cpu.h"
#include "debug.h" #include "debug.h"
#include "system.h" #include "system.h"
#include "kernel.h"
#include "audio.h" #include "audio.h"
#include "sound.h" #include "sound.h"

View file

@ -22,9 +22,10 @@
#ifndef __SYSTEM_H__ #ifndef __SYSTEM_H__
#define __SYSTEM_H__ #define __SYSTEM_H__
#include <stdbool.h>
#include <stdint.h>
#include "cpu.h" #include "cpu.h"
#include "stdbool.h"
#include "kernel.h"
#include "gcc_extensions.h" /* for LIKELY/UNLIKELY */ #include "gcc_extensions.h" /* for LIKELY/UNLIKELY */
extern void system_reboot (void); extern void system_reboot (void);

View file

@ -24,14 +24,16 @@
* loaded at startup, as well as their mapping into * loaded at startup, as well as their mapping into
* the FONT_SYSFIXED, FONT_UI and FONT_MP3 ids. * the FONT_SYSFIXED, FONT_UI and FONT_MP3 ids.
*/ */
#include "config.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include "inttypes.h" #include <stdint.h>
#include "lcd.h" #include <stddef.h>
#include "config.h"
#include "system.h" #include "system.h"
#include "kernel.h"
#include "lcd.h"
#include "font.h" #include "font.h"
#include "file.h" #include "file.h"
#include "core_alloc.h" #include "core_alloc.h"

View file

@ -19,8 +19,10 @@
* *
****************************************************************************/ ****************************************************************************/
#include "config.h"
#include <stdio.h> #include <stdio.h>
#include "config.h"
#include "system.h"
#include "kernel.h"
#include "general.h" #include "general.h"
#include "file.h" #include "file.h"
#include "dir.h" #include "dir.h"
@ -28,7 +30,6 @@
#include "limits.h" #include "limits.h"
#include "stdlib.h" #include "stdlib.h"
#include "string-extra.h" #include "string-extra.h"
#include "system.h"
#include "time.h" #include "time.h"
#include "timefuncs.h" #include "timefuncs.h"

View file

@ -20,10 +20,11 @@
****************************************************************************/ ****************************************************************************/
#include <stdbool.h> #include <stdbool.h>
#include "system.h"
#include "kernel.h"
#include "button.h" #include "button.h"
#include "lcd.h" #include "lcd.h"
#include "font.h" #include "font.h"
#include "system.h"
#include "cpu.h" #include "cpu.h"
#include "pl180.h" #include "pl180.h"
#include "ascodec.h" #include "ascodec.h"

View file

@ -19,11 +19,12 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
****************************************************************************/ ****************************************************************************/
#include "config.h"
#include "config.h"
#include "cpu.h" #include "cpu.h"
#include "lcd.h"
#include "system.h" #include "system.h"
#include "kernel.h"
#include "lcd.h"
#include "file.h" #include "file.h"
#include "clock-target.h" #include "clock-target.h"
#include "dbop-as3525.h" #include "dbop-as3525.h"

View file

@ -21,6 +21,7 @@
#include "config.h" #include "config.h"
#include "system.h" #include "system.h"
#include "kernel.h"
#include "button.h" #include "button.h"
#include "backlight.h" #include "backlight.h"

View file

@ -22,9 +22,10 @@
#ifndef SYSTEM_TARGET_H #ifndef SYSTEM_TARGET_H
#define SYSTEM_TARGET_H #define SYSTEM_TARGET_H
#include <stdbool.h>
#include "config.h" #include "config.h"
#include "system-arm.h" #include "system-arm.h"
#include <stdbool.h> #include "kernel.h"
/* TODO: This header could be split in 2 */ /* TODO: This header could be split in 2 */

View file

@ -22,8 +22,9 @@
#include <jni.h> #include <jni.h>
#include <stdbool.h> #include <stdbool.h>
#define _SYSTEM_WITH_JNI /* for getJavaEnvironment */ #define _SYSTEM_WITH_JNI /* for getJavaEnvironment */
#include <system.h>
#include <pthread.h> #include <pthread.h>
#include "system.h"
#include "kernel.h"
#include "debug.h" #include "debug.h"
#include "pcm.h" #include "pcm.h"
#include "pcm-internal.h" #include "pcm-internal.h"

View file

@ -26,8 +26,10 @@
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <pthread.h> #include <pthread.h>
#include "config.h" #include "config.h"
#include "system.h" #include "system.h"
#include "kernel.h"
#include "button.h" #include "button.h"
#include "audio.h" #include "audio.h"
#include "panic.h" #include "panic.h"
@ -165,4 +167,3 @@ void timer_unregister(void)
timer_delete(timer_tid); timer_delete(timer_tid);
timer_prio = -1; timer_prio = -1;
} }