commit 60e7d49557a4a330285f9bcd76f0dfae9c1855ae
author Elliott Hughes <enh@google.com> Tue Nov 12 21:56:01 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 12 21:56:01 2013 +0000
tree a74d9bdaeabc58d889dc3a2cc170f5419da38b3b
parent 59644a6c7182db6caf53dc61f448f2c68ff569be
parent 2d640c2640b957f704d86fcaea6e5a4af54dde2c

Merge "Fix libnetutils to build with clean uapi headers."

toolbox/nandread.c

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 @@
     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 @@
 
     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));