From 9bfc5fb111bc0ab0f4ff75a174a3addfccce6f14 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Sun, 1 Aug 2010 23:23:42 +0200 Subject: [PATCH] RockboxBootloader => Rockbox --- firmware/target/hosted/android/button-android.c | 4 ++-- firmware/target/hosted/android/kernel-android.c | 4 ++-- firmware/target/hosted/android/lcd-android.c | 2 +- firmware/target/hosted/android/pcm-android.c | 4 ++-- firmware/target/hosted/android/system-android.c | 2 +- firmware/target/hosted/android/system-target.h | 2 +- uisimulator/common/io.c | 2 -- 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/firmware/target/hosted/android/button-android.c b/firmware/target/hosted/android/button-android.c index 781623671..2176d8a3a 100644 --- a/firmware/target/hosted/android/button-android.c +++ b/firmware/target/hosted/android/button-android.c @@ -40,7 +40,7 @@ static enum { STATE_DOWN, } last_state = STATE_UNKNOWN; -JNIEXPORT void JNICALL Java_com_example_rbboot_Framebuffer_pixelHandler(JNIEnv*env, jobject this, int x, int y) +JNIEXPORT void JNICALL Java_org_rockbox_RockboxFramebuffer_pixelHandler(JNIEnv*env, jobject this, int x, int y) { /* LOG("%s(): %d:%d\n", __func__, x, y); @@ -50,7 +50,7 @@ JNIEXPORT void JNICALL Java_com_example_rbboot_Framebuffer_pixelHandler(JNIEnv*e last_touch = current_tick; } -JNIEXPORT void JNICALL Java_com_example_rbboot_Framebuffer_touchHandler(JNIEnv*env, jobject this, int down) +JNIEXPORT void JNICALL Java_org_rockbox_RockboxFramebuffer_touchHandler(JNIEnv*env, jobject this, int down) { if (down) last_state = STATE_DOWN; diff --git a/firmware/target/hosted/android/kernel-android.c b/firmware/target/hosted/android/kernel-android.c index 41633d7a6..8a5eca17c 100644 --- a/firmware/target/hosted/android/kernel-android.c +++ b/firmware/target/hosted/android/kernel-android.c @@ -38,7 +38,7 @@ int set_irq_level(int level) } -void Java_com_example_rbboot_RockboxTimer_timerTask(JNIEnv *env, jobject this) +void Java_org_rockbox_RockboxTimer_timerTask(JNIEnv *env, jobject this) { call_tick_tasks(); } @@ -46,7 +46,7 @@ void Java_com_example_rbboot_RockboxTimer_timerTask(JNIEnv *env, jobject this) void tick_start(unsigned int interval_in_ms) { LOG("%s(): scheduled for %d", __func__, interval_in_ms); - jfieldID id = (*env_ptr)->GetFieldID(env_ptr, RbBl_class, "tim", "Lcom/example/rbboot/RockboxTimer;"); + jfieldID id = (*env_ptr)->GetFieldID(env_ptr, RbBl_class, "tim", "Lorg/rockbox/RockboxTimer;"); RockboxTimer_instance = (*env_ptr)->GetObjectField(env_ptr, RbBl_instance, id); RockboxTimer_class = (*env_ptr)->GetObjectClass(env_ptr, RockboxTimer_instance); diff --git a/firmware/target/hosted/android/lcd-android.c b/firmware/target/hosted/android/lcd-android.c index f0c4d9f7d..5d694d4c9 100644 --- a/firmware/target/hosted/android/lcd-android.c +++ b/firmware/target/hosted/android/lcd-android.c @@ -36,7 +36,7 @@ jmethodID java_lcd_update; void lcd_init_device(void) { LOG("%s(): Hello", __func__); - jfieldID id = (*env_ptr)->GetFieldID(env_ptr, RbBl_class, "fb", "Lcom/example/rbboot/Framebuffer;"); + jfieldID id = (*env_ptr)->GetFieldID(env_ptr, RbBl_class, "fb", "Lorg/rockbox/RockboxFramebuffer;"); Framebuffer_instance = (*env_ptr)->GetObjectField(env_ptr, RbBl_instance, id); Framebuffer_class = (*env_ptr)->GetObjectClass(env_ptr, Framebuffer_instance); diff --git a/firmware/target/hosted/android/pcm-android.c b/firmware/target/hosted/android/pcm-android.c index bb883532f..fa9970955 100644 --- a/firmware/target/hosted/android/pcm-android.c +++ b/firmware/target/hosted/android/pcm-android.c @@ -47,7 +47,7 @@ static jobject RockboxPCM_instance; */ #undef LOG #define LOG(...) -void Java_com_example_rbboot_RockboxPCM_pcmSamplesToByteArray(JNIEnv *env, jobject this, +void Java_org_rockbox_RockboxPCM_pcmSamplesToByteArray(JNIEnv *env, jobject this, jbyteArray arr) { LOG("%s()", __func__); @@ -157,7 +157,7 @@ void pcm_play_dma_init(void) LOG("%s", __func__); #if 1 JNIEnv e = *env_ptr; - RockboxPCM_class = e->FindClass(env_ptr, "com/example/rbboot/RockboxPCM"); + RockboxPCM_class = e->FindClass(env_ptr, "org/rockbox/RockboxPCM"); jmethodID constructor = e->GetMethodID(env_ptr, RockboxPCM_class, "", "()V"); RockboxPCM_instance = e->NewObject(env_ptr, RockboxPCM_class, constructor); play_pause = e->GetMethodID(env_ptr, RockboxPCM_class, "play_pause", "(Z)V"); diff --git a/firmware/target/hosted/android/system-android.c b/firmware/target/hosted/android/system-android.c index 758ad9733..7aed9cd85 100644 --- a/firmware/target/hosted/android/system-android.c +++ b/firmware/target/hosted/android/system-android.c @@ -38,7 +38,7 @@ jobject RbBl_instance; jclass RbBl_class; /* this is the entry point of the android app initially called by jni */ -void Java_com_example_rbboot_RockboxBootloader_main(JNIEnv *env, jobject this) +void Java_org_rockbox_RockboxActivity_main(JNIEnv *env, jobject this) { /* hack!!! */ volatile uintptr_t stack = 0; diff --git a/firmware/target/hosted/android/system-target.h b/firmware/target/hosted/android/system-target.h index 6f0b4051b..4c10a0263 100644 --- a/firmware/target/hosted/android/system-target.h +++ b/firmware/target/hosted/android/system-target.h @@ -48,7 +48,7 @@ void gui_message_loop(void); void sim_do_exit(void); #include -#define LOG_TAG "RockboxBootloader" +#define LOG_TAG "Rockbox" #define LOG(args...) \ __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, ##args); diff --git a/uisimulator/common/io.c b/uisimulator/common/io.c index f56a6e869..43ce7c53d 100644 --- a/uisimulator/common/io.c +++ b/uisimulator/common/io.c @@ -56,8 +56,6 @@ #include "thread-sdl.h" <<<<<<< HEAD */ -======= ->>>>>>> master #include "rbpaths.h" /* keep this in sync with file.h! */ -- 2.11.4.GIT