DT sorting test

Moved the dt_dump() into test/dt_common.c so that it can be shared
between hdata/test/hdata_to_dt.c and core/test/run-device.c

run-device.c contains two tests, one basic sorting test and a
generate-and-sort test.

Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
[stewart@linux.vnet.ibm.com: remove trailing whitespace]
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>

1 files changed, 1 insertions, 45 deletions

diff --git a/hdata/test/hdata_to_dt.c b/hdata/test/hdata_to_dt.c
index 1b20f34..38bf825 100644
--- a/hdata/test/hdata_to_dt.c
+++ b/hdata/test/hdata_to_dt.c
@@ -99,6 +99,7 @@ struct dt_node *add_ics_node(void)
 #include "../../core/vpd.c"
 #include "../../core/device.c"
 #include "../../core/chip.c"
+#include "../../test/dt_common.c"
 
 #include <err.h>
 
@@ -116,57 +117,12 @@ static void *ntuple_addr(const struct spira_ntuple *n)
 	return spira_heap + ((unsigned long)addr - base_addr);
 }
 
-static void indent_num(unsigned indent)
-{
-	unsigned int i;
-
-	for (i = 0; i < indent; i++)
-		putc(' ', stdout);
-}
-
-static void dump_val(unsigned indent, const void *prop, size_t size)
-{
-	size_t i;
-	int width = 78 - indent;
-
-	for (i = 0; i < size; i++) {
-		printf("%02x", ((unsigned char *)prop)[i]);
-		width-=2;
-		if(width < 2) {
-			printf("\n");
-			indent_num(indent);
-			width = 80 - indent;
-		}
-	}
-}
-
 /* Make sure valgrind knows these are undefined bytes. */
 static void undefined_bytes(void *p, size_t len)
 {
 	VALGRIND_MAKE_MEM_UNDEFINED(p, len);
 }
 
-static void dump_dt(const struct dt_node *root, unsigned indent, bool props)
-{
-	const struct dt_node *i;
-	const struct dt_property *p;
-	
-	indent_num(indent);
-	printf("node: %s\n", root->name);
-
-	if (props) {
-		list_for_each(&root->properties, p, list) {
-			indent_num(indent + 1);
-			printf("prop: %s size: %zu val: ", p->name, p->len);
-			dump_val(indent + 1, p->prop, p->len);
-			printf("\n");
-		}
-	}
-
-	list_for_each(&root->children, i, list)
-		dump_dt(i, indent + 2, props);
-}
-
 int main(int argc, char *argv[])
 {
 	int fd, r;