diff options
Diffstat (limited to 'firmware/target/arm/ipod')
-rw-r--r-- | firmware/target/arm/ipod/1g2g/powermgmt-1g2g.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/ipod/powermgmt-ipod-pcf.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/firmware/target/arm/ipod/1g2g/powermgmt-1g2g.c b/firmware/target/arm/ipod/1g2g/powermgmt-1g2g.c index 1bc5de9986..c3eca14332 100644 --- a/firmware/target/arm/ipod/1g2g/powermgmt-1g2g.c +++ b/firmware/target/arm/ipod/1g2g/powermgmt-1g2g.c | |||
@@ -57,7 +57,7 @@ const unsigned short percent_to_volt_charge[11] = | |||
57 | /* full-scale ADC readout (2^8) in millivolt */ | 57 | /* full-scale ADC readout (2^8) in millivolt */ |
58 | 58 | ||
59 | /* Returns battery voltage from ADC [millivolts] */ | 59 | /* Returns battery voltage from ADC [millivolts] */ |
60 | unsigned int battery_adc_voltage(void) | 60 | int _battery_voltage(void) |
61 | { | 61 | { |
62 | unsigned adcval = adc_read(ADC_UNREG_POWER); | 62 | unsigned adcval = adc_read(ADC_UNREG_POWER); |
63 | 63 | ||
diff --git a/firmware/target/arm/ipod/powermgmt-ipod-pcf.c b/firmware/target/arm/ipod/powermgmt-ipod-pcf.c index 44e908a4a2..1241f47302 100644 --- a/firmware/target/arm/ipod/powermgmt-ipod-pcf.c +++ b/firmware/target/arm/ipod/powermgmt-ipod-pcf.c | |||
@@ -109,7 +109,7 @@ const unsigned short percent_to_volt_charge[11] = | |||
109 | /* full-scale ADC readout (2^10) in millivolt */ | 109 | /* full-scale ADC readout (2^10) in millivolt */ |
110 | 110 | ||
111 | /* Returns battery voltage from ADC [millivolts] */ | 111 | /* Returns battery voltage from ADC [millivolts] */ |
112 | unsigned int battery_adc_voltage(void) | 112 | int _battery_voltage(void) |
113 | { | 113 | { |
114 | return (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) >> 10; | 114 | return (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) >> 10; |
115 | } | 115 | } |