Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mkamsboot: really error out if OF model is different from bootloader model

Browse source 
Error out if firmware md5sum isn't known, and leave the current code #if 0'ed for easier testing

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21073 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2009-05-25 10:35:15 +00:00
parent 14cd7d71a3
commit b0e0ec832b
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
rbutil/mkamsboot/mkamsboot.c
View file

@ -376,6 +376,7 @@ static unsigned char* load_rockbox_file(char* filename, int model, off_t* bufsiz
if (memcmp(rb_model_names[model],header + 4,4)!=0) { if (memcmp(rb_model_names[model],header + 4,4)!=0) {
fprintf(stderr,"[ERR] Model name \"%s\" not found in %s\n", fprintf(stderr,"[ERR] Model name \"%s\" not found in %s\n",
rb_model_names[model],filename); rb_model_names[model],filename);
return NULL;
} }
*bufsize = filesize(fd) - sizeof(header); *bufsize = filesize(fd) - sizeof(header);
@ -468,8 +469,6 @@ int main(int argc, char* argv[])
fprintf(stderr,"[INFO] Original firmware MD5 checksum match - %s %s\n", fprintf(stderr,"[INFO] Original firmware MD5 checksum match - %s %s\n",
model_names[model], sansasums[i].version); model_names[model], sansasums[i].version);
} else { } else {
fprintf(stderr,"[WARN] ****** Original firmware unknown ******\n");
if (get_uint32le(&buf[0x204])==0x0000f000) { if (get_uint32le(&buf[0x204])==0x0000f000) {
fw_version = 2; fw_version = 2;
model_id = buf[0x219]; model_id = buf[0x219];
@ -480,12 +479,21 @@ int main(int argc, char* argv[])
model = get_model(model_id); model = get_model(model_id);
#if 0
/* if you are a tester this info might help */
fprintf(stderr,"[WARN] ****** Original firmware unknown ******\n");
if (model == MODEL_UNKNOWN) { if (model == MODEL_UNKNOWN) {
fprintf(stderr,"[ERR] Unknown firmware - model id 0x%02x\n", fprintf(stderr,"[ERR] Unknown firmware - model id 0x%02x\n",
model_id); model_id);
free(buf); free(buf);
return 1; return 1;
} }
#else
/* else you don't want to brick your player */
fprintf(stderr, "[ERR] Original firmware untested - aborting\n");
free(buf);
return 1;
#endif
} }