summaryrefslogtreecommitdiff
path: root/fdtdump.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2013-01-21 12:59:16 -0800
committerJon Loeliger <jdl@jdl.com>2013-01-27 14:20:56 -0600
commitd20391d6ff45c8fa7281e945491817c35f42b51b (patch)
tree856b8c936583b6d3cb539f67ed828181ce468190 /fdtdump.c
parent8055d77a5be3a4204b3aa5cd73ce5cc03362e193 (diff)
downloaddtc-d20391d6ff45c8fa7281e945491817c35f42b51b.tar.gz
Move property-printing into util
The function that prints a property can be useful to other programs, so move it into util. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'fdtdump.c')
-rw-r--r--fdtdump.c37
1 files changed, 1 insertions, 36 deletions
diff --git a/fdtdump.c b/fdtdump.c
index b2c5b37..03ea429 100644
--- a/fdtdump.c
+++ b/fdtdump.c
@@ -17,41 +17,6 @@
#define PALIGN(p, a) ((void *)(ALIGN((unsigned long)(p), (a))))
#define GET_CELL(p) (p += 4, *((const uint32_t *)(p-4)))
-static void print_data(const char *data, int len)
-{
- int i;
- const char *p = data;
- const char *s;
-
- /* no data, don't print */
- if (len == 0)
- return;
-
- if (util_is_printable_string(data, len)) {
- printf(" = ");
-
- s = data;
- do {
- printf("\"%s\"", s);
- s += strlen(s) + 1;
- if (s < data + len)
- printf(", ");
- } while (s < data + len);
-
- } else if ((len % 4) == 0) {
- printf(" = <");
- for (i = 0; i < len; i += 4)
- printf("0x%08x%s", fdt32_to_cpu(GET_CELL(p)),
- i < (len - 4) ? " " : "");
- printf(">");
- } else {
- printf(" = [");
- for (i = 0; i < len; i++)
- printf("%02x%s", *p++, i < len - 1 ? " " : "");
- printf("]");
- }
-}
-
static void dump_blob(void *blob)
{
struct fdt_header *bph = blob;
@@ -147,7 +112,7 @@ static void dump_blob(void *blob)
p = PALIGN(p + sz, 4);
printf("%*s%s", depth * shift, "", s);
- print_data(t, sz);
+ utilfdt_print_data(t, sz);
printf(";\n");
}
}