summaryrefslogtreecommitdiff
path: root/common/cmd_usb.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-01-28 21:09:46 +0100
committerWolfgang Denk <wd@denx.de>2009-01-28 21:09:46 +0100
commit6b7243aa89cdacefe46963dbe11cee0cbf021a49 (patch)
tree529dea142504dc68c22249a3003cca98f4eabdb8 /common/cmd_usb.c
parentee64d0acc93f4f15850736eafaacdeadd7f12d25 (diff)
parent1a448db77b10153703bc5e4ad13dd55d88beb1d6 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'common/cmd_usb.c')
-rw-r--r--common/cmd_usb.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/common/cmd_usb.c b/common/cmd_usb.c
index 423a29f33e2..a18e16e1004 100644
--- a/common/cmd_usb.c
+++ b/common/cmd_usb.c
@@ -264,6 +264,16 @@ void usb_display_config(struct usb_device *dev)
printf("\n");
}
+static inline char *portspeed(int speed)
+{
+ if (speed == USB_SPEED_HIGH)
+ return "480 Mb/s";
+ else if (speed == USB_SPEED_LOW)
+ return "1.5 Mb/s";
+ else
+ return "12 Mb/s";
+}
+
/* shows the device tree recursively */
void usb_show_tree_graph(struct usb_device *dev, char *pre)
{
@@ -310,7 +320,7 @@ void usb_show_tree_graph(struct usb_device *dev, char *pre)
pre[index] = 0;
printf(" %s (%s, %dmA)\n", usb_get_class_desc(
dev->config.if_desc[0].bInterfaceClass),
- dev->slow ? "1.5MBit/s" : "12MBit/s",
+ portspeed(dev->speed),
dev->config.MaxPower * 2);
if (strlen(dev->mf) || strlen(dev->prod) || strlen(dev->serial))
printf(" %s %s %s %s\n", pre, dev->mf, dev->prod, dev->serial);