2011-04-07 10:43:27 +00:00
|
|
|
/*
|
|
|
|
* usb.c - rescan for USB devices
|
|
|
|
*
|
|
|
|
* Copyright (c) 2011 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
|
|
|
|
*
|
|
|
|
* See file CREDITS for list of people who contributed to this
|
|
|
|
* project.
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License version 2
|
|
|
|
* as published by the Free Software Foundation.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
#include <common.h>
|
|
|
|
#include <command.h>
|
complete: add empty complete support
for cpuinfo, clear, dhcp, false, login, lsmod, meminfo, passwd, pwd, reginfo,
reset, true, usb, version
for mach-imx and mach-mxs: dump_clocks
for u_serial: mycdev
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2011-06-07 09:32:02 +00:00
|
|
|
#include <complete.h>
|
2011-04-07 10:43:27 +00:00
|
|
|
#include <usb/usb.h>
|
2012-03-18 12:31:05 +00:00
|
|
|
#include <getopt.h>
|
|
|
|
|
2014-05-21 08:54:42 +00:00
|
|
|
/* 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);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-12-21 13:18:57 +00:00
|
|
|
static int do_usb(int argc, char *argv[])
|
2011-04-07 10:43:27 +00:00
|
|
|
{
|
2012-03-18 12:31:05 +00:00
|
|
|
int opt;
|
2014-07-10 13:10:09 +00:00
|
|
|
int tree = 0, show = 0;
|
2012-03-18 12:31:05 +00:00
|
|
|
|
2014-07-10 13:10:09 +00:00
|
|
|
while ((opt = getopt(argc, argv, "ts")) > 0) {
|
2012-03-18 12:31:05 +00:00
|
|
|
switch (opt) {
|
2014-05-21 08:54:42 +00:00
|
|
|
case 't':
|
|
|
|
tree = 1;
|
|
|
|
show = 1;
|
|
|
|
break;
|
|
|
|
case 's':
|
|
|
|
show = 1;
|
|
|
|
break;
|
2012-03-18 12:31:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-07-10 13:10:09 +00:00
|
|
|
usb_rescan();
|
2011-04-07 10:43:27 +00:00
|
|
|
|
2014-05-21 08:54:42 +00:00
|
|
|
if (show)
|
|
|
|
usb_show_devices(tree);
|
|
|
|
|
2011-04-07 10:43:27 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-03-18 12:31:05 +00:00
|
|
|
BAREBOX_CMD_HELP_START(usb)
|
commands: harmonize in-barebox documentation
This patch does probably too much, but it's hard (and very
cumbersome/time consuming) to break it out. What is does is this:
* each command has one short description, e.g. "list MUX configuration"
* made sure the short descriptions start lowercase
* each command has one usage. That string contains just the
options, e.g. "[-npn]". It's not part of the long help text.
* that is, it doesn't say "[OPTIONS]" anymore, every usable option
is listed by character in this (short) option string (the long
description is in the long help text, as before)
* help texts have been reworked, to make them
- sometimes smaller
- sometimes describe the options better
- more often present themselves in a nicer format
* all long help texts are now created with BUSYBOX_CMD_HELP_
macros, no more 'static const __maybe_unused char cmd_foobar_help[]'
* made sure the long help texts starts uppercase
* because cmdtp->name and cmdtp->opts together provide the new usage,
all "Usage: foobar" texts have been removed from the long help texts
* BUSYBOX_CMD_HELP_TEXT() provides the trailing newline by itself, this
is nicer in the source code
* BUSYBOX_CMD_HELP_OPT() provides the trailing newline by itself
* made sure no line gets longer than 77 characters
* delibertely renamed cmdtp->usage, so that we can get compile-time
errors (e.g. in out-of-tree modules that use register_command()
* the 'help' command can now always emit the usage, even without
compiled long help texts
* 'help -v' gives a list of commands with their short description, this
is similar like the old "help" command before my patchset
* 'help -a' gives out help of all commands
Signed-off-by: Holger Schurig <holgerschurig@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-05-13 08:28:42 +00:00
|
|
|
BAREBOX_CMD_HELP_TEXT("Scan for USB devices.")
|
|
|
|
BAREBOX_CMD_HELP_TEXT("")
|
|
|
|
BAREBOX_CMD_HELP_TEXT("Options:")
|
2014-05-21 08:54:42 +00:00
|
|
|
BAREBOX_CMD_HELP_OPT("-s", "show devices")
|
|
|
|
BAREBOX_CMD_HELP_OPT("-t", "show USB tree")
|
2012-03-18 12:31:05 +00:00
|
|
|
BAREBOX_CMD_HELP_END
|
2011-04-07 10:43:27 +00:00
|
|
|
|
|
|
|
BAREBOX_CMD_START(usb)
|
|
|
|
.cmd = do_usb,
|
commands: harmonize in-barebox documentation
This patch does probably too much, but it's hard (and very
cumbersome/time consuming) to break it out. What is does is this:
* each command has one short description, e.g. "list MUX configuration"
* made sure the short descriptions start lowercase
* each command has one usage. That string contains just the
options, e.g. "[-npn]". It's not part of the long help text.
* that is, it doesn't say "[OPTIONS]" anymore, every usable option
is listed by character in this (short) option string (the long
description is in the long help text, as before)
* help texts have been reworked, to make them
- sometimes smaller
- sometimes describe the options better
- more often present themselves in a nicer format
* all long help texts are now created with BUSYBOX_CMD_HELP_
macros, no more 'static const __maybe_unused char cmd_foobar_help[]'
* made sure the long help texts starts uppercase
* because cmdtp->name and cmdtp->opts together provide the new usage,
all "Usage: foobar" texts have been removed from the long help texts
* BUSYBOX_CMD_HELP_TEXT() provides the trailing newline by itself, this
is nicer in the source code
* BUSYBOX_CMD_HELP_OPT() provides the trailing newline by itself
* made sure no line gets longer than 77 characters
* delibertely renamed cmdtp->usage, so that we can get compile-time
errors (e.g. in out-of-tree modules that use register_command()
* the 'help' command can now always emit the usage, even without
compiled long help texts
* 'help -v' gives a list of commands with their short description, this
is similar like the old "help" command before my patchset
* 'help -a' gives out help of all commands
Signed-off-by: Holger Schurig <holgerschurig@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-05-13 08:28:42 +00:00
|
|
|
BAREBOX_CMD_DESC("(re-)detect USB devices")
|
2014-09-29 15:32:56 +00:00
|
|
|
BAREBOX_CMD_OPTS("[-ts]")
|
commands: group 'help' output
The old output of "help" was just producing a long list, that usually
scrolled of the screen (even on a X11 terminal). This list is more
compact, and also sorted by groups.
The old output format (plus grouping) is now available with 'help -v'.
Example:
Information commands:
?, devinfo, help, iomem, meminfo, version
Boot commands:
boot, bootm, go, loadb, loads, loadx, loady, saves, uimage
...
Signed-off-by: Holger Schurig <holgerschurig@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-05-13 14:14:05 +00:00
|
|
|
BAREBOX_CMD_GROUP(CMD_GRP_HWMANIP)
|
2011-04-07 10:43:27 +00:00
|
|
|
BAREBOX_CMD_HELP(cmd_usb_help)
|
complete: add empty complete support
for cpuinfo, clear, dhcp, false, login, lsmod, meminfo, passwd, pwd, reginfo,
reset, true, usb, version
for mach-imx and mach-mxs: dump_clocks
for u_serial: mycdev
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2011-06-07 09:32:02 +00:00
|
|
|
BAREBOX_CMD_COMPLETE(empty_complete)
|
2011-04-07 10:43:27 +00:00
|
|
|
BAREBOX_CMD_END
|