openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 36ff3bd2: am e8c6d15b: am 59644a6c: Merge "Fix nandread to build with old or uapi headers." 

* commit '36ff3bd273d9f60822104eb53f3aa1886160b360':
  Fix nandread to build with old or uapi headers.
This commit is contained in:
Elliott Hughes 2013-11-11 20:52:05 -08:00 committed by Android Git Automerger
parent 7f3c8f9c5b 36ff3bd273
commit 230e98bfea
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
toolbox/nandread.c
View File

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