Introduce "power" thread for RaaA

I tried to move the #ifdefs and the code
in firmware/powermgmt.c around and it was still
a big mess for hosted applications (RaaA/sim builds).

Create our own "power" thread as recently discussed on IRC.

Fixes the sleep timer for RaaA.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29501 a1c6a512-1295-4272-9138-f99709370657

5 files changed, 64 insertions, 8 deletions

diff --git a/apps/main.c b/apps/main.c
index fe5cbc9e80..0b566b5c01 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -350,6 +350,7 @@ static void init(void)
     font_init();
     show_logo();
     button_init();
+    powermgmt_init();
     backlight_init();
 #if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO|PLATFORM_PANDORA))
     sim_tasks_init();
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 2952ad71d2..32d2a4edfe 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -5,6 +5,9 @@ buffer.c
 general.c
 load_code.c
 powermgmt.c
+#if (CONFIG_PLATFORM & PLATFORM_HOSTED)
+target/hosted/powermgmt.c
+#endif
 system.c
 usb.c
 #ifdef ROCKBOX_HAS_LOGF
diff --git a/firmware/export/powermgmt.h b/firmware/export/powermgmt.h
index b22518f07d..1194432830 100644
--- a/firmware/export/powermgmt.h
+++ b/firmware/export/powermgmt.h
@@ -75,6 +75,9 @@ extern unsigned int power_thread_inputs;
 #include "powermgmt-target.h"
 #endif
 
+/* Start up power management thread */
+void powermgmt_init(void) INIT_ATTR;
+
 #if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 
 /* Generic current values that are intentionally meaningless - config header
@@ -127,9 +130,6 @@ extern const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11];
 extern const unsigned short percent_to_volt_charge[11];
 #endif
 
-/* Start up power management thread */
-void powermgmt_init(void) INIT_ATTR;
-
 #endif /* PLATFORM_NATIVE */
 
 /* Returns battery statust */
diff --git a/firmware/target/hosted/android/system-android.c b/firmware/target/hosted/android/system-android.c
index 009630eeaa..92c2d7cf5d 100644
--- a/firmware/target/hosted/android/system-android.c
+++ b/firmware/target/hosted/android/system-android.c
@@ -35,7 +35,6 @@ uintptr_t *stackbegin;
 uintptr_t *stackend;
 
 extern int main(void);
-extern void powermgmt_init_target(void);
 extern void telephony_init_device(void);
 
 void system_exception_wait(void) { }
@@ -44,10 +43,7 @@ void power_off(void) { }
 
 void system_init(void)
 {
-    /* no better place yet, most of powermgmt.c is #ifdef'd out for non-native
-     * builds */
-    powermgmt_init_target();
-    /* also no better place yet */
+    /* no better place yet */
     telephony_init_device();
 }
 
diff --git a/firmware/target/hosted/powermgmt.c b/firmware/target/hosted/powermgmt.c
new file mode 100644
index 0000000000..d4103a0c00
--- /dev/null
+++ b/firmware/target/hosted/powermgmt.c
@@ -0,0 +1,56 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2011 by Thomas Jarosch
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#include "config.h"
+#include "powermgmt.h"
+#include "thread.h"
+#include "kernel.h"
+
+static char power_stack[DEFAULT_STACK_SIZE];
+static const char power_thread_name[] = "power";
+
+void powermgmt_init_target(void);
+
+#if !(CONFIG_PLATFORM & PLATFORM_ANDROID)
+void powermgmt_init_target(void)
+{
+    /* Nothing to do */
+}
+#endif
+
+static void power_thread(void)
+{
+    powermgmt_init_target();
+
+    while (1)
+    {
+        /* Sleep two seconds */
+        sleep(HZ*2);
+
+        handle_sleep_timer();
+    }
+} /* power_thread */
+
+void powermgmt_init(void)
+{
+    create_thread(power_thread, power_stack, sizeof(power_stack), 0,
+                  power_thread_name IF_PRIO(, PRIORITY_SYSTEM)
+                  IF_COP(, CPU));
+}