From c1bd9b0361ba92c29ceef68d74093e70a1a3e481 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Tue, 3 Jan 2012 23:44:38 +0000 Subject: 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 --- firmware/target/arm/tcc77x/iaudio7/powermgmt-iaudio7.c | 2 +- firmware/target/arm/tcc77x/powermgmt-tcc77x.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'firmware/target/arm/tcc77x') diff --git a/firmware/target/arm/tcc77x/iaudio7/powermgmt-iaudio7.c b/firmware/target/arm/tcc77x/iaudio7/powermgmt-iaudio7.c index 9b65bbde1f..bc7ead61f0 100644 --- a/firmware/target/arm/tcc77x/iaudio7/powermgmt-iaudio7.c +++ b/firmware/target/arm/tcc77x/iaudio7/powermgmt-iaudio7.c @@ -59,7 +59,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) { static unsigned last_tick = 0; diff --git a/firmware/target/arm/tcc77x/powermgmt-tcc77x.c b/firmware/target/arm/tcc77x/powermgmt-tcc77x.c index 90c66d30e6..07a56777d0 100644 --- a/firmware/target/arm/tcc77x/powermgmt-tcc77x.c +++ b/firmware/target/arm/tcc77x/powermgmt-tcc77x.c @@ -59,7 +59,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 current_voltage; } -- cgit v1.2.3