summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/plugins/iriver_flash.c2
-rw-r--r--bootloader/main.c44
2 files changed, 23 insertions, 23 deletions
diff --git a/apps/plugins/iriver_flash.c b/apps/plugins/iriver_flash.c
index 40c9a2979b..f919a0d25c 100644
--- a/apps/plugins/iriver_flash.c
+++ b/apps/plugins/iriver_flash.c
@@ -404,7 +404,7 @@ int flash_bootloader(const char *filename)
404 rb->snprintf(buf, sizeof buf, "crc32 = 0x%08x", crc32); 404 rb->snprintf(buf, sizeof buf, "crc32 = 0x%08x", crc32);
405 rb->splash(HZ*10, true, buf); 405 rb->splash(HZ*10, true, buf);
406#else 406#else
407 if (crc32 != 0xa930906d) 407 if (crc32 != 0x77395351)
408 { 408 {
409 rb->splash(HZ*3, true, "Untested bootloader"); 409 rb->splash(HZ*3, true, "Untested bootloader");
410 return -2; 410 return -2;
diff --git a/bootloader/main.c b/bootloader/main.c
index 0ef6d8944e..0b058272f1 100644
--- a/bootloader/main.c
+++ b/bootloader/main.c
@@ -334,6 +334,28 @@ void main(void)
334 rec_button = ((button_status() & BUTTON_REC) == BUTTON_REC) 334 rec_button = ((button_status() & BUTTON_REC) == BUTTON_REC)
335 || ((button_status() & BUTTON_RC_REC) == BUTTON_RC_REC); 335 || ((button_status() & BUTTON_RC_REC) == BUTTON_RC_REC);
336 336
337 /* Don't start if the Hold button is active on the device you
338 are starting with */
339 if (!usb_detect() && ((on_button && button_hold()) ||
340 (rc_on_button && remote_button_hold())))
341 {
342 printf("HOLD switch on, power off...");
343 lcd_update();
344 sleep(HZ*2);
345
346 /* Backlight OFF */
347#ifdef HAVE_REMOTE_LCD
348#ifdef IRIVER_H300_SERIES
349 or_l(0x00000002, &GPIO1_OUT);
350#else
351 or_l(0x00000800, &GPIO_OUT);
352#endif
353#endif
354 /* Reset the cookie for the crt0 crash check */
355 asm(" move.l #0,%d0");
356 asm(" move.l %d0,0x10017ffc");
357 power_off();
358 }
337 359
338#ifdef HAVE_EEPROM 360#ifdef HAVE_EEPROM
339 firmware_settings.initialized = false; 361 firmware_settings.initialized = false;
@@ -393,28 +415,6 @@ void main(void)
393 } 415 }
394 } 416 }
395 417
396 /* Don't start if the Hold button is active on the device you
397 are starting with */
398 if(!usb_detect() && ((on_button && button_hold()) ||
399 (rc_on_button && remote_button_hold()))) {
400 printf("HOLD switch on, power off...");
401 lcd_update();
402 sleep(HZ*2);
403
404 /* Backlight OFF */
405#ifdef HAVE_REMOTE_LCD
406#ifdef IRIVER_H300_SERIES
407 or_l(0x00000002, &GPIO1_OUT);
408#else
409 or_l(0x00000800, &GPIO_OUT);
410#endif
411#endif
412 /* Reset the cookie for the crt0 crash check */
413 asm(" move.l #0,%d0");
414 asm(" move.l %d0,0x10017ffc");
415 power_off();
416 }
417
418 usb_init(); 418 usb_init();
419 419
420 adc_battery = adc_read(ADC_BATTERY); 420 adc_battery = adc_read(ADC_BATTERY);