diff options
Diffstat (limited to 'firmware/target/hosted')
-rw-r--r-- | firmware/target/hosted/android/kernel-android.c | 2 | ||||
-rw-r--r-- | firmware/target/hosted/android/lcd-android.c | 12 | ||||
-rw-r--r-- | firmware/target/hosted/android/pcm-android.c | 2 | ||||
-rw-r--r-- | firmware/target/hosted/android/system-android.c | 10 |
4 files changed, 11 insertions, 15 deletions
diff --git a/firmware/target/hosted/android/kernel-android.c b/firmware/target/hosted/android/kernel-android.c index 9594516460..1a9b97b419 100644 --- a/firmware/target/hosted/android/kernel-android.c +++ b/firmware/target/hosted/android/kernel-android.c | |||
@@ -25,8 +25,6 @@ | |||
25 | #include "system.h" | 25 | #include "system.h" |
26 | 26 | ||
27 | extern JNIEnv *env_ptr; | 27 | extern JNIEnv *env_ptr; |
28 | extern jclass RockboxActivity_class; | ||
29 | extern jobject RockboxActivity_instance; | ||
30 | 28 | ||
31 | static jclass RockboxTimer_class; | 29 | static jclass RockboxTimer_class; |
32 | static jobject RockboxTimer_instance; | 30 | static jobject RockboxTimer_instance; |
diff --git a/firmware/target/hosted/android/lcd-android.c b/firmware/target/hosted/android/lcd-android.c index ef4004ef2a..efe68cdd71 100644 --- a/firmware/target/hosted/android/lcd-android.c +++ b/firmware/target/hosted/android/lcd-android.c | |||
@@ -26,8 +26,8 @@ | |||
26 | #include "lcd.h" | 26 | #include "lcd.h" |
27 | 27 | ||
28 | extern JNIEnv *env_ptr; | 28 | extern JNIEnv *env_ptr; |
29 | extern jclass RockboxActivity_class; | 29 | extern jclass RockboxService_class; |
30 | extern jobject RockboxActivity_instance; | 30 | extern jobject RockboxService_instance; |
31 | 31 | ||
32 | static jobject Framebuffer_instance; | 32 | static jobject Framebuffer_instance; |
33 | static jmethodID java_lcd_update; | 33 | static jmethodID java_lcd_update; |
@@ -35,13 +35,13 @@ static jmethodID java_lcd_update; | |||
35 | void lcd_init_device(void) | 35 | void lcd_init_device(void) |
36 | { | 36 | { |
37 | /* get the RockboxFramebuffer instance allocated by the activity */ | 37 | /* get the RockboxFramebuffer instance allocated by the activity */ |
38 | jfieldID id = (*env_ptr)->GetFieldID(env_ptr, | 38 | jfieldID id = (*env_ptr)->GetStaticFieldID(env_ptr, |
39 | RockboxActivity_class, | 39 | RockboxService_class, |
40 | "fb", | 40 | "fb", |
41 | "Lorg/rockbox/RockboxFramebuffer;"); | 41 | "Lorg/rockbox/RockboxFramebuffer;"); |
42 | 42 | ||
43 | Framebuffer_instance = (*env_ptr)->GetObjectField(env_ptr, | 43 | Framebuffer_instance = (*env_ptr)->GetStaticObjectField(env_ptr, |
44 | RockboxActivity_instance, | 44 | RockboxService_class, |
45 | id); | 45 | id); |
46 | 46 | ||
47 | jclass Framebuffer_class = (*env_ptr)->GetObjectClass(env_ptr, | 47 | jclass Framebuffer_class = (*env_ptr)->GetObjectClass(env_ptr, |
diff --git a/firmware/target/hosted/android/pcm-android.c b/firmware/target/hosted/android/pcm-android.c index 91978f422b..8c5d2597c4 100644 --- a/firmware/target/hosted/android/pcm-android.c +++ b/firmware/target/hosted/android/pcm-android.c | |||
@@ -25,8 +25,6 @@ | |||
25 | #include "pcm.h" | 25 | #include "pcm.h" |
26 | 26 | ||
27 | extern JNIEnv *env_ptr; | 27 | extern JNIEnv *env_ptr; |
28 | extern jclass RockboxActivity_class; | ||
29 | extern jobject RockboxActivity_instance; | ||
30 | 28 | ||
31 | /* infos about our pcm chunks */ | 29 | /* infos about our pcm chunks */ |
32 | static size_t pcm_data_size; | 30 | static size_t pcm_data_size; |
diff --git a/firmware/target/hosted/android/system-android.c b/firmware/target/hosted/android/system-android.c index 16c6973474..1fb69b3465 100644 --- a/firmware/target/hosted/android/system-android.c +++ b/firmware/target/hosted/android/system-android.c | |||
@@ -32,8 +32,8 @@ void system_init(void) { } | |||
32 | 32 | ||
33 | /* global fields for use with various JNI calls */ | 33 | /* global fields for use with various JNI calls */ |
34 | JNIEnv *env_ptr; | 34 | JNIEnv *env_ptr; |
35 | jobject RockboxActivity_instance; | 35 | jobject RockboxService_instance; |
36 | jclass RockboxActivity_class; | 36 | jclass RockboxService_class; |
37 | 37 | ||
38 | uintptr_t *stackbegin; | 38 | uintptr_t *stackbegin; |
39 | uintptr_t *stackend; | 39 | uintptr_t *stackend; |
@@ -41,7 +41,7 @@ uintptr_t *stackend; | |||
41 | extern int main(void); | 41 | extern int main(void); |
42 | /* this is the entry point of the android app initially called by jni */ | 42 | /* this is the entry point of the android app initially called by jni */ |
43 | JNIEXPORT void JNICALL | 43 | JNIEXPORT void JNICALL |
44 | Java_org_rockbox_RockboxActivity_main(JNIEnv *env, jobject this) | 44 | Java_org_rockbox_RockboxService_main(JNIEnv *env, jobject this) |
45 | { | 45 | { |
46 | /* hack!!! we can't have a valid stack pointer otherwise. | 46 | /* hack!!! we can't have a valid stack pointer otherwise. |
47 | * but we don't really need it anyway, thread.c only needs it | 47 | * but we don't really need it anyway, thread.c only needs it |
@@ -53,7 +53,7 @@ Java_org_rockbox_RockboxActivity_main(JNIEnv *env, jobject this) | |||
53 | volatile uintptr_t stack = 0; | 53 | volatile uintptr_t stack = 0; |
54 | stackbegin = stackend = (uintptr_t*) &stack; | 54 | stackbegin = stackend = (uintptr_t*) &stack; |
55 | env_ptr = env; | 55 | env_ptr = env; |
56 | RockboxActivity_instance = this; | 56 | RockboxService_instance = this; |
57 | RockboxActivity_class = (*env)->GetObjectClass(env, this); | 57 | RockboxService_class = (*env)->GetObjectClass(env, this); |
58 | main(); | 58 | main(); |
59 | } | 59 | } |