USB storage count

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

diff --git a/common/cmd_usb.c b/common/cmd_usb.c
index 7b8ee6b48e7c007ce7d79266dc0fa9737bb157a1..ee3755c121cda7336c75e1e75679afd1694886b2 100644 (file)
--- a/common/cmd_usb.c
+++ b/common/cmd_usb.c
@@ -157,7 +157,7 @@ void usb_display_desc(struct usb_device *dev)
 {
        if (dev->descriptor.bDescriptorType == USB_DT_DEVICE) {
                printf("%d: %s,  USB Revision %x.%x\n", dev->devnum,
-               usb_get_class_desc(dev->config.if_desc[0].bInterfaceClass),
+               usb_get_class_desc(dev->config.if_desc[0].desc.bInterfaceClass),
                                   (dev->descriptor.bcdUSB>>8) & 0xff,
                                   dev->descriptor.bcdUSB & 0xff);
 
@@ -174,7 +174,7 @@ void usb_display_desc(struct usb_device *dev)
                } else {
                        printf(" - Class: (from Interface) %s\n",
                               usb_get_class_desc(
-                               dev->config.if_desc[0].bInterfaceClass));
+                               dev->config.if_desc[0].desc.bInterfaceClass));
                }
                printf(" - PacketSize: %d  Configurations: %d\n",
                        dev->descriptor.bMaxPacketSize0,
@@ -187,14 +187,14 @@ void usb_display_desc(struct usb_device *dev)
 
 }
 
-void usb_display_conf_desc(struct usb_config_descriptor *config,
+void usb_display_conf_desc(struct usb_configuration_descriptor *config,
                           struct usb_device *dev)
 {
        printf("   Configuration: %d\n", config->bConfigurationValue);
        printf("   - Interfaces: %d %s%s%dmA\n", config->bNumInterfaces,
               (config->bmAttributes & 0x40) ? "Self Powered " : "Bus Powered ",
               (config->bmAttributes & 0x20) ? "Remote Wakeup " : "",
-               config->MaxPower*2);
+               config->bMaxPower*2);
        if (config->iConfiguration) {
                printf("   - ");
                usb_display_string(dev, config->iConfiguration);
@@ -246,16 +246,16 @@ void usb_display_ep_desc(struct usb_endpoint_descriptor *epdesc)
 /* main routine to diasplay the configs, interfaces and endpoints */
 void usb_display_config(struct usb_device *dev)
 {
-       struct usb_config_descriptor *config;
-       struct usb_interface_descriptor *ifdesc;
+       struct usb_config *config;
+       struct usb_interface *ifdesc;
        struct usb_endpoint_descriptor *epdesc;
        int i, ii;
 
        config = &dev->config;
-       usb_display_conf_desc(config, dev);
+       usb_display_conf_desc(&config->desc, dev);
        for (i = 0; i < config->no_of_if; i++) {
                ifdesc = &config->if_desc[i];
-               usb_display_if_desc(ifdesc, dev);
+               usb_display_if_desc(&ifdesc->desc, dev);
                for (ii = 0; ii < ifdesc->no_of_ep; ii++) {
                        epdesc = &ifdesc->ep_desc[ii];
                        usb_display_ep_desc(epdesc);
@@ -319,9 +319,9 @@ void usb_show_tree_graph(struct usb_device *dev, char *pre)
        pre[index++] = has_child ? '|' : ' ';
        pre[index] = 0;
        printf(" %s (%s, %dmA)\n", usb_get_class_desc(
-                                       dev->config.if_desc[0].bInterfaceClass),
+                                       dev->config.if_desc[0].desc.bInterfaceClass),
                                        portspeed(dev->speed),
-                                       dev->config.MaxPower * 2);
+                                       dev->config.desc.bMaxPower * 2);
        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);
@@ -387,7 +387,7 @@ int do_usbboot(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        dev = simple_strtoul(boot_device, &ep, 16);
        stor_dev = usb_stor_get_dev(dev);
-       if (stor_dev->type == DEV_TYPE_UNKNOWN) {
+       if (stor_dev == NULL || stor_dev->type == DEV_TYPE_UNKNOWN) {
                printf("\n** Device %d not available\n", dev);
                return 1;
        }
@@ -595,22 +595,25 @@ int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        if (strncmp(argv[1], "part", 4) == 0) {
                int devno, ok = 0;
                if (argc == 2) {
-                       for (devno = 0; devno < USB_MAX_STOR_DEV; ++devno) {
+                       for (devno = 0; ; ++devno) {
                                stor_dev = usb_stor_get_dev(devno);
+                               if (stor_dev == NULL)
+                                       break;
                                if (stor_dev->type != DEV_TYPE_UNKNOWN) {
                                        ok++;
                                        if (devno)
                                                printf("\n");
-                                       printf("print_part of %x\n", devno);
+                                       debug("print_part of %x\n", devno);
                                        print_part(stor_dev);
                                }
                        }
                } else {
                        devno = simple_strtoul(argv[2], NULL, 16);
                        stor_dev = usb_stor_get_dev(devno);
-                       if (stor_dev->type != DEV_TYPE_UNKNOWN) {
+                       if (stor_dev != NULL &&
+                           stor_dev->type != DEV_TYPE_UNKNOWN) {
                                ok++;
-                               printf("print_part of %x\n", devno);
+                               debug("print_part of %x\n", devno);
                                print_part(stor_dev);
                        }
                }
@@ -642,16 +645,38 @@ int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        return 1;
                }
        }
+       if (strcmp(argv[1], "write") == 0) {
+               if (usb_stor_curr_dev < 0) {
+                       printf("no current device selected\n");
+                       return 1;
+               }
+               if (argc == 5) {
+                       unsigned long addr = simple_strtoul(argv[2], NULL, 16);
+                       unsigned long blk  = simple_strtoul(argv[3], NULL, 16);
+                       unsigned long cnt  = simple_strtoul(argv[4], NULL, 16);
+                       unsigned long n;
+                       printf("\nUSB write: device %d block # %ld, count %ld"
+                               " ... ", usb_stor_curr_dev, blk, cnt);
+                       stor_dev = usb_stor_get_dev(usb_stor_curr_dev);
+                       n = stor_dev->block_write(usb_stor_curr_dev, blk, cnt,
+                                               (ulong *)addr);
+                       printf("%ld blocks write: %s\n", n,
+                               (n == cnt) ? "OK" : "ERROR");
+                       if (n == cnt)
+                               return 0;
+                       return 1;
+               }
+       }
        if (strncmp(argv[1], "dev", 3) == 0) {
                if (argc == 3) {
                        int dev = (int)simple_strtoul(argv[2], NULL, 10);
                        printf("\nUSB device %d: ", dev);
-                       if (dev >= USB_MAX_STOR_DEV) {
+                       stor_dev = usb_stor_get_dev(dev);
+                       if (stor_dev == NULL) {
                                printf("unknown device\n");
                                return 1;
                        }
                        printf("\n    Device %d: ", dev);
-                       stor_dev = usb_stor_get_dev(dev);
                        dev_print(stor_dev);
                        if (stor_dev->type == DEV_TYPE_UNKNOWN)
                                return 1;
@@ -687,6 +712,8 @@ U_BOOT_CMD(
        " devices\n"
        "usb read addr blk# cnt - read `cnt' blocks starting at block `blk#'\n"
        "    to memory address `addr'"
+       "usb write addr blk# cnt - write `cnt' blocks starting at block `blk#'\n"
+       "    from memory address `addr'"
 );