common/cmd_usb.c

   1 /*
   2  * (C) Copyright 2001
   3  * Denis Peter, MPL AG Switzerland
   4  *
   5  * Most of this source has been derived from the Linux USB
   6  * project.
   7  *
   8  * See file CREDITS for list of people who contributed to this
   9  * project.
  10  *
  11  * This program is free software; you can redistribute it and/or
  12  * modify it under the terms of the GNU General Public License as
  13  * published by the Free Software Foundation; either version 2 of
  14  * the License, or (at your option) any later version.
  15  *
  16  * This program is distributed in the hope that it will be useful,
  17  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  18  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  19  * GNU General Public License for more details.
  20  *
  21  * You should have received a copy of the GNU General Public License
  22  * along with this program; if not, write to the Free Software
  23  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  24  * MA 02111-1307 USA
  25  *
  26  */
  27
  28 #include <common.h>
  29 #include <command.h>
  30 #include <asm/byteorder.h>
  31 #include <part.h>
  32 #include <usb.h>
  33
  34 #ifdef CONFIG_USB_STORAGE
  35 static int usb_stor_curr_dev = -1; /* current device */
  36 #endif
  37 #ifdef CONFIG_USB_HOST_ETHER
  38 static int usb_ether_curr_dev = -1; /* current ethernet device */
  39 #endif
  40
  41 /* some display routines (info command) */
  42 char *usb_get_class_desc(unsigned char dclass)
  43 {
  44         switch (dclass) {
  45         case USB_CLASS_PER_INTERFACE:
  46                 return "See Interface";
  47         case USB_CLASS_AUDIO:
  48                 return "Audio";
  49         case USB_CLASS_COMM:
  50                 return "Communication";
  51         case USB_CLASS_HID:
  52                 return "Human Interface";
  53         case USB_CLASS_PRINTER:
  54                 return "Printer";
  55         case USB_CLASS_MASS_STORAGE:
  56                 return "Mass Storage";
  57         case USB_CLASS_HUB:
  58                 return "Hub";
  59         case USB_CLASS_DATA:
  60                 return "CDC Data";
  61         case USB_CLASS_VENDOR_SPEC:
  62                 return "Vendor specific";
  63         default:
  64                 return "";
  65         }
  66 }
  67
  68 void usb_display_class_sub(unsigned char dclass, unsigned char subclass,
  69                            unsigned char proto)
  70 {
  71         switch (dclass) {
  72         case USB_CLASS_PER_INTERFACE:
  73                 printf("See Interface");
  74                 break;
  75         case USB_CLASS_HID:
  76                 printf("Human Interface, Subclass: ");
  77                 switch (subclass) {
  78                 case USB_SUB_HID_NONE:
  79                         printf("None");
  80                         break;
  81                 case USB_SUB_HID_BOOT:
  82                         printf("Boot ");
  83                         switch (proto) {
  84                         case USB_PROT_HID_NONE:
  85                                 printf("None");
  86                                 break;
  87                         case USB_PROT_HID_KEYBOARD:
  88                                 printf("Keyboard");
  89                                 break;
  90                         case USB_PROT_HID_MOUSE:
  91                                 printf("Mouse");
  92                                 break;
  93                         default:
  94                                 printf("reserved");
  95                                 break;
  96                         }
  97                         break;
  98                 default:
  99                         printf("reserved");
 100                         break;
 101                 }
 102                 break;
 103         case USB_CLASS_MASS_STORAGE:
 104                 printf("Mass Storage, ");
 105                 switch (subclass) {
 106                 case US_SC_RBC:
 107                         printf("RBC ");
 108                         break;
 109                 case US_SC_8020:
 110                         printf("SFF-8020i (ATAPI)");
 111                         break;
 112                 case US_SC_QIC:
 113                         printf("QIC-157 (Tape)");
 114                         break;
 115                 case US_SC_UFI:
 116                         printf("UFI");
 117                         break;
 118                 case US_SC_8070:
 119                         printf("SFF-8070");
 120                         break;
 121                 case US_SC_SCSI:
 122                         printf("Transp. SCSI");
 123                         break;
 124                 default:
 125                         printf("reserved");
 126                         break;
 127                 }
 128                 printf(", ");
 129                 switch (proto) {
 130                 case US_PR_CB:
 131                         printf("Command/Bulk");
 132                         break;
 133                 case US_PR_CBI:
 134                         printf("Command/Bulk/Int");
 135                         break;
 136                 case US_PR_BULK:
 137                         printf("Bulk only");
 138                         break;
 139                 default:
 140                         printf("reserved");
 141                         break;
 142                 }
 143                 break;
 144         default:
 145                 printf("%s", usb_get_class_desc(dclass));
 146                 break;
 147         }
 148 }
 149
 150 void usb_display_string(struct usb_device *dev, int index)
 151 {
 152         char buffer[256];
 153         if (index != 0) {
 154                 if (usb_string(dev, index, &buffer[0], 256) > 0)
 155                         printf("String: \"%s\"", buffer);
 156         }
 157 }
 158
 159 void usb_display_desc(struct usb_device *dev)
 160 {
 161         if (dev->descriptor.bDescriptorType == USB_DT_DEVICE) {
 162                 printf("%d: %s,  USB Revision %x.%x\n", dev->devnum,
 163                 usb_get_class_desc(dev->config.if_desc[0].desc.bInterfaceClass),
 164                                    (dev->descriptor.bcdUSB>>8) & 0xff,
 165                                    dev->descriptor.bcdUSB & 0xff);
 166
 167                 if (strlen(dev->mf) || strlen(dev->prod) ||
 168                     strlen(dev->serial))
 169                         printf(" - %s %s %s\n", dev->mf, dev->prod,
 170                                 dev->serial);
 171                 if (dev->descriptor.bDeviceClass) {
 172                         printf(" - Class: ");
 173                         usb_display_class_sub(dev->descriptor.bDeviceClass,
 174                                               dev->descriptor.bDeviceSubClass,
 175                                               dev->descriptor.bDeviceProtocol);
 176                         printf("\n");
 177                 } else {
 178                         printf(" - Class: (from Interface) %s\n",
 179                                usb_get_class_desc(
 180                                 dev->config.if_desc[0].desc.bInterfaceClass));
 181                 }
 182                 printf(" - PacketSize: %d  Configurations: %d\n",
 183                         dev->descriptor.bMaxPacketSize0,
 184                         dev->descriptor.bNumConfigurations);
 185                 printf(" - Vendor: 0x%04x  Product 0x%04x Version %d.%d\n",
 186                         dev->descriptor.idVendor, dev->descriptor.idProduct,
 187                         (dev->descriptor.bcdDevice>>8) & 0xff,
 188                         dev->descriptor.bcdDevice & 0xff);
 189         }
 190
 191 }
 192
 193 void usb_display_conf_desc(struct usb_configuration_descriptor *config,
 194                            struct usb_device *dev)
 195 {
 196         printf("   Configuration: %d\n", config->bConfigurationValue);
 197         printf("   - Interfaces: %d %s%s%dmA\n", config->bNumInterfaces,
 198                (config->bmAttributes & 0x40) ? "Self Powered " : "Bus Powered ",
 199                (config->bmAttributes & 0x20) ? "Remote Wakeup " : "",
 200                 config->bMaxPower*2);
 201         if (config->iConfiguration) {
 202                 printf("   - ");
 203                 usb_display_string(dev, config->iConfiguration);
 204                 printf("\n");
 205         }
 206 }
 207
 208 void usb_display_if_desc(struct usb_interface_descriptor *ifdesc,
 209                          struct usb_device *dev)
 210 {
 211         printf("     Interface: %d\n", ifdesc->bInterfaceNumber);
 212         printf("     - Alternate Setting %d, Endpoints: %d\n",
 213                 ifdesc->bAlternateSetting, ifdesc->bNumEndpoints);
 214         printf("     - Class ");
 215         usb_display_class_sub(ifdesc->bInterfaceClass,
 216                 ifdesc->bInterfaceSubClass, ifdesc->bInterfaceProtocol);
 217         printf("\n");
 218         if (ifdesc->iInterface) {
 219                 printf("     - ");
 220                 usb_display_string(dev, ifdesc->iInterface);
 221                 printf("\n");
 222         }
 223 }
 224
 225 void usb_display_ep_desc(struct usb_endpoint_descriptor *epdesc)
 226 {
 227         printf("     - Endpoint %d %s ", epdesc->bEndpointAddress & 0xf,
 228                 (epdesc->bEndpointAddress & 0x80) ? "In" : "Out");
 229         switch ((epdesc->bmAttributes & 0x03)) {
 230         case 0:
 231                 printf("Control");
 232                 break;
 233         case 1:
 234                 printf("Isochronous");
 235                 break;
 236         case 2:
 237                 printf("Bulk");
 238                 break;
 239         case 3:
 240                 printf("Interrupt");
 241                 break;
 242         }
 243         printf(" MaxPacket %d", epdesc->wMaxPacketSize);
 244         if ((epdesc->bmAttributes & 0x03) == 0x3)
 245                 printf(" Interval %dms", epdesc->bInterval);
 246         printf("\n");
 247 }
 248
 249 /* main routine to diasplay the configs, interfaces and endpoints */
 250 void usb_display_config(struct usb_device *dev)
 251 {
 252         struct usb_config *config;
 253         struct usb_interface *ifdesc;
 254         struct usb_endpoint_descriptor *epdesc;
 255         int i, ii;
 256
 257         config = &dev->config;
 258         usb_display_conf_desc(&config->desc, dev);
 259         for (i = 0; i < config->no_of_if; i++) {
 260                 ifdesc = &config->if_desc[i];
 261                 usb_display_if_desc(&ifdesc->desc, dev);
 262                 for (ii = 0; ii < ifdesc->no_of_ep; ii++) {
 263                         epdesc = &ifdesc->ep_desc[ii];
 264                         usb_display_ep_desc(epdesc);
 265                 }
 266         }
 267         printf("\n");
 268 }
 269
 270 static inline char *portspeed(int speed)
 271 {
 272         if (speed == USB_SPEED_HIGH)
 273                 return "480 Mb/s";
 274         else if (speed == USB_SPEED_LOW)
 275                 return "1.5 Mb/s";
 276         else
 277                 return "12 Mb/s";
 278 }
 279
 280 /* shows the device tree recursively */
 281 void usb_show_tree_graph(struct usb_device *dev, char *pre)
 282 {
 283         int i, index;
 284         int has_child, last_child, port;
 285
 286         index = strlen(pre);
 287         printf(" %s", pre);
 288         /* check if the device has connected children */
 289         has_child = 0;
 290         for (i = 0; i < dev->maxchild; i++) {
 291                 if (dev->children[i] != NULL)
 292                         has_child = 1;
 293         }
 294         /* check if we are the last one */
 295         last_child = 1;
 296         if (dev->parent != NULL) {
 297                 for (i = 0; i < dev->parent->maxchild; i++) {
 298                         /* search for children */
 299                         if (dev->parent->children[i] == dev) {
 300                                 /* found our pointer, see if we have a
 301                                  * little sister
 302                                  */
 303                                 port = i;
 304                                 while (i++ < dev->parent->maxchild) {
 305                                         if (dev->parent->children[i] != NULL) {
 306                                                 /* found a sister */
 307                                                 last_child = 0;
 308                                                 break;
 309                                         } /* if */
 310                                 } /* while */
 311                         } /* device found */
 312                 } /* for all children of the parent */
 313                 printf("\b+-");
 314                 /* correct last child */
 315                 if (last_child)
 316                         pre[index-1] = ' ';
 317         } /* if not root hub */
 318         else
 319                 printf(" ");
 320         printf("%d ", dev->devnum);
 321         pre[index++] = ' ';
 322         pre[index++] = has_child ? '|' : ' ';
 323         pre[index] = 0;
 324         printf(" %s (%s, %dmA)\n", usb_get_class_desc(
 325                                         dev->config.if_desc[0].desc.bInterfaceClass),
 326                                         portspeed(dev->speed),
 327                                         dev->config.desc.bMaxPower * 2);
 328         if (strlen(dev->mf) || strlen(dev->prod) || strlen(dev->serial))
 329                 printf(" %s  %s %s %s\n", pre, dev->mf, dev->prod, dev->serial);
 330         printf(" %s\n", pre);
 331         if (dev->maxchild > 0) {
 332                 for (i = 0; i < dev->maxchild; i++) {
 333                         if (dev->children[i] != NULL) {
 334                                 usb_show_tree_graph(dev->children[i], pre);
 335                                 pre[index] = 0;
 336                         }
 337                 }
 338         }
 339 }
 340
 341 /* main routine for the tree command */
 342 void usb_show_tree(struct usb_device *dev)
 343 {
 344         char preamble[32];
 345
 346         memset(preamble, 0, 32);
 347         usb_show_tree_graph(dev, &preamble[0]);
 348 }
 349
 350
 351 /******************************************************************************
 352  * usb boot command intepreter. Derived from diskboot
 353  */
 354 #ifdef CONFIG_USB_STORAGE
 355 int do_usbboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 356 {
 357         char *boot_device = NULL;
 358         char *ep;
 359         int dev, part = 1;
 360         ulong addr, cnt;
 361         disk_partition_t info;
 362         image_header_t *hdr;
 363         block_dev_desc_t *stor_dev;
 364 #if defined(CONFIG_FIT)
 365         const void *fit_hdr = NULL;
 366 #endif
 367
 368         switch (argc) {
 369         case 1:
 370                 addr = CONFIG_SYS_LOAD_ADDR;
 371                 boot_device = getenv("bootdevice");
 372                 break;
 373         case 2:
 374                 addr = simple_strtoul(argv[1], NULL, 16);
 375                 boot_device = getenv("bootdevice");
 376                 break;
 377         case 3:
 378                 addr = simple_strtoul(argv[1], NULL, 16);
 379                 boot_device = argv[2];
 380                 break;
 381         default:
 382                 return cmd_usage(cmdtp);
 383         }
 384
 385         if (!boot_device) {
 386                 puts("\n** No boot device **\n");
 387                 return 1;
 388         }
 389
 390         dev = simple_strtoul(boot_device, &ep, 16);
 391         stor_dev = usb_stor_get_dev(dev);
 392         if (stor_dev == NULL || stor_dev->type == DEV_TYPE_UNKNOWN) {
 393                 printf("\n** Device %d not available\n", dev);
 394                 return 1;
 395         }
 396         if (stor_dev->block_read == NULL) {
 397                 printf("storage device not initialized. Use usb scan\n");
 398                 return 1;
 399         }
 400         if (*ep) {
 401                 if (*ep != ':') {
 402                         puts("\n** Invalid boot device, use `dev[:part]' **\n");
 403                         return 1;
 404                 }
 405                 part = simple_strtoul(++ep, NULL, 16);
 406         }
 407
 408         if (get_partition_info(stor_dev, part, &info)) {
 409                 /* try to boot raw .... */
 410                 strncpy((char *)&info.type[0], BOOT_PART_TYPE,
 411                         sizeof(BOOT_PART_TYPE));
 412                 strncpy((char *)&info.name[0], "Raw", 4);
 413                 info.start = 0;
 414                 info.blksz = 0x200;
 415                 info.size = 2880;
 416                 printf("error reading partinfo...try to boot raw\n");
 417         }
 418         if ((strncmp((char *)info.type, BOOT_PART_TYPE,
 419             sizeof(info.type)) != 0) &&
 420             (strncmp((char *)info.type, BOOT_PART_COMP,
 421             sizeof(info.type)) != 0)) {
 422                 printf("\n** Invalid partition type \"%.32s\""
 423                         " (expect \"" BOOT_PART_TYPE "\")\n",
 424                         info.type);
 425                 return 1;
 426         }
 427         printf("\nLoading from USB device %d, partition %d: "
 428                 "Name: %.32s  Type: %.32s\n",
 429                 dev, part, info.name, info.type);
 430
 431         debug("First Block: %ld,  # of blocks: %ld, Block Size: %ld\n",
 432                 info.start, info.size, info.blksz);
 433
 434         if (stor_dev->block_read(dev, info.start, 1, (ulong *)addr) != 1) {
 435                 printf("** Read error on %d:%d\n", dev, part);
 436                 return 1;
 437         }
 438
 439         switch (genimg_get_format((void *)addr)) {
 440         case IMAGE_FORMAT_LEGACY:
 441                 hdr = (image_header_t *)addr;
 442
 443                 if (!image_check_hcrc(hdr)) {
 444                         puts("\n** Bad Header Checksum **\n");
 445                         return 1;
 446                 }
 447
 448                 image_print_contents(hdr);
 449
 450                 cnt = image_get_image_size(hdr);
 451                 break;
 452 #if defined(CONFIG_FIT)
 453         case IMAGE_FORMAT_FIT:
 454                 fit_hdr = (const void *)addr;
 455                 puts("Fit image detected...\n");
 456
 457                 cnt = fit_get_size(fit_hdr);
 458                 break;
 459 #endif
 460         default:
 461                 puts("** Unknown image type\n");
 462                 return 1;
 463         }
 464
 465         cnt += info.blksz - 1;
 466         cnt /= info.blksz;
 467         cnt -= 1;
 468
 469         if (stor_dev->block_read(dev, info.start+1, cnt,
 470                       (ulong *)(addr+info.blksz)) != cnt) {
 471                 printf("\n** Read error on %d:%d\n", dev, part);
 472                 return 1;
 473         }
 474
 475 #if defined(CONFIG_FIT)
 476         /* This cannot be done earlier, we need complete FIT image in RAM
 477          * first
 478          */
 479         if (genimg_get_format((void *)addr) == IMAGE_FORMAT_FIT) {
 480                 if (!fit_check_format(fit_hdr)) {
 481                         puts("** Bad FIT image format\n");
 482                         return 1;
 483                 }
 484                 fit_print_contents(fit_hdr);
 485         }
 486 #endif
 487
 488         /* Loading ok, update default load address */
 489         load_addr = addr;
 490
 491         flush_cache(addr, (cnt+1)*info.blksz);
 492
 493         return bootm_maybe_autostart(cmdtp, argv[0]);
 494 }
 495 #endif /* CONFIG_USB_STORAGE */
 496
 497
 498 /******************************************************************************
 499  * usb command intepreter
 500  */
 501 int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 502 {
 503
 504         int i;
 505         struct usb_device *dev = NULL;
 506         extern char usb_started;
 507 #ifdef CONFIG_USB_STORAGE
 508         block_dev_desc_t *stor_dev;
 509 #endif
 510
 511         if (argc < 2)
 512                 return cmd_usage(cmdtp);
 513
 514         if ((strncmp(argv[1], "reset", 5) == 0) ||
 515                  (strncmp(argv[1], "start", 5) == 0)) {
 516                 usb_stop();
 517                 printf("(Re)start USB...\n");
 518                 i = usb_init();
 519                 if (i >= 0) {
 520 #ifdef CONFIG_USB_STORAGE
 521                         /* try to recognize storage devices immediately */
 522                         usb_stor_curr_dev = usb_stor_scan(1);
 523 #endif
 524 #ifdef CONFIG_USB_HOST_ETHER
 525                         /* try to recognize ethernet devices immediately */
 526                         usb_ether_curr_dev = usb_host_eth_scan(1);
 527 #endif
 528                 }
 529                 return 0;
 530         }
 531         if (strncmp(argv[1], "stop", 4) == 0) {
 532 #ifdef CONFIG_USB_KEYBOARD
 533                 if (argc == 2) {
 534                         if (usb_kbd_deregister() != 0) {
 535                                 printf("USB not stopped: usbkbd still"
 536                                         " using USB\n");
 537                                 return 1;
 538                         }
 539                 } else {
 540                         /* forced stop, switch console in to serial */
 541                         console_assign(stdin, "serial");
 542                         usb_kbd_deregister();
 543                 }
 544 #endif
 545                 printf("stopping USB..\n");
 546                 usb_stop();
 547                 return 0;
 548         }
 549         if (!usb_started) {
 550                 printf("USB is stopped. Please issue 'usb start' first.\n");
 551                 return 1;
 552         }
 553         if (strncmp(argv[1], "tree", 4) == 0) {
 554                 printf("\nDevice Tree:\n");
 555                 usb_show_tree(usb_get_dev_index(0));
 556                 return 0;
 557         }
 558         if (strncmp(argv[1], "inf", 3) == 0) {
 559                 int d;
 560                 if (argc == 2) {
 561                         for (d = 0; d < USB_MAX_DEVICE; d++) {
 562                                 dev = usb_get_dev_index(d);
 563                                 if (dev == NULL)
 564                                         break;
 565                                 usb_display_desc(dev);
 566                                 usb_display_config(dev);
 567                         }
 568                         return 0;
 569                 } else {
 570                         int d;
 571
 572                         i = simple_strtoul(argv[2], NULL, 16);
 573                         printf("config for device %d\n", i);
 574                         for (d = 0; d < USB_MAX_DEVICE; d++) {
 575                                 dev = usb_get_dev_index(d);
 576                                 if (dev == NULL)
 577                                         break;
 578                                 if (dev->devnum == i)
 579                                         break;
 580                         }
 581                         if (dev == NULL) {
 582                                 printf("*** No device available ***\n");
 583                                 return 0;
 584                         } else {
 585                                 usb_display_desc(dev);
 586                                 usb_display_config(dev);
 587                         }
 588                 }
 589                 return 0;
 590         }
 591 #ifdef CONFIG_USB_STORAGE
 592         if (strncmp(argv[1], "stor", 4) == 0)
 593                 return usb_stor_info();
 594
 595         if (strncmp(argv[1], "part", 4) == 0) {
 596                 int devno, ok = 0;
 597                 if (argc == 2) {
 598                         for (devno = 0; ; ++devno) {
 599                                 stor_dev = usb_stor_get_dev(devno);
 600                                 if (stor_dev == NULL)
 601                                         break;
 602                                 if (stor_dev->type != DEV_TYPE_UNKNOWN) {
 603                                         ok++;
 604                                         if (devno)
 605                                                 printf("\n");
 606                                         debug("print_part of %x\n", devno);
 607                                         print_part(stor_dev);
 608                                 }
 609                         }
 610                 } else {
 611                         devno = simple_strtoul(argv[2], NULL, 16);
 612                         stor_dev = usb_stor_get_dev(devno);
 613                         if (stor_dev != NULL &&
 614                             stor_dev->type != DEV_TYPE_UNKNOWN) {
 615                                 ok++;
 616                                 debug("print_part of %x\n", devno);
 617                                 print_part(stor_dev);
 618                         }
 619                 }
 620                 if (!ok) {
 621                         printf("\nno USB devices available\n");
 622                         return 1;
 623                 }
 624                 return 0;
 625         }
 626         if (strcmp(argv[1], "read") == 0) {
 627                 if (usb_stor_curr_dev < 0) {
 628                         printf("no current device selected\n");
 629                         return 1;
 630                 }
 631                 if (argc == 5) {
 632                         unsigned long addr = simple_strtoul(argv[2], NULL, 16);
 633                         unsigned long blk  = simple_strtoul(argv[3], NULL, 16);
 634                         unsigned long cnt  = simple_strtoul(argv[4], NULL, 16);
 635                         unsigned long n;
 636                         printf("\nUSB read: device %d block # %ld, count %ld"
 637                                 " ... ", usb_stor_curr_dev, blk, cnt);
 638                         stor_dev = usb_stor_get_dev(usb_stor_curr_dev);
 639                         n = stor_dev->block_read(usb_stor_curr_dev, blk, cnt,
 640                                                  (ulong *)addr);
 641                         printf("%ld blocks read: %s\n", n,
 642                                 (n == cnt) ? "OK" : "ERROR");
 643                         if (n == cnt)
 644                                 return 0;
 645                         return 1;
 646                 }
 647         }
 648         if (strcmp(argv[1], "write") == 0) {
 649                 if (usb_stor_curr_dev < 0) {
 650                         printf("no current device selected\n");
 651                         return 1;
 652                 }
 653                 if (argc == 5) {
 654                         unsigned long addr = simple_strtoul(argv[2], NULL, 16);
 655                         unsigned long blk  = simple_strtoul(argv[3], NULL, 16);
 656                         unsigned long cnt  = simple_strtoul(argv[4], NULL, 16);
 657                         unsigned long n;
 658                         printf("\nUSB write: device %d block # %ld, count %ld"
 659                                 " ... ", usb_stor_curr_dev, blk, cnt);
 660                         stor_dev = usb_stor_get_dev(usb_stor_curr_dev);
 661                         n = stor_dev->block_write(usb_stor_curr_dev, blk, cnt,
 662                                                 (ulong *)addr);
 663                         printf("%ld blocks write: %s\n", n,
 664                                 (n == cnt) ? "OK" : "ERROR");
 665                         if (n == cnt)
 666                                 return 0;
 667                         return 1;
 668                 }
 669         }
 670         if (strncmp(argv[1], "dev", 3) == 0) {
 671                 if (argc == 3) {
 672                         int dev = (int)simple_strtoul(argv[2], NULL, 10);
 673                         printf("\nUSB device %d: ", dev);
 674                         stor_dev = usb_stor_get_dev(dev);
 675                         if (stor_dev == NULL) {
 676                                 printf("unknown device\n");
 677                                 return 1;
 678                         }
 679                         printf("\n    Device %d: ", dev);
 680                         dev_print(stor_dev);
 681                         if (stor_dev->type == DEV_TYPE_UNKNOWN)
 682                                 return 1;
 683                         usb_stor_curr_dev = dev;
 684                         printf("... is now current device\n");
 685                         return 0;
 686                 } else {
 687                         printf("\nUSB device %d: ", usb_stor_curr_dev);
 688                         stor_dev = usb_stor_get_dev(usb_stor_curr_dev);
 689                         dev_print(stor_dev);
 690                         if (stor_dev->type == DEV_TYPE_UNKNOWN)
 691                                 return 1;
 692                         return 0;
 693                 }
 694                 return 0;
 695         }
 696 #endif /* CONFIG_USB_STORAGE */
 697         return cmd_usage(cmdtp);
 698 }
 699
 700 #ifdef CONFIG_USB_STORAGE
 701 U_BOOT_CMD(
 702         usb,    5,      1,      do_usb,
 703         "USB sub-system",
 704         "reset - reset (rescan) USB controller\n"
 705         "usb stop [f]  - stop USB [f]=force stop\n"
 706         "usb tree  - show USB device tree\n"
 707         "usb info [dev] - show available USB devices\n"
 708         "usb storage  - show details of USB storage devices\n"
 709         "usb dev [dev] - show or set current USB storage device\n"
 710         "usb part [dev] - print partition table of one or all USB storage"
 711         " devices\n"
 712         "usb read addr blk# cnt - read `cnt' blocks starting at block `blk#'\n"
 713         "    to memory address `addr'\n"
 714         "usb write addr blk# cnt - write `cnt' blocks starting at block `blk#'\n"
 715         "    from memory address `addr'"
 716 );
 717
 718
 719 U_BOOT_CMD(
 720         usbboot,        3,      1,      do_usbboot,
 721         "boot from USB device",
 722         "loadAddr dev:part"
 723 );
 724
 725 #else
 726 U_BOOT_CMD(
 727         usb,    5,      1,      do_usb,
 728         "USB sub-system",
 729         "reset - reset (rescan) USB controller\n"
 730         "usb  tree  - show USB device tree\n"
 731         "usb  info [dev] - show available USB devices"
 732 );
 733 #endif