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