diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2010-06-23 05:08:36 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2010-06-23 05:08:36 +0000 |
commit | 1ec821244afc4f671c0c94519cd3a70b2777bf74 (patch) | |
tree | 748eead72f705c1e3a91120dc890be49617239c9 /bootloader/creativezvm.c | |
parent | 28bcc17ddef4cfad2d1a669869f2f81f0724acb9 (diff) | |
download | rockbox-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/creativezvm.c')
-rw-r--r-- | bootloader/creativezvm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bootloader/creativezvm.c b/bootloader/creativezvm.c index 73968c3b3f..7dcbac7dcc 100644 --- a/bootloader/creativezvm.c +++ b/bootloader/creativezvm.c | |||
@@ -96,7 +96,7 @@ void main(void) | |||
96 | 96 | ||
97 | ret = disk_mount_all(); | 97 | ret = disk_mount_all(); |
98 | if (ret <= 0) | 98 | if (ret <= 0) |
99 | error(EDISK, ret); | 99 | error(EDISK, ret, true); |
100 | 100 | ||
101 | printf("Loading Rockbox firmware..."); | 101 | printf("Loading Rockbox firmware..."); |
102 | 102 | ||
@@ -105,7 +105,7 @@ void main(void) | |||
105 | 105 | ||
106 | ret = load_firmware(loadbuffer, BOOTFILE, buffer_size); | 106 | ret = load_firmware(loadbuffer, BOOTFILE, buffer_size); |
107 | if(ret < 0) | 107 | if(ret < 0) |
108 | error(EBOOTFILE, ret); | 108 | error(EBOOTFILE, ret, true); |
109 | 109 | ||
110 | else if(ret == EOK) | 110 | else if(ret == EOK) |
111 | { | 111 | { |