len0rd/dtc
1
0
Fork 0
mirror of https://github.com/dgibson/dtc.git synced 2025-12-08 20:55:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

dtc: Migrate "string property" checks to new framework

Browse source 
This patch converts to the new tree checking framework those checks
which verify that certain properties (device_type, model) have a
string value, when present.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
David Gibson 2007-12-06 17:01:07 +11:00 • committed by Jon Loeliger
parent c21acabc40
commit faf037f0ef
3 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
checks.c
View file

@ -351,6 +351,10 @@ CHECK_IS_CELL(address_cells_is_cell, "#address-cells", WARN);
CHECK_IS_CELL(size_cells_is_cell, "#size-cells", WARN); CHECK_IS_CELL(size_cells_is_cell, "#size-cells", WARN);
CHECK_IS_CELL(interrupt_cells_is_cell, "#interrupt-cells", WARN); CHECK_IS_CELL(interrupt_cells_is_cell, "#interrupt-cells", WARN);
CHECK_IS_STRING(device_type_is_string, "device_type", WARN);
CHECK_IS_STRING(model_is_string, "model", WARN);
CHECK_IS_STRING(status_is_string, "status", WARN);
static struct check *check_table[] = { static struct check *check_table[] = {
&duplicate_node_names, &duplicate_property_names, &duplicate_node_names, &duplicate_property_names,
&name_is_string, &name_properties, &name_is_string, &name_properties,
@ -358,6 +362,7 @@ static struct check *check_table[] = {
&phandle_references, &path_references, &phandle_references, &path_references,
&address_cells_is_cell, &size_cells_is_cell, &interrupt_cells_is_cell, &address_cells_is_cell, &size_cells_is_cell, &interrupt_cells_is_cell,
&device_type_is_string, &model_is_string, &status_is_string,
}; };
int check_semantics(struct node *dt, int outversion, int boot_cpuid_phys); int check_semantics(struct node *dt, int outversion, int boot_cpuid_phys);
@ -418,24 +423,11 @@ static int must_be_cells(struct property *prop, struct node *node)
return 1; return 1;
} }
static int must_be_string(struct property *prop, struct node *node)
{
if (! data_is_one_string(prop->val)) {
ERRMSG("\"%s\" property in %s is not a string\n",
prop->name, node->fullpath);
return 0;
}
return 1;
}
static struct { static struct {
char *propname; char *propname;
int (*check_fn)(struct property *prop, struct node *node); int (*check_fn)(struct property *prop, struct node *node);
} prop_checker_table[] = { } prop_checker_table[] = {
{"reg", must_be_cells}, {"reg", must_be_cells},
{"model", must_be_string},
{"device_type", must_be_string},
}; };
static int check_properties(struct node *node) static int check_properties(struct node *node)

7
tests/bad-string-props.dts Normal file
View file

@ -0,0 +1,7 @@
/dts-v1/;
/ {
device_type = <0xdeadbeef>;
model = <0xdeadbeef>;
status = <0xdeadbeef>;
};

2
tests/run_tests.sh
View file

@ -168,6 +168,8 @@ dtc_tests () {
run_test dtc-checkfails.sh name_properties -- -I dts -O dtb bad-name-property.dts run_test dtc-checkfails.sh name_properties -- -I dts -O dtb bad-name-property.dts
run_test dtc-checkfails.sh address_cells_is_cell size_cells_is_cell interrupt_cells_is_cell -- -I dts -O dtb bad-ncells.dts run_test dtc-checkfails.sh address_cells_is_cell size_cells_is_cell interrupt_cells_is_cell -- -I dts -O dtb bad-ncells.dts
run_test dtc-checkfails.sh device_type_is_string model_is_string status_is_string -- -I dts -O dtb bad-string-props.dts
} }
while getopts "vt:m" ARG ; do while getopts "vt:m" ARG ; do