diff options
author | Thomas Martitz <kugel@rockbox.org> | 2012-01-03 23:44:38 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2012-01-03 23:44:38 +0000 |
commit | c1bd9b0361ba92c29ceef68d74093e70a1a3e481 (patch) | |
tree | 1a42acdf2099b7f5ac06eee11e1d488b388c6d9f /firmware/export/config/android.h | |
parent | 949e6398c89e3c277a4c542f67a5ee788c6f642d (diff) | |
download | rockbox-c1bd9b0361ba92c29ceef68d74093e70a1a3e481.tar.gz rockbox-c1bd9b0361ba92c29ceef68d74093e70a1a3e481.zip |
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
Diffstat (limited to 'firmware/export/config/android.h')
-rw-r--r-- | firmware/export/config/android.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/firmware/export/config/android.h b/firmware/export/config/android.h index 41ecacfb9d..6261a80b06 100644 --- a/firmware/export/config/android.h +++ b/firmware/export/config/android.h | |||
@@ -86,11 +86,9 @@ | |||
86 | 86 | ||
87 | #define HAVE_HEADPHONE_DETECTION | 87 | #define HAVE_HEADPHONE_DETECTION |
88 | 88 | ||
89 | /* Define current usage levels. */ | 89 | #define CONFIG_BATTERY_MEASURE PERCENTAGE_MEASURE |
90 | #define CURRENT_NORMAL 88 /* 18 hours from a 1600 mAh battery */ | ||
91 | #define CURRENT_BACKLIGHT 30 /* TBD */ | ||
92 | #define CURRENT_RECORD 0 /* no recording yet */ | ||
93 | 90 | ||
91 | #define NO_LOW_BATTERY_SHUTDOWN | ||
94 | /* Define this to the CPU frequency */ | 92 | /* Define this to the CPU frequency */ |
95 | /* | 93 | /* |
96 | #define CPU_FREQ 48000000 | 94 | #define CPU_FREQ 48000000 |