diff options
author | Miika Pekkarinen <miipekk@ihme.org> | 2007-01-13 08:16:02 +0000 |
---|---|---|
committer | Miika Pekkarinen <miipekk@ihme.org> | 2007-01-13 08:16:02 +0000 |
commit | 886c302d0030e19238b5b8ec146b84d30cd7538b (patch) | |
tree | e9b2d8f73926266966ccbc8795aeadd1b55c94e8 /bootloader | |
parent | 5a269db6645a3d72ce6355572e7fc00915567a7c (diff) | |
download | rockbox-886c302d0030e19238b5b8ec146b84d30cd7538b.tar.gz rockbox-886c302d0030e19238b5b8ec146b84d30cd7538b.zip |
Fixed the X5 bootloader.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11996 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'bootloader')
-rw-r--r-- | bootloader/main.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/bootloader/main.c b/bootloader/main.c index 01ee46c4f5..32b236c1b5 100644 --- a/bootloader/main.c +++ b/bootloader/main.c | |||
@@ -48,8 +48,9 @@ | |||
48 | 48 | ||
49 | #define DRAM_START 0x31000000 | 49 | #define DRAM_START 0x31000000 |
50 | 50 | ||
51 | 51 | #ifdef HAVE_EEPROM_SETTINGS | |
52 | static bool recovery_mode = false; | 52 | static bool recovery_mode = false; |
53 | #endif | ||
53 | 54 | ||
54 | int line = 0; | 55 | int line = 0; |
55 | #ifdef HAVE_REMOTE_LCD | 56 | #ifdef HAVE_REMOTE_LCD |
@@ -471,6 +472,7 @@ void main(void) | |||
471 | (void)rc_on_button; | 472 | (void)rc_on_button; |
472 | (void)on_button; | 473 | (void)on_button; |
473 | (void)rec_button; | 474 | (void)rec_button; |
475 | (void)hold_status; | ||
474 | (void)data; | 476 | (void)data; |
475 | power_init(); | 477 | power_init(); |
476 | 478 | ||
@@ -492,14 +494,8 @@ void main(void) | |||
492 | 494 | ||
493 | printf("Rockbox boot loader"); | 495 | printf("Rockbox boot loader"); |
494 | printf("Version %s", version); | 496 | printf("Version %s", version); |
495 | 497 | ||
496 | adc_battery = adc_read(ADC_BATTERY); | 498 | check_battery(); |
497 | |||
498 | battery_voltage = (adc_battery * BATTERY_SCALE_FACTOR) / 10000; | ||
499 | batt_int = battery_voltage / 100; | ||
500 | batt_frac = battery_voltage % 100; | ||
501 | |||
502 | printf("Batt: %d.%02dV", batt_int, batt_frac); | ||
503 | 499 | ||
504 | rc = ata_init(); | 500 | rc = ata_init(); |
505 | if(rc) | 501 | if(rc) |