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 /uisimulator/common/stubs.c | |
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 'uisimulator/common/stubs.c')
-rw-r--r-- | uisimulator/common/stubs.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/uisimulator/common/stubs.c b/uisimulator/common/stubs.c index f8b8fdc912..ba4faff6e2 100644 --- a/uisimulator/common/stubs.c +++ b/uisimulator/common/stubs.c | |||
@@ -317,32 +317,6 @@ bool usb_charging_enable(bool on) | |||
317 | } | 317 | } |
318 | #endif | 318 | #endif |
319 | 319 | ||
320 | #if CONFIG_CHARGING | ||
321 | bool charger_inserted(void) | ||
322 | { | ||
323 | return false; | ||
324 | } | ||
325 | |||
326 | bool power_input_present(void) | ||
327 | { | ||
328 | return false; | ||
329 | } | ||
330 | |||
331 | unsigned int power_input_status(void) | ||
332 | { | ||
333 | #ifdef HAVE_BATTERY_SWITCH | ||
334 | return POWER_INPUT_BATTERY; | ||
335 | #else | ||
336 | return POWER_INPUT_NONE; | ||
337 | #endif | ||
338 | } | ||
339 | |||
340 | bool charging_state(void) | ||
341 | { | ||
342 | return false; | ||
343 | } | ||
344 | #endif /* CONFIG_CHARGING */ | ||
345 | |||
346 | #ifndef USB_NONE | 320 | #ifndef USB_NONE |
347 | bool usb_inserted(void) | 321 | bool usb_inserted(void) |
348 | { | 322 | { |