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/coldfire | |
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/target/coldfire')
6 files changed, 6 insertions, 6 deletions
diff --git a/firmware/target/coldfire/iaudio/m3/powermgmt-m3.c b/firmware/target/coldfire/iaudio/m3/powermgmt-m3.c index bb8f5cf811..b97d6913f2 100644 --- a/firmware/target/coldfire/iaudio/m3/powermgmt-m3.c +++ b/firmware/target/coldfire/iaudio/m3/powermgmt-m3.c | |||
@@ -52,7 +52,7 @@ const unsigned short percent_to_volt_charge[11] = | |||
52 | /* full-scale ADC readout (2^8) in millivolt */ | 52 | /* full-scale ADC readout (2^8) in millivolt */ |
53 | 53 | ||
54 | /* Returns battery voltage from ADC [millivolts] */ | 54 | /* Returns battery voltage from ADC [millivolts] */ |
55 | unsigned int battery_adc_voltage(void) | 55 | int _battery_voltage(void) |
56 | { | 56 | { |
57 | return (adc_read(ADC_BATTERY) * BATTERY_SCALE_FACTOR) >> 8; | 57 | return (adc_read(ADC_BATTERY) * BATTERY_SCALE_FACTOR) >> 8; |
58 | } | 58 | } |
diff --git a/firmware/target/coldfire/iaudio/powermgmt-iaudio.c b/firmware/target/coldfire/iaudio/powermgmt-iaudio.c index 4bfea20432..56915266da 100644 --- a/firmware/target/coldfire/iaudio/powermgmt-iaudio.c +++ b/firmware/target/coldfire/iaudio/powermgmt-iaudio.c | |||
@@ -53,7 +53,7 @@ const unsigned short percent_to_volt_charge[11] = | |||
53 | /* full-scale ADC readout (2^10) in millivolt */ | 53 | /* full-scale ADC readout (2^10) in millivolt */ |
54 | 54 | ||
55 | /* Returns battery voltage from ADC [millivolts] */ | 55 | /* Returns battery voltage from ADC [millivolts] */ |
56 | unsigned int battery_adc_voltage(void) | 56 | int _battery_voltage(void) |
57 | { | 57 | { |
58 | return (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) >> 10; | 58 | return (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) >> 10; |
59 | } | 59 | } |
diff --git a/firmware/target/coldfire/iriver/h100/powermgmt-h100.c b/firmware/target/coldfire/iriver/h100/powermgmt-h100.c index e238711120..20e1a88d4a 100644 --- a/firmware/target/coldfire/iriver/h100/powermgmt-h100.c +++ b/firmware/target/coldfire/iriver/h100/powermgmt-h100.c | |||
@@ -53,7 +53,7 @@ const unsigned short percent_to_volt_charge[11] = | |||
53 | /* full-scale ADC readout (2^8) in millivolt */ | 53 | /* full-scale ADC readout (2^8) in millivolt */ |
54 | 54 | ||
55 | /* Returns battery voltage from ADC [millivolts] */ | 55 | /* Returns battery voltage from ADC [millivolts] */ |
56 | unsigned int battery_adc_voltage(void) | 56 | int _battery_voltage(void) |
57 | { | 57 | { |
58 | return (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) >> 8; | 58 | return (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) >> 8; |
59 | } | 59 | } |
diff --git a/firmware/target/coldfire/iriver/h300/powermgmt-h300.c b/firmware/target/coldfire/iriver/h300/powermgmt-h300.c index 95a5741759..00aad31279 100644 --- a/firmware/target/coldfire/iriver/h300/powermgmt-h300.c +++ b/firmware/target/coldfire/iriver/h300/powermgmt-h300.c | |||
@@ -53,7 +53,7 @@ const unsigned short percent_to_volt_charge[11] = | |||
53 | /* full-scale ADC readout (2^10) in millivolt */ | 53 | /* full-scale ADC readout (2^10) in millivolt */ |
54 | 54 | ||
55 | /* Returns battery voltage from ADC [millivolts] */ | 55 | /* Returns battery voltage from ADC [millivolts] */ |
56 | unsigned int battery_adc_voltage(void) | 56 | int _battery_voltage(void) |
57 | { | 57 | { |
58 | return (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) >> 10; | 58 | return (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) >> 10; |
59 | } | 59 | } |
diff --git a/firmware/target/coldfire/mpio/hd200/powermgmt-hd200.c b/firmware/target/coldfire/mpio/hd200/powermgmt-hd200.c index 9d95938ff9..964d551de1 100644 --- a/firmware/target/coldfire/mpio/hd200/powermgmt-hd200.c +++ b/firmware/target/coldfire/mpio/hd200/powermgmt-hd200.c | |||
@@ -51,7 +51,7 @@ const unsigned short percent_to_volt_charge[11] = | |||
51 | 51 | ||
52 | 52 | ||
53 | /* Returns battery voltage from ADC [millivolts] */ | 53 | /* Returns battery voltage from ADC [millivolts] */ |
54 | unsigned int battery_adc_voltage(void) | 54 | int _battery_voltage(void) |
55 | { | 55 | { |
56 | return (adc_read(ADC_BATTERY) * BATTERY_SCALE_FACTOR) >> 11; | 56 | return (adc_read(ADC_BATTERY) * BATTERY_SCALE_FACTOR) >> 11; |
57 | } | 57 | } |
diff --git a/firmware/target/coldfire/mpio/hd300/powermgmt-hd300.c b/firmware/target/coldfire/mpio/hd300/powermgmt-hd300.c index bdfe9b5fc4..ffd0190073 100644 --- a/firmware/target/coldfire/mpio/hd300/powermgmt-hd300.c +++ b/firmware/target/coldfire/mpio/hd300/powermgmt-hd300.c | |||
@@ -51,7 +51,7 @@ const unsigned short percent_to_volt_charge[11] = | |||
51 | 51 | ||
52 | 52 | ||
53 | /* Returns battery voltage from ADC [millivolts] */ | 53 | /* Returns battery voltage from ADC [millivolts] */ |
54 | unsigned int battery_adc_voltage(void) | 54 | int _battery_voltage(void) |
55 | { | 55 | { |
56 | return (adc_read(ADC_BATTERY) * BATTERY_SCALE_FACTOR) >> 11; | 56 | return (adc_read(ADC_BATTERY) * BATTERY_SCALE_FACTOR) >> 11; |
57 | } | 57 | } |