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

1 files changed, 3 insertions, 2 deletions

diff --git a/bootloader/common.c b/bootloader/common.c
index 67b5816694..362c3b4d11 100644
--- a/bootloader/common.c
+++ b/bootloader/common.c
@@ -118,7 +118,7 @@ char *strerror(int error)
     }
 }
 
-void error(int errortype, int error)
+void error(int errortype, int error, bool shutdown)
 {
     switch(errortype)
     {
@@ -137,7 +137,8 @@ void error(int errortype, int error)
 
     lcd_update();
     sleep(5*HZ);
-    power_off();
+    if(shutdown)
+        power_off();
 }
 
 /* Load firmware image in a format created by tools/scramble */