commit 886c302d0030e19238b5b8ec146b84d30cd7538b
author Miika Pekkarinen <miipekk@ihme.org> Sat Jan 13 08:16:02 2007 +0000
committer Miika Pekkarinen <miipekk@ihme.org> Sat Jan 13 08:16:02 2007 +0000
tree e9b2d8f73926266966ccbc8795aeadd1b55c94e8
parent 5a269db6645a3d72ce6355572e7fc00915567a7c

Fixed the X5 bootloader.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11996 a1c6a512-1295-4272-9138-f99709370657

bootloader/main.c

diff --git a/bootloader/main.c b/bootloader/main.c
index 01ee46c..32b236c 100644
--- a/bootloader/main.c
+++ b/bootloader/main.c
@@ -48,8 +48,9 @@
 
 #define DRAM_START 0x31000000
 
-
+#ifdef HAVE_EEPROM_SETTINGS
 static bool recovery_mode = false;
+#endif
 
 int line = 0;
 #ifdef HAVE_REMOTE_LCD
@@ -471,6 +472,7 @@
     (void)rc_on_button;
     (void)on_button;
     (void)rec_button;
+    (void)hold_status;
     (void)data;
     power_init();
 
@@ -492,14 +494,8 @@
 
     printf("Rockbox boot loader");
     printf("Version %s", version);
-
-    adc_battery = adc_read(ADC_BATTERY);
-
-    battery_voltage = (adc_battery * BATTERY_SCALE_FACTOR) / 10000;
-    batt_int = battery_voltage / 100;
-    batt_frac = battery_voltage % 100;
-
-    printf("Batt: %d.%02dV", batt_int, batt_frac);
+    
+    check_battery();
 
     rc = ata_init();
     if(rc)