summaryrefslogtreecommitdiff
path: root/bootloader/gigabeat.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.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.c')
-rw-r--r--bootloader/gigabeat.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/bootloader/gigabeat.c b/bootloader/gigabeat.c
index 7a634b329c..cfba4bb38d 100644
--- a/bootloader/gigabeat.c
+++ b/bootloader/gigabeat.c
@@ -181,7 +181,7 @@ void main(void)
181 if(rc) 181 if(rc)
182 { 182 {
183 reset_screen(); 183 reset_screen();
184 error(EATA, rc); 184 error(EATA, rc, true);
185 } 185 }
186 186
187 disk_init(); 187 disk_init();
@@ -189,7 +189,7 @@ void main(void)
189 rc = disk_mount_all(); 189 rc = disk_mount_all();
190 if (rc<=0) 190 if (rc<=0)
191 { 191 {
192 error(EDISK,rc); 192 error(EDISK, rc, true);
193 } 193 }
194 194
195 printf("Loading firmware"); 195 printf("Loading firmware");
@@ -202,7 +202,7 @@ void main(void)
202 202
203 rc = load_firmware(loadbuffer, BOOTFILE, buffer_size); 203 rc = load_firmware(loadbuffer, BOOTFILE, buffer_size);
204 if(rc < 0) 204 if(rc < 0)
205 error(EBOOTFILE, rc); 205 error(EBOOTFILE, rc, true);
206 206
207 storage_close(); 207 storage_close();
208 system_prepare_fw_start(); 208 system_prepare_fw_start();