diff options
Diffstat (limited to 'bootloader')
-rw-r--r-- | bootloader/iriver_h1x0.c | 17 | ||||
-rw-r--r-- | bootloader/iriver_h300.c | 17 |
2 files changed, 18 insertions, 16 deletions
diff --git a/bootloader/iriver_h1x0.c b/bootloader/iriver_h1x0.c index d5a3b887a2..7af0e86240 100644 --- a/bootloader/iriver_h1x0.c +++ b/bootloader/iriver_h1x0.c | |||
@@ -209,25 +209,24 @@ void try_flashboot(void) | |||
209 | if (!firmware_settings.initialized) | 209 | if (!firmware_settings.initialized) |
210 | return ; | 210 | return ; |
211 | 211 | ||
212 | switch (firmware_settings.bootmethod) | 212 | switch (firmware_settings.bootmethod) |
213 | { | 213 | { |
214 | case BOOT_DISK: | 214 | case BOOT_DISK: |
215 | return; | 215 | return; |
216 | 216 | ||
217 | case BOOT_ROM: | 217 | case BOOT_ROM: |
218 | start_flashed_romimage(); | 218 | start_flashed_romimage(); |
219 | recovery_mode = true; | ||
220 | break; | 219 | break; |
221 | 220 | ||
222 | case BOOT_RAM: | 221 | case BOOT_RAM: |
223 | start_flashed_ramimage(); | 222 | start_flashed_ramimage(); |
224 | recovery_mode = true; | ||
225 | break; | 223 | break; |
226 | 224 | ||
227 | default: | 225 | case BOOT_RECOVERY: |
228 | recovery_mode = true; | 226 | break; |
229 | return; | ||
230 | } | 227 | } |
228 | |||
229 | recovery_mode = true; | ||
231 | } | 230 | } |
232 | 231 | ||
233 | void failsafe_menu(void) | 232 | void failsafe_menu(void) |
@@ -451,10 +450,12 @@ void main(void) | |||
451 | 450 | ||
452 | /* Power on the hard drive early, to speed up the loading. */ | 451 | /* Power on the hard drive early, to speed up the loading. */ |
453 | if (!hold_status && !recovery_mode) | 452 | if (!hold_status && !recovery_mode) |
453 | { | ||
454 | ide_power_enable(true); | 454 | ide_power_enable(true); |
455 | 455 | ||
456 | if (!hold_status && (usb_detect() != USB_INSERTED) && !recovery_mode) | 456 | if (usb_detect() != USB_INSERTED) |
457 | try_flashboot(); | 457 | try_flashboot(); |
458 | } | ||
458 | 459 | ||
459 | lcd_init(); | 460 | lcd_init(); |
460 | 461 | ||
diff --git a/bootloader/iriver_h300.c b/bootloader/iriver_h300.c index ff3c8de2af..6cacbc4a42 100644 --- a/bootloader/iriver_h300.c +++ b/bootloader/iriver_h300.c | |||
@@ -211,25 +211,24 @@ void try_flashboot(void) | |||
211 | if (!firmware_settings.initialized) | 211 | if (!firmware_settings.initialized) |
212 | return ; | 212 | return ; |
213 | 213 | ||
214 | switch (firmware_settings.bootmethod) | 214 | switch (firmware_settings.bootmethod) |
215 | { | 215 | { |
216 | case BOOT_DISK: | 216 | case BOOT_DISK: |
217 | return; | 217 | return; |
218 | 218 | ||
219 | case BOOT_ROM: | 219 | case BOOT_ROM: |
220 | start_flashed_romimage(); | 220 | start_flashed_romimage(); |
221 | recovery_mode = true; | ||
222 | break; | 221 | break; |
223 | 222 | ||
224 | case BOOT_RAM: | 223 | case BOOT_RAM: |
225 | start_flashed_ramimage(); | 224 | start_flashed_ramimage(); |
226 | recovery_mode = true; | ||
227 | break; | 225 | break; |
228 | 226 | ||
229 | default: | 227 | case BOOT_RECOVERY: |
230 | recovery_mode = true; | 228 | break; |
231 | return; | ||
232 | } | 229 | } |
230 | |||
231 | recovery_mode = true; | ||
233 | } | 232 | } |
234 | 233 | ||
235 | void failsafe_menu(void) | 234 | void failsafe_menu(void) |
@@ -429,10 +428,12 @@ void main(void) | |||
429 | 428 | ||
430 | /* Power on the hard drive early, to speed up the loading. */ | 429 | /* Power on the hard drive early, to speed up the loading. */ |
431 | if (!hold_status && !recovery_mode) | 430 | if (!hold_status && !recovery_mode) |
431 | { | ||
432 | ide_power_enable(true); | 432 | ide_power_enable(true); |
433 | 433 | ||
434 | if (!hold_status && (usb_detect() != USB_INSERTED) && !recovery_mode) | 434 | if (usb_detect() != USB_INSERTED) |
435 | try_flashboot(); | 435 | try_flashboot(); |
436 | } | ||
436 | 437 | ||
437 | lcd_init(); | 438 | lcd_init(); |
438 | lcd_remote_init(); | 439 | lcd_remote_init(); |