am e8c6d15b: am 59644a6c: Merge "Fix nandread to build with old or uapi headers."
* commit 'e8c6d15b1892ffd09dae8ac7922854140a11130d':
Fix nandread to build with old or uapi headers.
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));