3 files changed, 12 insertions, 18 deletions

diff --git a/bootloader/iaudio_x5.c b/bootloader/iaudio_x5.c
index a484bfa125..11c552866b 100644
--- a/bootloader/iaudio_x5.c
+++ b/bootloader/iaudio_x5.c
@@ -104,13 +104,11 @@ void shutdown(void)
 /* Print the battery voltage (and a warning message). */
 void check_battery(void)
 {
-    int adc_battery, battery_voltage, batt_int, batt_frac;
+    int battery_voltage, batt_int, batt_frac;
     
-    adc_battery = adc_read(ADC_BATTERY);
-
-    battery_voltage = (adc_battery * BATTERY_SCALE_FACTOR) / 10000;
-    batt_int = battery_voltage / 100;
-    batt_frac = battery_voltage % 100;
+    battery_voltage = battery_adc_voltage();
+    batt_int = battery_voltage / 1000;
+    batt_frac = (battery_voltage % 1000) / 10;
 
     printf("Batt: %d.%02dV", batt_int, batt_frac);
 
diff --git a/bootloader/iriver_h300.c b/bootloader/iriver_h300.c
index 32950a58dc..dab3693050 100644
--- a/bootloader/iriver_h300.c
+++ b/bootloader/iriver_h300.c
@@ -109,13 +109,11 @@ void shutdown(void)
 /* Print the battery voltage (and a warning message). */
 void check_battery(void)
 {
-    int adc_battery, battery_voltage, batt_int, batt_frac;
+    int battery_voltage, batt_int, batt_frac;
     
-    adc_battery = adc_read(ADC_BATTERY);
-
-    battery_voltage = (adc_battery * BATTERY_SCALE_FACTOR) / 10000;
-    batt_int = battery_voltage / 100;
-    batt_frac = battery_voltage % 100;
+    battery_voltage = battery_adc_voltage();
+    batt_int = battery_voltage / 1000;
+    batt_frac = (battery_voltage % 1000) / 10;
 
     printf("Batt: %d.%02dV", batt_int, batt_frac);
 
diff --git a/bootloader/main.c b/bootloader/main.c
index d78b4adc69..afaef69f45 100644
--- a/bootloader/main.c
+++ b/bootloader/main.c
@@ -167,13 +167,11 @@ void shutdown(void)
 /* Print the battery voltage (and a warning message). */
 void check_battery(void)
 {
-    int adc_battery, battery_voltage, batt_int, batt_frac;
+    int battery_voltage, batt_int, batt_frac;
     
-    adc_battery = adc_read(ADC_BATTERY);
-
-    battery_voltage = (adc_battery * BATTERY_SCALE_FACTOR) / 10000;
-    batt_int = battery_voltage / 100;
-    batt_frac = battery_voltage % 100;
+    battery_voltage = battery_adc_voltage();
+    batt_int = battery_voltage / 1000;
+    batt_frac = (battery_voltage % 1000) / 10;
 
     printf("Batt: %d.%02dV", batt_int, batt_frac);