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/arm/imx31 | |
| 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/arm/imx31')
| -rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/powermgmt-gigabeat-s.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/firmware/target/arm/imx31/gigabeat-s/powermgmt-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/powermgmt-gigabeat-s.c index d87e367cba..1a8e12182a 100644 --- a/firmware/target/arm/imx31/gigabeat-s/powermgmt-gigabeat-s.c +++ b/firmware/target/arm/imx31/gigabeat-s/powermgmt-gigabeat-s.c @@ -53,7 +53,7 @@ const unsigned short percent_to_volt_charge[11] = }; /* Returns battery voltage from ADC [millivolts] */ -unsigned int battery_adc_voltage(void) +int _battery_voltage(void) { /* ADC reading 0-1023 = 2400mV-4700mV */ return ((adc_read(ADC_BATTERY) * 2303) >> 10) + 2400; @@ -249,7 +249,7 @@ static int stat_battery_reading(int type) switch (type) { case ADC_BATTERY: - reading = battery_adc_voltage(); + reading = _battery_voltage(); break; case ADC_CHARGER_CURRENT: @@ -780,7 +780,7 @@ static void charger_control(void) /* Battery voltage may have dropped and a charge cycle should * start again. Debounced. */ if (autorecharge_counter < 0 && - battery_adc_voltage() < BATT_FULL_VOLTAGE) + _battery_voltage() < BATT_FULL_VOLTAGE) { /* Try starting a cycle now if battery isn't already topped * off to allow user to ensure the battery is full. */ |