From 3157e1395674a930c74e2ef4cc4ce78dffea8569 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Wed, 24 Dec 2008 16:58:41 +0000 Subject: Simplify powermgmt thread loops so it calls functions turn (no more power_thread_sleep). Do other target-friendly simplifications, generic battery switch handling and split sim-specific code. Whoever can, please verify charging on the Archos Recorder (due to change in the charger duty cycle code). git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19579 a1c6a512-1295-4272-9138-f99709370657 --- .../target/arm/s3c2440/gigabeat-fx/powermgmt-meg-fx.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'firmware/target/arm/s3c2440/gigabeat-fx') diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/powermgmt-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/powermgmt-meg-fx.c index 6522e6534b..49f7e2e049 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/powermgmt-meg-fx.c +++ b/firmware/target/arm/s3c2440/gigabeat-fx/powermgmt-meg-fx.c @@ -19,9 +19,10 @@ * KIND, either express or implied. * ****************************************************************************/ - #include "config.h" +#include "system.h" #include "adc.h" +#include "power.h" #include "powermgmt.h" const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] = @@ -58,3 +59,17 @@ unsigned int battery_adc_voltage(void) return (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) >> 10; } +unsigned int input_millivolts(void) +{ + + unsigned int batt_millivolts = battery_voltage(); + + if ((power_thread_inputs & POWER_INPUT_BATTERY) == 0) { + /* Just return a safe value if battery isn't connected */ + return 4050; + } + + return batt_millivolts; +} + + -- cgit v1.2.3