summaryrefslogtreecommitdiff
path: root/bootloader/main-pp.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/main-pp.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/main-pp.c')
-rw-r--r--bootloader/main-pp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/bootloader/main-pp.c b/bootloader/main-pp.c
index 37f42eda43..f0e9e7cdf3 100644
--- a/bootloader/main-pp.c
+++ b/bootloader/main-pp.c
@@ -540,7 +540,7 @@ void* main(void)
540 } 540 }
541 printf(buf); 541 printf(buf);
542 } else { 542 } else {
543 error(EATA, i); 543 error(EATA, i, true);
544 } 544 }
545#endif 545#endif
546 546
@@ -548,7 +548,7 @@ void* main(void)
548 num_partitions = disk_mount_all(); 548 num_partitions = disk_mount_all();
549 if (num_partitions<=0) 549 if (num_partitions<=0)
550 { 550 {
551 error(EDISK,num_partitions); 551 error(EDISK,num_partitions, true);
552 } 552 }
553 553
554 /* Just list the first 2 partitions since we don't have any devices yet 554 /* Just list the first 2 partitions since we don't have any devices yet
@@ -643,7 +643,7 @@ void* main(void)
643 return (void*)loadbuffer; 643 return (void*)loadbuffer;
644 } 644 }
645 645
646 error(0, 0); 646 error(0, 0, true);
647 } 647 }
648 return (void*)loadbuffer; 648 return (void*)loadbuffer;
649} 649}