From be25469b9b481d8f40aeb12aa6de84e1efdc0e68 Mon Sep 17 00:00:00 2001 From: Michael Sparmann Date: Mon, 5 Oct 2009 20:21:33 +0000 Subject: Reworked iPod Nano 2G PMU code, added RTC and battery ADC. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22967 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/arm/s5l8700/ipodnano2g/powermgmt-nano2g.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'firmware/target/arm/s5l8700/ipodnano2g/powermgmt-nano2g.c') diff --git a/firmware/target/arm/s5l8700/ipodnano2g/powermgmt-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/powermgmt-nano2g.c index 508995c436..937905f5f4 100644 --- a/firmware/target/arm/s5l8700/ipodnano2g/powermgmt-nano2g.c +++ b/firmware/target/arm/s5l8700/ipodnano2g/powermgmt-nano2g.c @@ -20,9 +20,8 @@ ****************************************************************************/ #include "config.h" -#include "adc.h" -#include "adc-target.h" #include "powermgmt.h" +#include "pmu-target.h" const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] = { @@ -52,14 +51,14 @@ const unsigned short percent_to_volt_charge[11] = }; #endif /* CONFIG_CHARGING */ -/* ADC should read 0x3ff=5.12V */ -#define BATTERY_SCALE_FACTOR 5125 +/* ADC should read 0x3ff=6.00V */ +#define BATTERY_SCALE_FACTOR 6000 /* full-scale ADC readout (2^10) in millivolt */ /* Returns battery voltage from ADC [millivolts] */ unsigned int battery_adc_voltage(void) { - return 4000; + return pmu_read_battery_voltage(); } -- cgit v1.2.3