len0rd/dtc
1
0
Fork 0
mirror of https://github.com/dgibson/dtc.git synced 2025-10-14 08:47:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert dts output formatting changes of spaces around brackets

Browse source 
Commit 32b9c61307 ("Preserve datatype markers when emitting dts format")
add spaces between <> and [] and the encapsulated numbers. Fix this to
keep the prior formatting and not break some users needlessly.

Fixes: 32b9c61307 ("Preserve datatype markers when emitting dts format")
Reported-by: Stewart Smith <stewart@linux.ibm.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Rob Herring 2018-09-14 13:39:06 -05:00 • committed by David Gibson
parent c86da84d30
commit d448f9a5fd
2 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

24
tests/type-preservation.dts
View file

@ -1,27 +1,27 @@
/dts-v1/; /dts-v1/;
/ { / {
#address-cells = < 0x01 >; #address-cells = <0x01>;
#size-cells = < 0x00 >; #size-cells = <0x00>;
sub1: subnode@1 { sub1: subnode@1 {
prop_label: compatible = value_label: "subnode1"; prop_label: compatible = value_label: "subnode1";
reg = < 0x01 >; reg = <0x01>;
int-array = < 0x00 0x01 >, int_value_label: < 0x02 0x03 >; int-array = <0x00 0x01>, int_value_label: <0x02 0x03>;
int8 = [ 56 ]; int8 = [56];
int8-array = [ 00 12 34 56 label: ]; int8-array = [00 12 34 56 label:];
int16 = /bits/ 16 < 0x3210 >; int16 = /bits/ 16 <0x3210>;
int16-array = /bits/ 16 < 0x1234 0x5678 0x90ab 0xcdef >; int16-array = /bits/ 16 <0x1234 0x5678 0x90ab 0xcdef>;
int16-matrix = /bits/ 16 < 0x1234 0x5678 >, < 0x90ab 0xcdef >; int16-matrix = /bits/ 16 <0x1234 0x5678>, <0x90ab 0xcdef>;
int64 = /bits/ 64 < 0x200000000 >; int64 = /bits/ 64 <0x200000000>;
int64-array = /bits/ 64 < 0x100000000 0x00 int64_array_label_end: >; int64-array = /bits/ 64 <0x100000000 0x00 int64_array_label_end:>;
a-string-with-nulls = "foo\0bar", "baz"; a-string-with-nulls = "foo\0bar", "baz";
subsub1: subsubnode { subsub1: subsubnode {
compatible = "subsubnode1", "subsubnode"; compatible = "subsubnode1", "subsubnode";
subsubsub1: subsubsubnode { subsubsub1: subsubsubnode {
compatible = "subsubsubnode1", < 0x1234 >, valuea: valueb: "subsubsubnode"; compatible = "subsubsubnode1", <0x1234>, valuea: valueb: "subsubsubnode";
}; };
}; };
}; };

18
treesource.c
View file

@ -118,18 +118,20 @@ static void write_propval_int(FILE *f, const char *p, size_t len, size_t width)
for (; p < end; p += width) { for (; p < end; p += width) {
switch (width) { switch (width) {
case 1: case 1:
fprintf(f, " %02"PRIx8, *(const uint8_t*)p); fprintf(f, "%02"PRIx8, *(const uint8_t*)p);
break; break;
case 2: case 2:
fprintf(f, " 0x%02"PRIx16, fdt16_to_cpu(*(const fdt16_t*)p)); fprintf(f, "0x%02"PRIx16, fdt16_to_cpu(*(const fdt16_t*)p));
break; break;
case 4: case 4:
fprintf(f, " 0x%02"PRIx32, fdt32_to_cpu(*(const fdt32_t*)p)); fprintf(f, "0x%02"PRIx32, fdt32_to_cpu(*(const fdt32_t*)p));
break; break;
case 8: case 8:
fprintf(f, " 0x%02"PRIx64, fdt64_to_cpu(*(const fdt64_t*)p)); fprintf(f, "0x%02"PRIx64, fdt64_to_cpu(*(const fdt64_t*)p));
break; break;
} }
if (p + width < end)
fputc(' ', f);
} }
} }
@ -162,10 +164,10 @@ static const char *delim_start[] = {
[TYPE_STRING] = "", [TYPE_STRING] = "",
}; };
static const char *delim_end[] = { static const char *delim_end[] = {
[TYPE_UINT8] = " ]", [TYPE_UINT8] = "]",
[TYPE_UINT16] = " >", [TYPE_UINT16] = ">",
[TYPE_UINT32] = " >", [TYPE_UINT32] = ">",
[TYPE_UINT64] = " >", [TYPE_UINT64] = ">",
[TYPE_STRING] = "", [TYPE_STRING] = "",
}; };