From 83822670dccda50a00c23c42e95a9c283d12169a Mon Sep 17 00:00:00 2001
From: jdgordon <jdgordon@a1c6a512-1295-4272-9138-f99709370657>
Date: Wed, 2 Mar 2011 10:13:56 +0000
Subject: [PATCH] Make android compile (untested)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29496 a1c6a512-1295-4272-9138-f99709370657
---
 apps/hosted/keyboard.c | 8 ++++----
 apps/hosted/yesno.c    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/hosted/keyboard.c b/apps/hosted/keyboard.c
index 4497b60bb4..9407d970fd 100644
--- a/apps/hosted/keyboard.c
+++ b/apps/hosted/keyboard.c
@@ -31,7 +31,7 @@ extern JNIEnv          *env_ptr;
 static jclass           RockboxKeyboardInput_class;
 static jobject          RockboxKeyboardInput_instance;
 static jmethodID        kbd_inputfunc;
-static struct wakeup    kbd_wakeup;
+static struct semaphore kbd_wakeup;
 static bool             accepted;
 static jstring          new_string;
 
@@ -48,7 +48,7 @@ Java_org_rockbox_RockboxKeyboardInput_put_1result(JNIEnv *env, jobject this,
         new_string = _new_string;
         (*env)->NewGlobalRef(env, new_string); /* prevet GC'ing */
     }
-    wakeup_signal(&kbd_wakeup);
+    semaphore_release(&kbd_wakeup);
 }
 
 static void kdb_init(void)
@@ -57,7 +57,7 @@ static void kdb_init(void)
     static jmethodID kbd_is_usable;
     if (RockboxKeyboardInput_class == NULL)
     {
-        wakeup_init(&kbd_wakeup);
+        semaphore_init(&kbd_wakeup, 1, 0);
         /* get the class and its constructor */
         RockboxKeyboardInput_class = e->FindClass(env_ptr,
                                             "org/rockbox/RockboxKeyboardInput");
@@ -94,7 +94,7 @@ int kbd_input(char* text, int buflen)
     e->CallVoidMethod(env_ptr, RockboxKeyboardInput_instance,kbd_inputfunc,
                       str, ok_text, cancel_text);
 
-    wakeup_wait(&kbd_wakeup, TIMEOUT_BLOCK);
+    semaphore_wait(&kbd_wakeup, TIMEOUT_BLOCK);
 
     if (accepted)
     {
diff --git a/apps/hosted/yesno.c b/apps/hosted/yesno.c
index d00cb063af..a1de64e3f9 100644
--- a/apps/hosted/yesno.c
+++ b/apps/hosted/yesno.c
@@ -33,7 +33,7 @@ extern JNIEnv   *env_ptr;
 static jclass    RockboxYesno_class = NULL;
 static jobject   RockboxYesno_instance = NULL;
 static jmethodID yesno_func;
-static struct wakeup    yesno_wakeup;
+static struct semaphore    yesno_done;
 static bool      ret;
 
 JNIEXPORT void JNICALL
@@ -42,7 +42,7 @@ Java_org_rockbox_RockboxYesno_put_1result(JNIEnv *env, jobject this, jboolean re
     (void)env;
     (void)this;
     ret = (bool)result;
-    wakeup_signal(&yesno_wakeup);
+    semaphore_release(&yesno_done);
 }
 
 static void yesno_init(void)
@@ -51,7 +51,7 @@ static void yesno_init(void)
     static jmethodID yesno_is_usable;
     if (RockboxYesno_class == NULL)
     {
-        wakeup_init(&yesno_wakeup);
+        semaphore_init(&yesno_done, 1, 0);
         /* get the class and its constructor */
         RockboxYesno_class = e->FindClass(env_ptr,
                                             "org/rockbox/RockboxYesno");
@@ -109,7 +109,7 @@ enum yesno_res gui_syncyesno_run(const struct text_message * main_message,
     e->CallVoidMethod(env_ptr, RockboxYesno_instance, yesno_func,
                       message, yes, no);
     
-    wakeup_wait(&yesno_wakeup, TIMEOUT_BLOCK);
+    semaphore_wait(&yesno_done, TIMEOUT_BLOCK);
 
     e->DeleteLocalRef(env_ptr, message);
     e->DeleteLocalRef(env_ptr, yes);
-- 
2.11.4.GIT