aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2016-12-09 02:47:41 +0100
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2016-12-09 09:06:45 +0100
commitf5b47ef5112326b06fd875982379769c55a71703 (patch)
tree4380e15fc33cc96c28c298418b60fce140880fb0
parentabbed09157dc42f11d54277ad895edaf357d92d8 (diff)
nandwrite: Factor out buffer checking code
Pull the buffer content checking code into separate function and simplify the code invoking it slightly. Signed-off-by: Marek Vasut <marex@denx.de> Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
-rw-r--r--include/common.h25
-rw-r--r--nand-utils/nandwrite.c17
2 files changed, 28 insertions, 14 deletions
diff --git a/include/common.h b/include/common.h
index 32b5d23..2812f49 100644
--- a/include/common.h
+++ b/include/common.h
@@ -181,6 +181,31 @@ static inline int is_power_of_2(unsigned long long n)
return (n != 0 && ((n & (n - 1)) == 0));
}
+/* Check whether buffer is filled with character 'pattern' */
+static inline int buffer_check_pattern(unsigned char *buffer, size_t size,
+ unsigned char pattern)
+{
+ /* Invalid input */
+ if (!buffer || (size == 0))
+ return 0;
+
+ /* No match on first byte */
+ if (*buffer != pattern)
+ return 0;
+
+ /* First byte matched and buffer is 1 byte long, OK. */
+ if (size == 1)
+ return 1;
+
+ /*
+ * Check buffer longer than 1 byte. We already know that buffer[0]
+ * matches the pattern, so the test below only checks whether the
+ * buffer[0...size-2] == buffer[1...size-1] , which is a test for
+ * whether the buffer is filled with constant value.
+ */
+ return !memcmp(buffer, buffer + 1, size - 1);
+}
+
/**
* simple_strtoX - convert a hex/dec/oct string into a number
* @snum: buffer to convert
diff --git a/nand-utils/nandwrite.c b/nand-utils/nandwrite.c
index b376869..9602a6e 100644
--- a/nand-utils/nandwrite.c
+++ b/nand-utils/nandwrite.c
@@ -523,18 +523,8 @@ int main(int argc, char * const argv[])
}
}
- allffs = 0;
- if (skipallffs)
- {
- for (ii = 0; ii < mtd.min_io_size; ii += sizeof(uint32_t))
- {
- if (*(uint32_t*)(writebuf + ii) != 0xffffffff)
- break;
- }
- if (ii == mtd.min_io_size)
- allffs = 1;
- }
- if (!allffs) {
+ ret = 0;
+ if (!skipallffs || !buffer_check_pattern(writebuf, mtd.min_io_size, 0xff)) {
/* Write out data */
ret = mtd_write(mtd_desc, &mtd, fd, mtdoffset / mtd.eb_size,
mtdoffset % mtd.eb_size,
@@ -543,9 +533,8 @@ int main(int argc, char * const argv[])
writeoob ? oobbuf : NULL,
writeoob ? mtd.oob_size : 0,
write_mode);
- } else {
- ret = 0;
}
+
if (ret) {
long long i;
if (errno != EIO) {