compiler.h: unify system ifdef cruft here

[karo-tx-uboot.git] / common / cmd_usb.c

diff --git a/common/cmd_usb.c b/common/cmd_usb.c
index 8b19240a840bc99b8a2d0568cf6e95558be5f683..7b8ee6b48e7c007ce7d79266dc0fa9737bb157a1 100644 (file)
--- 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);
@@ -366,7 +376,7 @@ int do_usbboot(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                boot_device = argv[2];
                break;
        default:
-               printf("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -659,14 +669,14 @@ int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                return 0;
        }
 #endif /* CONFIG_USB_STORAGE */
-       printf("Usage:\n%s\n", cmdtp->usage);
+       cmd_usage(cmdtp);
        return 1;
 }
 
 #ifdef CONFIG_USB_STORAGE
 U_BOOT_CMD(
        usb,    5,      1,      do_usb,
-       "usb     - USB sub-system\n",
+       "USB sub-system",
        "reset - reset (rescan) USB controller\n"
        "usb stop [f]  - stop USB [f]=force stop\n"
        "usb tree  - show USB device tree\n"
@@ -676,22 +686,22 @@ U_BOOT_CMD(
        "usb part [dev] - print partition table of one or all USB storage"
        " devices\n"
        "usb read addr blk# cnt - read `cnt' blocks starting at block `blk#'\n"
-       "    to memory address `addr'\n"
+       "    to memory address `addr'"
 );
 
 
 U_BOOT_CMD(
        usbboot,        3,      1,      do_usbboot,
-       "usbboot - boot from USB device\n",
-       "loadAddr dev:part\n"
+       "boot from USB device",
+       "loadAddr dev:part"
 );
 
 #else
 U_BOOT_CMD(
        usb,    5,      1,      do_usb,
-       "usb     - USB sub-system\n",
+       "USB sub-system",
        "reset - reset (rescan) USB controller\n"
        "usb  tree  - show USB device tree\n"
-       "usb  info [dev] - show available USB devices\n"
+       "usb  info [dev] - show available USB devices"
 );
 #endif