diff options
Diffstat (limited to 'firmware/target/arm/imx31/gigabeat-s/powermgmt-gigabeat-s.c')
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/powermgmt-gigabeat-s.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/firmware/target/arm/imx31/gigabeat-s/powermgmt-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/powermgmt-gigabeat-s.c index d87e367cba..1a8e12182a 100644 --- a/firmware/target/arm/imx31/gigabeat-s/powermgmt-gigabeat-s.c +++ b/firmware/target/arm/imx31/gigabeat-s/powermgmt-gigabeat-s.c | |||
@@ -53,7 +53,7 @@ const unsigned short percent_to_volt_charge[11] = | |||
53 | }; | 53 | }; |
54 | 54 | ||
55 | /* Returns battery voltage from ADC [millivolts] */ | 55 | /* Returns battery voltage from ADC [millivolts] */ |
56 | unsigned int battery_adc_voltage(void) | 56 | int _battery_voltage(void) |
57 | { | 57 | { |
58 | /* ADC reading 0-1023 = 2400mV-4700mV */ | 58 | /* ADC reading 0-1023 = 2400mV-4700mV */ |
59 | return ((adc_read(ADC_BATTERY) * 2303) >> 10) + 2400; | 59 | return ((adc_read(ADC_BATTERY) * 2303) >> 10) + 2400; |
@@ -249,7 +249,7 @@ static int stat_battery_reading(int type) | |||
249 | switch (type) | 249 | switch (type) |
250 | { | 250 | { |
251 | case ADC_BATTERY: | 251 | case ADC_BATTERY: |
252 | reading = battery_adc_voltage(); | 252 | reading = _battery_voltage(); |
253 | break; | 253 | break; |
254 | 254 | ||
255 | case ADC_CHARGER_CURRENT: | 255 | case ADC_CHARGER_CURRENT: |
@@ -780,7 +780,7 @@ static void charger_control(void) | |||
780 | /* Battery voltage may have dropped and a charge cycle should | 780 | /* Battery voltage may have dropped and a charge cycle should |
781 | * start again. Debounced. */ | 781 | * start again. Debounced. */ |
782 | if (autorecharge_counter < 0 && | 782 | if (autorecharge_counter < 0 && |
783 | battery_adc_voltage() < BATT_FULL_VOLTAGE) | 783 | _battery_voltage() < BATT_FULL_VOLTAGE) |
784 | { | 784 | { |
785 | /* Try starting a cycle now if battery isn't already topped | 785 | /* Try starting a cycle now if battery isn't already topped |
786 | * off to allow user to ensure the battery is full. */ | 786 | * off to allow user to ensure the battery is full. */ |