summaryrefslogtreecommitdiff
path: root/bootloader/gigabeat-s.c
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2010-06-23 05:08:36 +0000
committerRafaël Carré <rafael.carre@gmail.com>2010-06-23 05:08:36 +0000
commit1ec821244afc4f671c0c94519cd3a70b2777bf74 (patch)
tree748eead72f705c1e3a91120dc890be49617239c9 /bootloader/gigabeat-s.c
parent28bcc17ddef4cfad2d1a669869f2f81f0724acb9 (diff)
downloadrockbox-1ec821244afc4f671c0c94519cd3a70b2777bf74.tar.gz
rockbox-1ec821244afc4f671c0c94519cd3a70b2777bf74.zip
Sansa AMS bootloader: enter USB mode only when needed
- If an error happens when reading partitions / rockbox.sansa - If the select button was pressed add an argument to error() to not power off, when we're going to enter USB mode to try to fix the problem, but display the error message anyway for debugging purpose git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27075 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'bootloader/gigabeat-s.c')
-rw-r--r--bootloader/gigabeat-s.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/bootloader/gigabeat-s.c b/bootloader/gigabeat-s.c
index dcff26c4de..b6db9e633f 100644
--- a/bootloader/gigabeat-s.c
+++ b/bootloader/gigabeat-s.c
@@ -302,7 +302,7 @@ static void __attribute__((noreturn)) handle_firmware_load(void)
302 load_buf_size); 302 load_buf_size);
303 303
304 if(rc < 0) 304 if(rc < 0)
305 error(EBOOTFILE, rc); 305 error(EBOOTFILE, rc, true);
306 306
307 /* Pause to look at messages */ 307 /* Pause to look at messages */
308 pause_if_button_pressed(false); 308 pause_if_button_pressed(false);
@@ -359,7 +359,7 @@ void main(void)
359 if(rc) 359 if(rc)
360 { 360 {
361 reset_screen(); 361 reset_screen();
362 error(EATA, rc); 362 error(EATA, rc, true);
363 } 363 }
364 364
365 disk_init(); 365 disk_init();
@@ -367,7 +367,7 @@ void main(void)
367 rc = disk_mount_all(); 367 rc = disk_mount_all();
368 if (rc<=0) 368 if (rc<=0)
369 { 369 {
370 error(EDISK,rc); 370 error(EDISK, rc, true);
371 } 371 }
372 372
373 printf("Init complete"); 373 printf("Init complete");