leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: Refactor USB tree output code for testing

Browse Source 
Allow the 'usb tree' command to be used from test code, so that we can
verify that it works correctly.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2015-11-08 23:47:51 -07:00
parent 9ce8b40206
commit 45bfa47e12
2 changed files with 41 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
common/cmd_usb.c
View File

@ -429,7 +429,7 @@ static void usb_show_tree_graph(struct usb_device *dev, char *pre)
} }
/* main routine for the tree command */ /* main routine for the tree command */
static void usb_show_tree(struct usb_device *dev) static void usb_show_subtree(struct usb_device *dev)
{ {
char preamble[32]; char preamble[32];
@ -437,6 +437,37 @@ static void usb_show_tree(struct usb_device *dev)
usb_show_tree_graph(dev, &preamble[0]); usb_show_tree_graph(dev, &preamble[0]);
} }
void usb_show_tree(void)
{
#ifdef CONFIG_DM_USB
struct udevice *bus;
for (uclass_first_device(UCLASS_USB, &bus);
bus;
uclass_next_device(&bus)) {
struct usb_device *udev;
struct udevice *dev;
device_find_first_child(bus, &dev);
if (dev && device_active(dev)) {
udev = dev_get_parent_priv(dev);
usb_show_subtree(udev);
}
}
#else
struct usb_device *udev;
int i;
for (i = 0; i < USB_MAX_DEVICE; i++) {
udev = usb_get_dev_index(i);
if (udev == NULL)
break;
if (udev->parent == NULL)
usb_show_subtree(udev);
}
#endif
}
static int usb_test(struct usb_device *dev, int port, char* arg) static int usb_test(struct usb_device *dev, int port, char* arg)
{ {
int mode; int mode;
@ -631,30 +662,7 @@ static int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
} }
if (strncmp(argv[1], "tree", 4) == 0) { if (strncmp(argv[1], "tree", 4) == 0) {
puts("USB device tree:\n"); puts("USB device tree:\n");
#ifdef CONFIG_DM_USB usb_show_tree();
struct udevice *bus;
for (uclass_first_device(UCLASS_USB, &bus);
bus;
uclass_next_device(&bus)) {
struct usb_device *udev;
struct udevice *dev;
device_find_first_child(bus, &dev);
if (dev && device_active(dev)) {
udev = dev_get_parent_priv(dev);
usb_show_tree(udev);
}
}
#else
for (i = 0; i < USB_MAX_DEVICE; i++) {
udev = usb_get_dev_index(i);
if (udev == NULL)
break;
if (udev->parent == NULL)
usb_show_tree(udev);
}
#endif
return 0; return 0;
} }
if (strncmp(argv[1], "inf", 3) == 0) { if (strncmp(argv[1], "inf", 3) == 0) {

8
include/usb.h
View File

@ -957,4 +957,12 @@ int usb_emul_find(struct udevice *bus, ulong pipe, struct udevice **emulp);
*/ */
void usb_emul_reset(struct udevice *dev); void usb_emul_reset(struct udevice *dev);
/**
* usb_show_tree() - show the USB device tree
*
* This shows a list of active USB devices along with basic information about
* each.
*/
void usb_show_tree(void);
#endif /*_USB_H_ */ #endif /*_USB_H_ */