Rework powermgmt to enable code re-use on appliation and sims.

* Introduce CONFIG_BATTERY_MEASURE define, to allow targets (application)
to break powermgmt.c's assumption about the ability to read battery voltage.
There's now additionally percentage (android) and remaining time measure
(maemo). No measure at all also works (sdl app). If voltage can't be measured,
then battery_level() is king and it'll be used for power_history and runtime
estimation.

* Implement target's API in the simulator, i.e. _battery_voltage(), so it
doesn't need to implement it's own powermgmt.c and other stubs. Now
the sim behaves much more like a native target, although it still
changes the simulated battery voltage quickly,

* Other changes include include renaming battery_adc_voltage() to
_battery_voltage(), for consistency with the new target functions and
making some of the apps code aware that voltage and runtime estimation
is not always available.

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

2 files changed, 8 insertions, 22 deletions

diff --git a/firmware/target/hosted/android/powermgmt-android.c b/firmware/target/hosted/android/powermgmt-android.c
index dcbd7a6214..1e70a81753 100644
--- a/firmware/target/hosted/android/powermgmt-android.c
+++ b/firmware/target/hosted/android/powermgmt-android.c
@@ -28,10 +28,10 @@ extern JNIEnv *env_ptr;
 extern jclass  RockboxService_class;
 extern jobject RockboxService_instance;
 
-static jfieldID _battery_level;
+static jfieldID __battery_level;
 static jobject BatteryMonitor_instance;
 
-void powermgmt_init_target(void)
+static void new_battery_monitor(void)
 {
     JNIEnv e = *env_ptr;
     jclass class = e->FindClass(env_ptr, "org/rockbox/monitors/BatteryMonitor");
@@ -43,29 +43,15 @@ void powermgmt_init_target(void)
                                             RockboxService_instance);
 
     /* cache the battery level field id */
-    _battery_level = (*env_ptr)->GetFieldID(env_ptr,
+    __battery_level = (*env_ptr)->GetFieldID(env_ptr,
                                             class,
                                             "mBattLevel", "I");
 }
 
-int battery_level(void)
+int _battery_level(void)
 {
-    return (*env_ptr)->GetIntField(env_ptr, BatteryMonitor_instance, _battery_level);
+    if (!BatteryMonitor_instance)
+        new_battery_monitor();
+    return (*env_ptr)->GetIntField(env_ptr, BatteryMonitor_instance, __battery_level);
 }
 
-int battery_time(void)
-{   /* cannot calculate yet */
-    return 0;
-}
-
-/* should always be safe on android targets, the host shuts us down before */
-bool battery_level_safe(void)
-{
-    return true;
-}
-
-/* TODO */
-unsigned battery_voltage(void)
-{
-    return 0;
-}
diff --git a/firmware/target/hosted/android/system-android.c b/firmware/target/hosted/android/system-android.c
index fba7ff4e2c..e48e910c0c 100644
--- a/firmware/target/hosted/android/system-android.c
+++ b/firmware/target/hosted/android/system-android.c
@@ -45,7 +45,7 @@ void system_reboot(void) { }
 
 /* this is used to return from the entry point of the native library. */
 static jmp_buf poweroff_buf;
-void shutdown_hw(void)
+void power_off(void)
 {
     longjmp(poweroff_buf, 1);
 }