libfdt: Sequential write support
This patch adds code to libfdt to create flat trees from scratch, writing
sequentially.
diff --git a/tests/Makefile b/tests/Makefile
index 2b165dc..b6dc852 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -2,7 +2,8 @@
LIB_TESTS = root_node property_offset subnode_offset path_offset getprop \
notfound \
- setprop_inplace nop_property nop_node
+ setprop_inplace nop_property nop_node \
+ sw_tree1
TESTS = $(LIB_TESTS)
UTILS = dumptrees
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 0ffdc93..338e47a 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -27,7 +27,15 @@
}
functional_tests () {
+ # Make sure we don't have stale blobs lying around
+ rm -f *.test.dtb
+
tree1_tests test_tree1.dtb
+
+ # Sequential write tests
+ run_test sw_tree1
+ tree1_tests sw_tree1.test.dtb
+ tree1_tests unfinished_tree1.test.dtb
}
stress_tests () {
diff --git a/tests/sw_tree1.c b/tests/sw_tree1.c
new file mode 100644
index 0000000..6f72006
--- /dev/null
+++ b/tests/sw_tree1.c
@@ -0,0 +1,83 @@
+/*
+ * libfdt - Flat Device Tree manipulation
+ * Testcase for fdt_nop_node()
+ * Copyright (C) 2006 David Gibson, IBM Corporation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+
+#include <fdt.h>
+#include <libfdt.h>
+
+#include "tests.h"
+#include "testdata.h"
+
+#define SPACE 65536
+
+#define CHECK(code) \
+ { \
+ err = (code); \
+ if (err) \
+ FAIL(#code ": %s", fdt_strerror(err)); \
+ }
+
+int main(int argc, char *argv[])
+{
+ void *buf;
+ struct fdt_header *fdt;
+ int err;
+
+ test_init(argc, argv);
+
+ buf = xmalloc(SPACE);
+ fdt = fdt_create(buf, SPACE);
+
+ CHECK(fdt_finish_reservemap(fdt));
+ CHECK(fdt_begin_node(fdt, ""));
+ CHECK(fdt_property_typed(fdt, "prop-int", TEST_VALUE_1));
+ CHECK(fdt_property_string(fdt, "prop-str", TEST_STRING_1));
+
+ CHECK(fdt_begin_node(fdt, "subnode1"));
+ CHECK(fdt_property_typed(fdt, "prop-int", TEST_VALUE_1));
+ CHECK(fdt_begin_node(fdt, "subsubnode"));
+ CHECK(fdt_property_typed(fdt, "prop-int", TEST_VALUE_1));
+ CHECK(fdt_end_node(fdt));
+ CHECK(fdt_end_node(fdt));
+
+ CHECK(fdt_begin_node(fdt, "subnode2"));
+ CHECK(fdt_property_typed(fdt, "prop-int", TEST_VALUE_2));
+ CHECK(fdt_begin_node(fdt, "subsubnode"));
+ CHECK(fdt_property_typed(fdt, "prop-int", TEST_VALUE_2));
+ CHECK(fdt_end_node(fdt));
+ CHECK(fdt_end_node(fdt));
+
+ CHECK(fdt_end_node(fdt));
+
+ save_blob("unfinished_tree1.test.dtb", fdt);
+
+ CHECK(fdt_finish(fdt));
+
+ verbose_printf("Completed tree, totalsize = %d\n",
+ fdt32_to_cpu(fdt->totalsize));
+
+ save_blob("sw_tree1.test.dtb", fdt);
+
+ PASS();
+}
diff --git a/tests/tests.h b/tests/tests.h
index b5fd475..64ab64f 100644
--- a/tests/tests.h
+++ b/tests/tests.h
@@ -139,5 +139,6 @@
})
//void *load_blob(const char *filename);
void *load_blob_arg(int argc, char *argv[]);
+void save_blob(const char *filename, struct fdt_header *fdt);
#endif /* _TESTS_H */
diff --git a/tests/testutils.c b/tests/testutils.c
index af8c2ad..4997a8e 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -202,3 +202,29 @@
CONFIG("Usage: %s <dtb file>", argv[0]);
return load_blob(argv[1]);
}
+
+void save_blob(const char *filename, struct fdt_header *fdt)
+{
+ int fd;
+ int totalsize;
+ int offset;
+ void *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 = fdt32_to_cpu(fdt->totalsize);
+ 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;
+ }
+}
