summaryrefslogtreecommitdiff
path: root/firmware/target/hosted/android/system-android.c
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/hosted/android/system-android.c')
-rw-r--r--firmware/target/hosted/android/system-android.c22
1 files changed, 15 insertions, 7 deletions
diff --git a/firmware/target/hosted/android/system-android.c b/firmware/target/hosted/android/system-android.c
index 7d1fe9d458..009630eeaa 100644
--- a/firmware/target/hosted/android/system-android.c
+++ b/firmware/target/hosted/android/system-android.c
@@ -24,10 +24,6 @@
24#include "config.h" 24#include "config.h"
25#include "system.h" 25#include "system.h"
26 26
27void system_exception_wait(void) { }
28void system_reboot(void) { }
29void power_off(void) { }
30void system_init(void) { }
31 27
32 28
33/* global fields for use with various JNI calls */ 29/* global fields for use with various JNI calls */
@@ -40,6 +36,21 @@ uintptr_t *stackend;
40 36
41extern int main(void); 37extern int main(void);
42extern void powermgmt_init_target(void); 38extern void powermgmt_init_target(void);
39extern void telephony_init_device(void);
40
41void system_exception_wait(void) { }
42void system_reboot(void) { }
43void power_off(void) { }
44
45void system_init(void)
46{
47 /* no better place yet, most of powermgmt.c is #ifdef'd out for non-native
48 * builds */
49 powermgmt_init_target();
50 /* also no better place yet */
51 telephony_init_device();
52}
53
43/* this is the entry point of the android app initially called by jni */ 54/* this is the entry point of the android app initially called by jni */
44JNIEXPORT void JNICALL 55JNIEXPORT void JNICALL
45Java_org_rockbox_RockboxService_main(JNIEnv *env, jobject this) 56Java_org_rockbox_RockboxService_main(JNIEnv *env, jobject this)
@@ -57,8 +68,5 @@ Java_org_rockbox_RockboxService_main(JNIEnv *env, jobject this)
57 RockboxService_instance = this; 68 RockboxService_instance = this;
58 RockboxService_class = (*env)->GetObjectClass(env, this); 69 RockboxService_class = (*env)->GetObjectClass(env, this);
59 70
60 /* no better place yet, most of powermgmt.c is #ifdef'd out for non-native
61 * builds */
62 powermgmt_init_target();
63 main(); 71 main();
64} 72}