From adbd2969e6e6fd584d46ef60a3fa40bf878d7e00 Mon Sep 17 00:00:00 2001 From: Cástor Muñoz Date: Fri, 12 Aug 2016 02:37:45 +0200 Subject: iPod Classic: ADC updates Add code to read USB D+/D- and accessory ADCs, it is shown in HW debug menu, might be useful in future for RB and/or the bootloader to identify external USB chargers. Change-Id: Ia48ca5e06bb7ddc52bb55abedde6734653ce8dba --- firmware/target/arm/s5l8702/ipod6g/powermgmt-ipod6g.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'firmware/target/arm/s5l8702/ipod6g/powermgmt-ipod6g.c') diff --git a/firmware/target/arm/s5l8702/ipod6g/powermgmt-ipod6g.c b/firmware/target/arm/s5l8702/ipod6g/powermgmt-ipod6g.c index 4553b03685..c5f9c9b9f5 100644 --- a/firmware/target/arm/s5l8702/ipod6g/powermgmt-ipod6g.c +++ b/firmware/target/arm/s5l8702/ipod6g/powermgmt-ipod6g.c @@ -24,6 +24,7 @@ #include "pmu-target.h" #include "power.h" #include "audiohw.h" +#include "adc-target.h" const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] = { @@ -49,20 +50,12 @@ const unsigned short percent_to_volt_charge[11] = }; #endif /* CONFIG_CHARGING */ -/* 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] */ int _battery_voltage(void) { - int compensation = (10 * (pmu_read_battery_current() - 7)) / 12; - if (charging_state()) return pmu_read_battery_voltage() - compensation; - return pmu_read_battery_voltage() + compensation; + return adc_read_battery_voltage(); } - #ifdef HAVE_ACCESSORY_SUPPLY void accessory_supply_set(bool enable) { -- cgit v1.2.3