emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nanddump: invert the meaning of the -o parameter to match upstream

Browse Source 
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Baruch Siach 2012-10-15 14:32:23 +02:00 committed by Denys Vlasenko
parent 98f6b2d399
commit 3aeb870b22
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
miscutils/nandwrite.c
View File

@ -39,7 +39,7 @@
//usage: "[-o] [-b] [-s ADDR] [-f FILE] MTD_DEVICE" //usage: "[-o] [-b] [-s ADDR] [-f FILE] MTD_DEVICE"
//usage:#define nanddump_full_usage "\n\n" //usage:#define nanddump_full_usage "\n\n"
//usage: "Dump the specified MTD device\n" //usage: "Dump the specified MTD device\n"
//usage: "\n -o Omit oob data" //usage: "\n -o Dump oob data"
//usage: "\n -b Omit bad block from the dump" //usage: "\n -b Omit bad block from the dump"
//usage: "\n -s ADDR Start address" //usage: "\n -s ADDR Start address"
//usage: "\n -l LEN Length" //usage: "\n -l LEN Length"
@ -164,7 +164,7 @@ int nandwrite_main(int argc UNUSED_PARAM, char **argv)
/* bad block(s), advance mtdoffset */ /* bad block(s), advance mtdoffset */
if (IS_NANDDUMP && !(opts & OPT_b)) { if (IS_NANDDUMP && !(opts & OPT_b)) {
int bad_len = MIN(tmp, end_addr) - mtdoffset; int bad_len = MIN(tmp, end_addr) - mtdoffset;
dump_bad(&meminfo, bad_len, !(opts & OPT_o)); dump_bad(&meminfo, bad_len, opts & OPT_o);
} }
mtdoffset = tmp; mtdoffset = tmp;
} }
@ -184,7 +184,7 @@ int nandwrite_main(int argc UNUSED_PARAM, char **argv)
printf("Writing at 0x%08x\n", mtdoffset); printf("Writing at 0x%08x\n", mtdoffset);
else if (mtdoffset > blockstart && !(opts & OPT_b)) { else if (mtdoffset > blockstart && !(opts & OPT_b)) {
int bad_len = MIN(mtdoffset, limit) - blockstart; int bad_len = MIN(mtdoffset, limit) - blockstart;
dump_bad(&meminfo, bad_len, !(opts & OPT_o)); dump_bad(&meminfo, bad_len, opts & OPT_o);
} }
if (mtdoffset >= limit) if (mtdoffset >= limit)
break; break;
@ -210,7 +210,7 @@ int nandwrite_main(int argc UNUSED_PARAM, char **argv)
} }
xwrite(output_fd, filebuf, meminfo_writesize); xwrite(output_fd, filebuf, meminfo_writesize);
if (IS_NANDDUMP && !(opts & OPT_o)) { if (IS_NANDDUMP && (opts & OPT_o)) {
/* Dump OOB data */ /* Dump OOB data */
oob.start = mtdoffset; oob.start = mtdoffset;
xioctl(fd, MEMREADOOB, &oob); xioctl(fd, MEMREADOOB, &oob);