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/target/sh | |
| parent | 949e6398c89e3c277a4c542f67a5ee788c6f642d (diff) | |
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/target/sh')
4 files changed, 4 insertions, 4 deletions
diff --git a/firmware/target/sh/archos/fm_v2/powermgmt-fm_v2.c b/firmware/target/sh/archos/fm_v2/powermgmt-fm_v2.c index 20596ddedb..5dd7f26d2f 100644 --- a/firmware/target/sh/archos/fm_v2/powermgmt-fm_v2.c +++ b/firmware/target/sh/archos/fm_v2/powermgmt-fm_v2.c @@ -54,7 +54,7 @@ const unsigned short percent_to_volt_charge[11] = /* full-scale ADC readout (2^10) in millivolt */ /* Returns battery voltage from ADC [millivolts] */ -unsigned int battery_adc_voltage(void) +int _battery_voltage(void) { return (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) >> 10; } diff --git a/firmware/target/sh/archos/ondio/powermgmt-ondio.c b/firmware/target/sh/archos/ondio/powermgmt-ondio.c index dc0c37b9f9..dc3cab031f 100644 --- a/firmware/target/sh/archos/ondio/powermgmt-ondio.c +++ b/firmware/target/sh/archos/ondio/powermgmt-ondio.c @@ -46,7 +46,7 @@ const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] = /* full-scale ADC readout (2^10) in millivolt */ /* Returns battery voltage from ADC [millivolts] */ -unsigned int battery_adc_voltage(void) +int _battery_voltage(void) { return (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) >> 10; } diff --git a/firmware/target/sh/archos/player/powermgmt-player.c b/firmware/target/sh/archos/player/powermgmt-player.c index b9a4fe3277..8aa03d88a5 100644 --- a/firmware/target/sh/archos/player/powermgmt-player.c +++ b/firmware/target/sh/archos/player/powermgmt-player.c @@ -56,7 +56,7 @@ const unsigned short percent_to_volt_charge[11] = /* full-scale ADC readout (2^10) in millivolt */ /* Returns battery voltage from ADC [millivolts] */ -unsigned int battery_adc_voltage(void) +int _battery_voltage(void) { return (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) >> 10; } diff --git a/firmware/target/sh/archos/recorder/powermgmt-recorder.c b/firmware/target/sh/archos/recorder/powermgmt-recorder.c index 47f0093456..0bce1585cd 100644 --- a/firmware/target/sh/archos/recorder/powermgmt-recorder.c +++ b/firmware/target/sh/archos/recorder/powermgmt-recorder.c @@ -60,7 +60,7 @@ const unsigned short percent_to_volt_charge[11] = /* full-scale ADC readout (2^10) in millivolt */ /* Returns battery voltage from ADC [millivolts] */ -unsigned int battery_adc_voltage(void) +int _battery_voltage(void) { return (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) >> 10; } |