diff options
Diffstat (limited to 'firmware/target/arm/s5l8700')
-rw-r--r-- | firmware/target/arm/s5l8700/ipodnano2g/powermgmt-nano2g.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/s5l8700/meizu-m3/powermgmt-m3.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/s5l8700/meizu-m6sp/powermgmt-m6sp.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/powermgmt-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/powermgmt-nano2g.c index 52491cf480..647c13ed79 100644 --- a/firmware/target/arm/s5l8700/ipodnano2g/powermgmt-nano2g.c +++ b/firmware/target/arm/s5l8700/ipodnano2g/powermgmt-nano2g.c | |||
@@ -55,7 +55,7 @@ const unsigned short percent_to_volt_charge[11] = | |||
55 | 55 | ||
56 | 56 | ||
57 | /* Returns battery voltage from ADC [millivolts] */ | 57 | /* Returns battery voltage from ADC [millivolts] */ |
58 | unsigned int battery_adc_voltage(void) | 58 | int _battery_voltage(void) |
59 | { | 59 | { |
60 | int compensation = (10 * (pmu_read_battery_current() - 7)) / 12; | 60 | int compensation = (10 * (pmu_read_battery_current() - 7)) / 12; |
61 | if (charging_state()) return pmu_read_battery_voltage() - compensation; | 61 | if (charging_state()) return pmu_read_battery_voltage() - compensation; |
diff --git a/firmware/target/arm/s5l8700/meizu-m3/powermgmt-m3.c b/firmware/target/arm/s5l8700/meizu-m3/powermgmt-m3.c index 3960dab2c1..ccbc098d91 100644 --- a/firmware/target/arm/s5l8700/meizu-m3/powermgmt-m3.c +++ b/firmware/target/arm/s5l8700/meizu-m3/powermgmt-m3.c | |||
@@ -60,7 +60,7 @@ const unsigned short percent_to_volt_charge[11] = | |||
60 | #define BATTERY_SCALE_FACTOR 6000 | 60 | #define BATTERY_SCALE_FACTOR 6000 |
61 | 61 | ||
62 | /* Returns battery voltage from ADC [millivolts] */ | 62 | /* Returns battery voltage from ADC [millivolts] */ |
63 | unsigned int battery_adc_voltage(void) | 63 | int _battery_voltage(void) |
64 | { | 64 | { |
65 | return (adc_read(ADC_BATTERY) * BATTERY_SCALE_FACTOR) >> 10; | 65 | return (adc_read(ADC_BATTERY) * BATTERY_SCALE_FACTOR) >> 10; |
66 | } | 66 | } |
diff --git a/firmware/target/arm/s5l8700/meizu-m6sp/powermgmt-m6sp.c b/firmware/target/arm/s5l8700/meizu-m6sp/powermgmt-m6sp.c index 86b6e46b4d..b59d0fac45 100644 --- a/firmware/target/arm/s5l8700/meizu-m6sp/powermgmt-m6sp.c +++ b/firmware/target/arm/s5l8700/meizu-m6sp/powermgmt-m6sp.c | |||
@@ -58,7 +58,7 @@ const unsigned short percent_to_volt_charge[11] = | |||
58 | 58 | ||
59 | 59 | ||
60 | /* Returns battery voltage from ADC [millivolts] */ | 60 | /* Returns battery voltage from ADC [millivolts] */ |
61 | unsigned int battery_adc_voltage(void) | 61 | int _battery_voltage(void) |
62 | { | 62 | { |
63 | return (adc_read(ADC_BATTERY) * BATTERY_SCALE_FACTOR) >> 10; | 63 | return (adc_read(ADC_BATTERY) * BATTERY_SCALE_FACTOR) >> 10; |
64 | } | 64 | } |