diff options
-rw-r--r-- | firmware/SOURCES | 8 | ||||
-rw-r--r-- | firmware/debug.c | 2 | ||||
-rw-r--r-- | firmware/export/debug.h | 7 | ||||
-rw-r--r-- | firmware/target/hosted/android/debug-android.c | 52 | ||||
-rw-r--r-- | firmware/target/hosted/android/pcm-android.c | 3 | ||||
-rw-r--r-- | firmware/target/hosted/android/system-target.h | 5 |
6 files changed, 62 insertions, 15 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index ac1a3e1be4..08ba20c610 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -20,7 +20,10 @@ rolo.c | |||
20 | #endif /* !defined(BOOTLOADER) || defined(CPU_SH) */ | 20 | #endif /* !defined(BOOTLOADER) || defined(CPU_SH) */ |
21 | thread.c | 21 | thread.c |
22 | timer.c | 22 | timer.c |
23 | debug.c | ||
23 | #endif /* PLATFORM_NATIVE */ | 24 | #endif /* PLATFORM_NATIVE */ |
25 | panic.c | ||
26 | |||
24 | #ifdef HAVE_SDL | 27 | #ifdef HAVE_SDL |
25 | target/hosted/sdl/button-sdl.c | 28 | target/hosted/sdl/button-sdl.c |
26 | target/hosted/sdl/kernel-sdl.c | 29 | target/hosted/sdl/kernel-sdl.c |
@@ -43,8 +46,6 @@ target/hosted/sdl/key_to_touch-sdl.c | |||
43 | target/hosted/sdl/app/button-application.c | 46 | target/hosted/sdl/app/button-application.c |
44 | #endif | 47 | #endif |
45 | #endif | 48 | #endif |
46 | panic.c | ||
47 | debug.c | ||
48 | 49 | ||
49 | /* Standard library */ | 50 | /* Standard library */ |
50 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(__MINGW32__) || defined(__CYGWIN__) | 51 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(__MINGW32__) || defined(__CYGWIN__) |
@@ -1707,6 +1708,9 @@ target/hosted/android/fs-android.c | |||
1707 | target/hosted/android/lcd-android.c | 1708 | target/hosted/android/lcd-android.c |
1708 | target/hosted/android/lc-android.c | 1709 | target/hosted/android/lc-android.c |
1709 | target/hosted/android/button-android.c | 1710 | target/hosted/android/button-android.c |
1711 | #ifdef DEBUG | ||
1712 | target/hosted/android/debug-android.c | ||
1713 | #endif | ||
1710 | target/hosted/android/kernel-android.c | 1714 | target/hosted/android/kernel-android.c |
1711 | target/hosted/android/pcm-android.c | 1715 | target/hosted/android/pcm-android.c |
1712 | target/hosted/android/powermgmt-android.c | 1716 | target/hosted/android/powermgmt-android.c |
diff --git a/firmware/debug.c b/firmware/debug.c index 94404586de..bc382335b6 100644 --- a/firmware/debug.c +++ b/firmware/debug.c | |||
@@ -35,7 +35,6 @@ static char debugbuf[400]; | |||
35 | #endif | 35 | #endif |
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | #ifndef SIMULATOR /* allow non archos platforms to display output */ | ||
39 | #include "kernel.h" | 38 | #include "kernel.h" |
40 | #include "system.h" | 39 | #include "system.h" |
41 | #include "debug.h" | 40 | #include "debug.h" |
@@ -257,4 +256,3 @@ void debugf(const char *fmt, ...) | |||
257 | #endif | 256 | #endif |
258 | } | 257 | } |
259 | 258 | ||
260 | #endif | ||
diff --git a/firmware/export/debug.h b/firmware/export/debug.h index d037edf656..93ebd5f546 100644 --- a/firmware/export/debug.h +++ b/firmware/export/debug.h | |||
@@ -33,13 +33,10 @@ extern void ldebugf(const char* file, int line, const char *fmt, ...) | |||
33 | #ifdef __GNUC__ | 33 | #ifdef __GNUC__ |
34 | 34 | ||
35 | /* */ | 35 | /* */ |
36 | #if defined(SIMULATOR) && !defined(__PCTOOL__) | 36 | #if (SIMULATOR) && !defined(__PCTOOL__) \ |
37 | || ((CONFIG_PLATFORM & PLATFORM_ANDROID) && defined(DEBUG)) | ||
37 | #define DEBUGF debugf | 38 | #define DEBUGF debugf |
38 | #define LDEBUGF(...) ldebugf(__FILE__, __LINE__, __VA_ARGS__) | 39 | #define LDEBUGF(...) ldebugf(__FILE__, __LINE__, __VA_ARGS__) |
39 | #elif (CONFIG_PLATFORM & PLATFORM_ANDROID) | ||
40 | #include "system-target.h" | ||
41 | #define DEBUGF LOG | ||
42 | #define LDEBUGF(...) | ||
43 | #else | 40 | #else |
44 | #if defined(DEBUG) | 41 | #if defined(DEBUG) |
45 | 42 | ||
diff --git a/firmware/target/hosted/android/debug-android.c b/firmware/target/hosted/android/debug-android.c new file mode 100644 index 0000000000..a478168e4c --- /dev/null +++ b/firmware/target/hosted/android/debug-android.c | |||
@@ -0,0 +1,52 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (c) 2010 Thomas Martitz | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or | ||
13 | * modify it under the terms of the GNU General Public License | ||
14 | * as published by the Free Software Foundation; either version 2 | ||
15 | * of the License, or (at your option) any later version. | ||
16 | * | ||
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
18 | * KIND, either express or implied. | ||
19 | * | ||
20 | ****************************************************************************/ | ||
21 | |||
22 | |||
23 | |||
24 | #include "config.h" | ||
25 | #ifdef DEBUG | ||
26 | #include <android/log.h> | ||
27 | #include <stdarg.h> | ||
28 | #include <stdio.h> | ||
29 | |||
30 | #define LOG_TAG "Rockbox" | ||
31 | |||
32 | void debug_init(void) {} | ||
33 | |||
34 | void debugf(const char *fmt, ...) | ||
35 | { | ||
36 | va_list ap; | ||
37 | va_start(ap, fmt); | ||
38 | __android_log_vprint(ANDROID_LOG_DEBUG, LOG_TAG, fmt, ap); | ||
39 | va_end(ap); | ||
40 | } | ||
41 | |||
42 | void ldebugf(const char* file, int line, const char *fmt, ...) | ||
43 | { | ||
44 | va_list ap; | ||
45 | char buf[1024]; | ||
46 | snprintf(buf, sizeof(buf), "%s:%d %s", file, line, fmt); | ||
47 | va_start(ap, fmt); | ||
48 | __android_log_vprint(ANDROID_LOG_DEBUG, LOG_TAG " L", buf, ap); | ||
49 | va_end(ap); | ||
50 | } | ||
51 | |||
52 | #endif | ||
diff --git a/firmware/target/hosted/android/pcm-android.c b/firmware/target/hosted/android/pcm-android.c index 649b42d421..c8bc410a54 100644 --- a/firmware/target/hosted/android/pcm-android.c +++ b/firmware/target/hosted/android/pcm-android.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <jni.h> | 22 | #include <jni.h> |
23 | #include <stdbool.h> | 23 | #include <stdbool.h> |
24 | #include <system.h> | 24 | #include <system.h> |
25 | #include "debug.h" | ||
25 | #include "pcm.h" | 26 | #include "pcm.h" |
26 | 27 | ||
27 | extern JNIEnv *env_ptr; | 28 | extern JNIEnv *env_ptr; |
@@ -73,7 +74,7 @@ Java_org_rockbox_RockboxPCM_pcmSamplesToByteArray(JNIEnv *env, | |||
73 | pcm_play_get_more_callback((void**)&pcm_data_start, &pcm_data_size); | 74 | pcm_play_get_more_callback((void**)&pcm_data_start, &pcm_data_size); |
74 | if (pcm_data_size == 0) | 75 | if (pcm_data_size == 0) |
75 | { | 76 | { |
76 | LOG("out of data\n"); | 77 | DEBUGF("out of data\n"); |
77 | return; | 78 | return; |
78 | } | 79 | } |
79 | if (remaining > pcm_data_size) | 80 | if (remaining > pcm_data_size) |
diff --git a/firmware/target/hosted/android/system-target.h b/firmware/target/hosted/android/system-target.h index 210d191d6c..0bd6d78fe0 100644 --- a/firmware/target/hosted/android/system-target.h +++ b/firmware/target/hosted/android/system-target.h | |||
@@ -28,11 +28,6 @@ | |||
28 | 28 | ||
29 | void power_off(void); | 29 | void power_off(void); |
30 | 30 | ||
31 | #include <android/log.h> | ||
32 | #define LOG_TAG "Rockbox" | ||
33 | #define LOG(args...) \ | ||
34 | __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, ##args); | ||
35 | |||
36 | #endif /* __SYSTEM_TARGET_H__ */ | 31 | #endif /* __SYSTEM_TARGET_H__ */ |
37 | 32 | ||
38 | #define NEED_GENERIC_BYTESWAPS | 33 | #define NEED_GENERIC_BYTESWAPS |