summaryrefslogtreecommitdiffstats
path: root/commands/usb.c
diff options
context:
space:
mode:
authorAntony Pavlov <antonynpavlov@gmail.com>2014-05-21 12:54:42 +0400
committerSascha Hauer <s.hauer@pengutronix.de>2014-07-18 14:48:27 +0200
commit9fc0d34763d4e3cdaa9ed05210bfdc23286b65a3 (patch)
tree4b4f49fbf907b5641ed2c214d763ea01834fd720 /commands/usb.c
parent0420f7a34f02038c4bfcf7a5305c8b9c1f481129 (diff)
downloadbarebox-9fc0d34763d4e3cdaa9ed05210bfdc23286b65a3.tar.gz
commands: usb: add tree view capability
This patch adds U-Boot 'usb tree' command functionality to barebox. Here is an example output: 1 ID 0000:0000 | u-boot EHCI Host Controller | +-2 ID 05e3:0606 | USB2.0 Hub | +-3 ID 10c4:ea60 | Silicon Labs CP2102 USB to UART Bridge Contr P-00-00669 | +-4 ID 05e3:0606 | | USB2.0 Hub | | | +-5 ID 05e3:0608 | | | USB2.0 Hub | | | | | +-6 ID 0d8c:000c | | C-Media USB Headphone Set | | | +-7 ID 0d8c:000c | C-Media USB Headphone Set | +-8 ID 0846:1040 NETGEAR NETGEAR FA120 Adapter The tree view is enabled with 'usb -t' Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands/usb.c')
-rw-r--r--commands/usb.c105
1 files changed, 102 insertions, 3 deletions
diff --git a/commands/usb.c b/commands/usb.c
index 073c79c..c158852 100644
--- a/commands/usb.c
+++ b/commands/usb.c
@@ -22,21 +22,118 @@
#include <usb/usb.h>
#include <getopt.h>
+/* shows the device tree recursively */
+static void usb_show_tree_graph(struct usb_device *dev, char *pre)
+{
+ int i, index;
+ int has_child, last_child;
+
+ index = strlen(pre);
+ printf(" %s", pre);
+ /* check if the device has connected children */
+ has_child = 0;
+
+ for (i = 0; i < dev->maxchild; i++) {
+ if (dev->children[i] != NULL)
+ has_child = 1;
+ }
+
+ /* check if we are the last one */
+ last_child = 1;
+
+ if (dev->parent) {
+ for (i = 0; i < dev->parent->maxchild; i++) {
+ if (dev->parent->children[i])
+ last_child = 0;
+
+ if (dev->parent->children[i] == dev)
+ last_child = 1;
+ } /* for all children of the parent */
+ printf("\b+-");
+
+ /* correct last child */
+ if (last_child)
+ pre[index - 1] = ' ';
+ } else {
+ /* if not root hub */
+ printf(" ");
+ }
+
+ printf("%d ", dev->devnum);
+
+ pre[index++] = ' ';
+ pre[index++] = has_child ? '|' : ' ';
+ pre[index] = 0;
+
+ printf("ID %04x:%04x\n", dev->descriptor->idVendor, dev->descriptor->idProduct);
+
+ if (strlen(dev->mf) || strlen(dev->prod) || strlen(dev->serial))
+ printf(" %s %s %s %s\n", pre, dev->mf, dev->prod, dev->serial);
+
+ printf(" %s\n", pre);
+
+ if (dev->maxchild > 0) {
+ for (i = 0; i < dev->maxchild; i++) {
+ if (dev->children[i] != NULL) {
+ usb_show_tree_graph(dev->children[i], pre);
+ pre[index] = 0;
+ }
+ }
+ }
+}
+
+/* main routine for the tree command */
+static void usb_show_tree(struct usb_device *dev)
+{
+ char preamble[32];
+
+ memset(preamble, 0, 32);
+ usb_show_tree_graph(dev, &preamble[0]);
+}
+
+static void usb_show_devices(bool tree)
+{
+ struct usb_device *dev;
+
+ list_for_each_entry(dev, &usb_device_list, list) {
+ if (tree) {
+ if (dev->parent == NULL)
+ usb_show_tree(dev);
+ } else {
+ printf("Bus %03d Device %03d: ID %04x:%04x %s\n",
+ dev->host->busnum, dev->devnum,
+ dev->descriptor->idVendor,
+ dev->descriptor->idProduct,
+ dev->prod);
+ }
+ }
+}
+
static int do_usb(int argc, char *argv[])
{
int opt;
- int force = 0;
+ int force = 0, tree = 0, show = 0;
- while ((opt = getopt(argc, argv, "f")) > 0) {
+ while ((opt = getopt(argc, argv, "fts")) > 0) {
switch (opt) {
case 'f':
force = 1;
break;
+ case 't':
+ tree = 1;
+ show = 1;
+ break;
+ case 's':
+ show = 1;
+ break;
}
}
usb_rescan(force);
+ if (show)
+ usb_show_devices(tree);
+
return 0;
}
@@ -45,12 +142,14 @@ BAREBOX_CMD_HELP_TEXT("Scan for USB devices.")
BAREBOX_CMD_HELP_TEXT("")
BAREBOX_CMD_HELP_TEXT("Options:")
BAREBOX_CMD_HELP_OPT("-f", "force rescan")
+BAREBOX_CMD_HELP_OPT("-s", "show devices")
+BAREBOX_CMD_HELP_OPT("-t", "show USB tree")
BAREBOX_CMD_HELP_END
BAREBOX_CMD_START(usb)
.cmd = do_usb,
BAREBOX_CMD_DESC("(re-)detect USB devices")
- BAREBOX_CMD_OPTS("[-f]")
+ BAREBOX_CMD_OPTS("[-fts]")
BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP)
BAREBOX_CMD_HELP(cmd_usb_help)
BAREBOX_CMD_COMPLETE(empty_complete)