summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-05-19 13:55:48 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-05-19 22:23:56 +0200
commite275b2653f87dc6969b3c0baf6f0e7460c62a8db (patch)
tree59a870d2c340091d3a8546475992282d57ec306a
parente5c59c386784d9c52505823ee293c94f633a8744 (diff)
downloadbarebox-e275b2653f87dc6969b3c0baf6f0e7460c62a8db.tar.gz
complete: Add devicetree completion
The of_* commands take devicetree nodes as parameters. Add a devicetree completion function to ease passing nodes to these commands. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--commands/of_node.c2
-rw-r--r--commands/of_property.c2
-rw-r--r--commands/oftree.c2
-rw-r--r--common/complete.c71
-rw-r--r--include/complete.h5
5 files changed, 81 insertions, 1 deletions
diff --git a/commands/of_node.c b/commands/of_node.c
index 901da88..4962e52 100644
--- a/commands/of_node.c
+++ b/commands/of_node.c
@@ -21,6 +21,7 @@
#include <environment.h>
#include <fdt.h>
#include <of.h>
+#include <complete.h>
#include <command.h>
#include <fs.h>
#include <malloc.h>
@@ -104,5 +105,6 @@ BAREBOX_CMD_START(of_node)
BAREBOX_CMD_DESC("create/delete nodes in the device tree")
BAREBOX_CMD_OPTS("[-cd] NODE NAME")
BAREBOX_CMD_GROUP(CMD_GRP_MISC)
+ BAREBOX_CMD_COMPLETE(devicetree_complete)
BAREBOX_CMD_HELP(cmd_of_node_help)
BAREBOX_CMD_END
diff --git a/commands/of_property.c b/commands/of_property.c
index f9f35b2..e0154fc 100644
--- a/commands/of_property.c
+++ b/commands/of_property.c
@@ -24,6 +24,7 @@
#include <command.h>
#include <fs.h>
#include <malloc.h>
+#include <complete.h>
#include <linux/ctype.h>
#include <asm/byteorder.h>
#include <errno.h>
@@ -317,5 +318,6 @@ BAREBOX_CMD_START(of_property)
BAREBOX_CMD_DESC("handle device tree properties")
BAREBOX_CMD_OPTS("[-sd] NODE [PROPERTY] [VALUES]")
BAREBOX_CMD_GROUP(CMD_GRP_MISC)
+ BAREBOX_CMD_COMPLETE(devicetree_complete)
BAREBOX_CMD_HELP(cmd_of_property_help)
BAREBOX_CMD_END
diff --git a/commands/oftree.c b/commands/oftree.c
index 3253cf1..16648d6 100644
--- a/commands/oftree.c
+++ b/commands/oftree.c
@@ -37,6 +37,7 @@
#include <getopt.h>
#include <init.h>
#include <fcntl.h>
+#include <complete.h>
static int do_oftree(int argc, char *argv[])
{
@@ -207,4 +208,5 @@ BAREBOX_CMD_START(oftree)
BAREBOX_CMD_OPTS("[-lpfdn] [DTB]")
BAREBOX_CMD_GROUP(CMD_GRP_MISC)
BAREBOX_CMD_HELP(cmd_oftree_help)
+ BAREBOX_CMD_COMPLETE(devicetree_file_complete)
BAREBOX_CMD_END
diff --git a/common/complete.c b/common/complete.c
index 368321f..5b71f03 100644
--- a/common/complete.c
+++ b/common/complete.c
@@ -204,6 +204,77 @@ int command_var_complete(struct string_list *sl, char *instr)
}
EXPORT_SYMBOL(command_var_complete);
+int devicetree_alias_complete(struct string_list *sl, char *instr)
+{
+ struct device_node *aliases;
+ struct property *p;
+
+ aliases = of_find_node_by_path("/aliases");
+ if (!aliases)
+ return 0;
+
+ list_for_each_entry(p, &aliases->properties, list) {
+ if (strncmp(instr, p->name, strlen(instr)))
+ continue;
+
+ string_list_add_asprintf(sl, "%s ", p->name);
+ }
+
+ return 0;
+}
+EXPORT_SYMBOL(devicetree_alias_complete);
+
+int devicetree_nodepath_complete(struct string_list *sl, char *instr)
+{
+ struct device_node *node, *child;
+ char *dirn, *base;
+ char *path = strdup(instr);
+
+ if (*instr == '/') {
+ dirn = dirname(path);
+ base = basename(instr);
+ node = of_find_node_by_path(dirn);
+ if (!node)
+ goto out;
+ } else if (!*instr) {
+ node = of_get_root_node();
+ if (!node)
+ goto out;
+ base = "";
+ } else {
+ goto out;
+ }
+
+ for_each_child_of_node(node, child) {
+ if (strncmp(base, child->name, strlen(base)))
+ continue;
+ string_list_add_asprintf(sl, "%s/", child->full_name);
+ }
+out:
+ free(path);
+
+ return 0;
+}
+EXPORT_SYMBOL(devicetree_nodepath_complete);
+
+int devicetree_complete(struct string_list *sl, char *instr)
+{
+ devicetree_nodepath_complete(sl, instr);
+ devicetree_alias_complete(sl, instr);
+
+ return 0;
+}
+EXPORT_SYMBOL(devicetree_complete);
+
+int devicetree_file_complete(struct string_list *sl, char *instr)
+{
+ devicetree_complete(sl, instr);
+ file_complete(sl, instr, 0);
+
+ return 0;
+}
+EXPORT_SYMBOL(devicetree_file_complete);
+
static int env_param_complete(struct string_list *sl, char *instr, int eval)
{
struct device_d *dev;
diff --git a/include/complete.h b/include/complete.h
index 33b848c..491ba66 100644
--- a/include/complete.h
+++ b/include/complete.h
@@ -17,6 +17,9 @@ int empty_complete(struct string_list *sl, char *instr);
int eth_complete(struct string_list *sl, char *instr);
int command_var_complete(struct string_list *sl, char *instr);
int devfs_partition_complete(struct string_list *sl, char *instr);
+int devicetree_alias_complete(struct string_list *sl, char *instr);
+int devicetree_nodepath_complete(struct string_list *sl, char *instr);
+int devicetree_complete(struct string_list *sl, char *instr);
+int devicetree_file_complete(struct string_list *sl, char *instr);
#endif /* __COMPLETE_ */
-