diff options
Diffstat (limited to 'rbutil/sansapatcher/main.c')
-rw-r--r-- | rbutil/sansapatcher/main.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/rbutil/sansapatcher/main.c b/rbutil/sansapatcher/main.c index 7321533bdf..b2b50270a7 100644 --- a/rbutil/sansapatcher/main.c +++ b/rbutil/sansapatcher/main.c | |||
@@ -73,7 +73,7 @@ void print_usage(void) | |||
73 | fprintf(stderr,"DISKNO is the number (e.g. 2) Windows has assigned to your sansa's hard disk.\n"); | 73 | fprintf(stderr,"DISKNO is the number (e.g. 2) Windows has assigned to your sansa's hard disk.\n"); |
74 | fprintf(stderr,"The first hard disk in your computer (i.e. C:\\) will be disk 0, the next disk\n"); | 74 | fprintf(stderr,"The first hard disk in your computer (i.e. C:\\) will be disk 0, the next disk\n"); |
75 | fprintf(stderr,"will be disk 1 etc. sansapatcher will refuse to access a disk unless it\n"); | 75 | fprintf(stderr,"will be disk 1 etc. sansapatcher will refuse to access a disk unless it\n"); |
76 | fprintf(stderr,"can identify it as being an E200.\n"); | 76 | fprintf(stderr,"can identify it as being an E200 or C200.\n"); |
77 | fprintf(stderr,"\n"); | 77 | fprintf(stderr,"\n"); |
78 | #else | 78 | #else |
79 | #if defined(linux) || defined (__linux) | 79 | #if defined(linux) || defined (__linux) |
@@ -84,7 +84,7 @@ void print_usage(void) | |||
84 | fprintf(stderr,"\"device\" is the device node (e.g. /dev/disk1) assigned to your sansa.\n"); | 84 | fprintf(stderr,"\"device\" is the device node (e.g. /dev/disk1) assigned to your sansa.\n"); |
85 | #endif | 85 | #endif |
86 | fprintf(stderr,"sansapatcher will refuse to access a disk unless it can identify it as being\n"); | 86 | fprintf(stderr,"sansapatcher will refuse to access a disk unless it can identify it as being\n"); |
87 | fprintf(stderr,"an E200.\n"); | 87 | fprintf(stderr,"an E200 or C200.\n"); |
88 | #endif | 88 | #endif |
89 | } | 89 | } |
90 | 90 | ||
@@ -154,7 +154,7 @@ int main(int argc, char* argv[]) | |||
154 | 154 | ||
155 | if ((argc > 1) && (strcmp(argv[1],"--scan")==0)) { | 155 | if ((argc > 1) && (strcmp(argv[1],"--scan")==0)) { |
156 | if (sansa_scan(&sansa) == 0) | 156 | if (sansa_scan(&sansa) == 0) |
157 | fprintf(stderr,"[ERR] No E200s found.\n"); | 157 | fprintf(stderr,"[ERR] No E200s or C200s found.\n"); |
158 | return 0; | 158 | return 0; |
159 | } | 159 | } |
160 | 160 | ||
@@ -168,13 +168,13 @@ int main(int argc, char* argv[]) | |||
168 | #endif | 168 | #endif |
169 | i = 2; | 169 | i = 2; |
170 | } else { | 170 | } else { |
171 | /* Autoscan for E200s */ | 171 | /* Autoscan for C200/E200s */ |
172 | n = sansa_scan(&sansa); | 172 | n = sansa_scan(&sansa); |
173 | if (n==0) { | 173 | if (n==0) { |
174 | fprintf(stderr,"[ERR] No E200s found, aborting\n"); | 174 | fprintf(stderr,"[ERR] No E200s or C200s found, aborting\n"); |
175 | fprintf(stderr,"[ERR] Please connect your sansa and ensure it is in UMS mode\n"); | 175 | fprintf(stderr,"[ERR] Please connect your sansa and ensure it is in UMS mode\n"); |
176 | #if defined(__APPLE__) && defined(__MACH__) | 176 | #if defined(__APPLE__) && defined(__MACH__) |
177 | fprintf(stderr,"[ERR] Also ensure that your E200's main partition is not mounted.\n"); | 177 | fprintf(stderr,"[ERR] Also ensure that your Sansa's main partition is not mounted.\n"); |
178 | #elif !defined(__WIN32__) | 178 | #elif !defined(__WIN32__) |
179 | if (geteuid()!=0) { | 179 | if (geteuid()!=0) { |
180 | fprintf(stderr,"[ERR] You may also need to run sansapatcher as root.\n"); | 180 | fprintf(stderr,"[ERR] You may also need to run sansapatcher as root.\n"); |
@@ -182,8 +182,8 @@ int main(int argc, char* argv[]) | |||
182 | #endif | 182 | #endif |
183 | fprintf(stderr,"[ERR] Please refer to the Rockbox manual if you continue to have problems.\n"); | 183 | fprintf(stderr,"[ERR] Please refer to the Rockbox manual if you continue to have problems.\n"); |
184 | } else if (n > 1) { | 184 | } else if (n > 1) { |
185 | fprintf(stderr,"[ERR] %d E200s found, aborting\n",n); | 185 | fprintf(stderr,"[ERR] %d Sansas found, aborting\n",n); |
186 | fprintf(stderr,"[ERR] Please connect only one E200 and re-run sansapatcher.\n"); | 186 | fprintf(stderr,"[ERR] Please connect only one Sansa and re-run sansapatcher.\n"); |
187 | } | 187 | } |
188 | 188 | ||
189 | if (n != 1) { | 189 | if (n != 1) { |
@@ -253,12 +253,14 @@ int main(int argc, char* argv[]) | |||
253 | 253 | ||
254 | display_partinfo(&sansa); | 254 | display_partinfo(&sansa); |
255 | 255 | ||
256 | i = is_e200(&sansa); | 256 | i = is_sansa(&sansa); |
257 | if (i < 0) { | 257 | if (i < 0) { |
258 | fprintf(stderr,"[ERR] Disk is not an E200 (%d), aborting.\n",i); | 258 | fprintf(stderr,"[ERR] Disk is not an E200 or C200 (%d), aborting.\n",i); |
259 | return 3; | 259 | return 3; |
260 | } | 260 | } |
261 | 261 | ||
262 | fprintf(stderr,"[INFO] Sansa %s detected\n",sansa.targetname); | ||
263 | |||
262 | if (sansa.hasoldbootloader) { | 264 | if (sansa.hasoldbootloader) { |
263 | printf("[ERR] ************************************************************************\n"); | 265 | printf("[ERR] ************************************************************************\n"); |
264 | printf("[ERR] *** OLD ROCKBOX INSTALLATION DETECTED, ABORTING.\n"); | 266 | printf("[ERR] *** OLD ROCKBOX INSTALLATION DETECTED, ABORTING.\n"); |