diff options
| author | Elliott Hughes <enh@google.com> | 2013-11-12 00:29:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-11-12 00:29:10 +0000 |
| commit | 59644a6c7182db6caf53dc61f448f2c68ff569be (patch) | |
| tree | 5c02ebd984b00bd929c357f8268d153585852971 | |
| parent | e627929490dfb92ab51ec6feb259d793a4a9f394 (diff) | |
| parent | b05a2e513023133a780f51530246c492ddd95b46 (diff) | |
| download | system_core-59644a6c7182db6caf53dc61f448f2c68ff569be.zip system_core-59644a6c7182db6caf53dc61f448f2c68ff569be.tar.gz system_core-59644a6c7182db6caf53dc61f448f2c68ff569be.tar.bz2 | |
Merge "Fix nandread to build with old or uapi headers."
| -rw-r--r-- | toolbox/nandread.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/toolbox/nandread.c b/toolbox/nandread.c index b124731..4666f26 100644 --- a/toolbox/nandread.c +++ b/toolbox/nandread.c @@ -12,7 +12,7 @@ static int test_empty(const char *buf, size_t size) { while(size--) { - if (*buf++ != 0xff) + if (*buf++ != (char) 0xff) return 0; } return 1; @@ -44,7 +44,7 @@ int nandread_main(int argc, char **argv) struct mtd_info_user mtdinfo; struct mtd_ecc_stats initial_ecc, last_ecc, ecc; struct mtd_oob_buf oobbuf; - struct nand_ecclayout ecclayout; + nand_ecclayout_t ecclayout; do { c = getopt(argc, argv, "d:f:s:S:L:Rhv"); @@ -177,7 +177,11 @@ int nandread_main(int argc, char **argv) if (rawmode) { rawmode = mtdinfo.oobsize; +#if !defined(MTD_STUPID_LOCK) /* using uapi kernel headers */ + ret = ioctl(fd, MTDFILEMODE, MTD_FILE_MODE_RAW); +#else /* still using old kernel headers */ ret = ioctl(fd, MTDFILEMODE, MTD_MODE_RAW); +#endif if (ret) { fprintf(stderr, "failed set raw mode for %s, %s\n", devname, strerror(errno)); |