[PATCH v3 4/7] Make testutils use utilfdt
Simon Glass
sjg at chromium.org
Tue Sep 13 06:04:04 EST 2011
The load_blob() and save_blob() functions are very similar to the utilfdt
versions. This removes the duplicated code.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
Changes in v3:
- Make testutils.c use utilfdt for load/save blobs
tests/Makefile.tests | 6 ++--
tests/testutils.c | 60 ++++++++++----------------------------------------
2 files changed, 15 insertions(+), 51 deletions(-)
diff --git a/tests/Makefile.tests b/tests/Makefile.tests
index 2bc57d6..315779c 100644
--- a/tests/Makefile.tests
+++ b/tests/Makefile.tests
@@ -42,13 +42,13 @@ TESTS_CLEANFILES = $(TESTS) $(TESTS_CLEANFILES_L:%=$(TESTS_PREFIX)%)
.PHONY: tests
tests: $(TESTS) $(TESTS_TREES)
-$(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o $(LIBFDT_archive)
+$(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o $(ALL_LIBS)
-$(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o $(LIBFDT_archive)
+$(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o $(ALL_LIBS)
@$(VECHO) LD [libdl] $@
$(LINK.c) -o $@ $^ -ldl
-$(LIBTREE_TESTS): %: $(TESTS_PREFIX)testutils.o $(TESTS_PREFIX)trees.o $(LIBFDT_archive)
+$(LIBTREE_TESTS): %: $(TESTS_PREFIX)testutils.o $(TESTS_PREFIX)trees.o $(ALL_LIBS)
$(TESTS_PREFIX)dumptrees: $(TESTS_PREFIX)trees.o
diff --git a/tests/testutils.c b/tests/testutils.c
index b0a2230..2d72244 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -31,6 +31,7 @@
#include <fcntl.h>
#include <libfdt.h>
+#include <utilfdt.h>
#include "tests.h"
@@ -159,33 +160,13 @@ int nodename_eq(const char *s1, const char *s2)
void *load_blob(const char *filename)
{
- int fd;
- int offset = 0;
- int bufsize = 1024;
- char *p = NULL;
- int ret;
-
- fd = open(filename, O_RDONLY);
- if (fd < 0)
- CONFIG("Couldn't open blob from \"%s\": %s", filename,
- strerror(errno));
-
- p = xmalloc(bufsize);
- do {
- if (offset == bufsize) {
- bufsize *= 2;
- p = xrealloc(p, bufsize);
- }
-
- ret = read(fd, &p[offset], bufsize - offset);
- if (ret < 0)
- CONFIG("Couldn't read from \"%s\": %s", filename,
- strerror(errno));
-
- offset += ret;
- } while (ret != 0);
+ char *blob;
+ int ret = utilfdt_read_err(filename, &blob);
- return p;
+ if (ret)
+ CONFIG("Couldn't open blob from \"%s\": %s", filename,
+ strerror(ret));
+ return blob;
}
void *load_blob_arg(int argc, char *argv[])
@@ -197,28 +178,11 @@ void *load_blob_arg(int argc, char *argv[])
void save_blob(const char *filename, void *fdt)
{
- int fd;
- int totalsize;
- int offset;
- char *p;
- int ret;
-
- fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0666);
- if (fd < 0)
- CONFIG("Couldn't open \"%s\" to write blob: %s", filename,
- strerror(errno));
-
- totalsize = fdt_totalsize(fdt);
- offset = 0;
- p = fdt;
-
- while (offset < totalsize) {
- ret = write(fd, p + offset, totalsize - offset);
- if (ret < 0)
- CONFIG("Couldn't write to \"%s\": %s", filename,
- strerror(errno));
- offset += ret;
- }
+ int ret = utilfdt_write_err(filename, fdt);
+
+ if (ret)
+ CONFIG("Couldn't write blob to \"%s\": %s", filename,
+ strerror(ret));
}
void *open_blob_rw(void *blob)
--
1.7.3.1
More information about the devicetree-discuss
mailing list