From 80ded2ad7c819cb111e178aefe0f0afc168bf63d Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Wed, 12 Mar 2008 23:19:44 +0000 Subject: [PATCH] Really fix low-bat detection in the iAudio bootloader. * Improve naming of iriver and iaudio bootloader files. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16649 a1c6a512-1295-4272-9138-f99709370657 --- bootloader/SOURCES | 6 +++--- bootloader/{iaudio_x5.c => iaudio_coldfire.c} | 5 +++-- bootloader/{main.c => iriver_h1x0.c} | 0 3 files changed, 6 insertions(+), 5 deletions(-) rename bootloader/{iaudio_x5.c => iaudio_coldfire.c} (99%) rename bootloader/{main.c => iriver_h1x0.c} (100%) diff --git a/bootloader/SOURCES b/bootloader/SOURCES index ea83fa6277..9e961eeb29 100644 --- a/bootloader/SOURCES +++ b/bootloader/SOURCES @@ -18,13 +18,13 @@ main-pp.c #elif defined(ELIO_TPJ1022) tpj1022.c #elif defined(IAUDIO_X5) || defined(IAUDIO_M5) || defined(IAUDIO_M3) -iaudio_x5.c +iaudio_coldfire.c +#elif defined(IRIVER_H100_SERIES) +iriver_h1x0.c #elif defined(IRIVER_H300_SERIES) iriver_h300.c #elif defined(MROBE_500) mrobe500.c #elif defined(CPU_TCC77X) || defined(CPU_TCC780X) telechips.c -#else -main.c #endif diff --git a/bootloader/iaudio_x5.c b/bootloader/iaudio_coldfire.c similarity index 99% rename from bootloader/iaudio_x5.c rename to bootloader/iaudio_coldfire.c index 3cfbb7aec7..a80a202d41 100644 --- a/bootloader/iaudio_x5.c +++ b/bootloader/iaudio_coldfire.c @@ -113,7 +113,7 @@ void check_battery(void) printf("Batt: %d.%02dV", batt_int, batt_frac); - if (battery_voltage <= 350) + if (battery_voltage <= 3500) { printf("WARNING! BATTERY LOW!!"); sleep(HZ*2); @@ -135,6 +135,7 @@ void main(void) (void)rec_button; (void)hold_status; (void)data; + power_init(); system_init(); @@ -157,7 +158,7 @@ void main(void) printf("Version %s", version); check_battery(); - + rc = ata_init(); if(rc) { diff --git a/bootloader/main.c b/bootloader/iriver_h1x0.c similarity index 100% rename from bootloader/main.c rename to bootloader/iriver_h1x0.c