cmd_usb.c 16.9 KB
Newer Older
W
wdenk 已提交
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29
/*
 * (C) Copyright 2001
 * Denis Peter, MPL AG Switzerland
 *
 * Most of this source has been derived from the Linux USB
 * project.
 *
 * See file CREDITS for list of people who contributed to this
 * project.
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
 * published by the Free Software Foundation; either version 2 of
 * the License, or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 * MA 02111-1307 USA
 *
 */

#include <common.h>
#include <command.h>
W
wdenk 已提交
30
#include <asm/byteorder.h>
31
#include <part.h>
W
wdenk 已提交
32 33
#include <usb.h>

W
wdenk 已提交
34
#ifdef CONFIG_USB_STORAGE
35
static int usb_stor_curr_dev = -1; /* current device */
W
wdenk 已提交
36
#endif
W
wdenk 已提交
37

W
wdenk 已提交
38
/* some display routines (info command) */
39
char *usb_get_class_desc(unsigned char dclass)
W
wdenk 已提交
40
{
41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61
	switch (dclass) {
	case USB_CLASS_PER_INTERFACE:
		return "See Interface";
	case USB_CLASS_AUDIO:
		return "Audio";
	case USB_CLASS_COMM:
		return "Communication";
	case USB_CLASS_HID:
		return "Human Interface";
	case USB_CLASS_PRINTER:
		return "Printer";
	case USB_CLASS_MASS_STORAGE:
		return "Mass Storage";
	case USB_CLASS_HUB:
		return "Hub";
	case USB_CLASS_DATA:
		return "CDC Data";
	case USB_CLASS_VENDOR_SPEC:
		return "Vendor specific";
	default:
		return "";
W
wdenk 已提交
62 63 64
	}
}

65 66
void usb_display_class_sub(unsigned char dclass, unsigned char subclass,
			   unsigned char proto)
W
wdenk 已提交
67
{
68 69 70 71 72 73 74 75 76
	switch (dclass) {
	case USB_CLASS_PER_INTERFACE:
		printf("See Interface");
		break;
	case USB_CLASS_HID:
		printf("Human Interface, Subclass: ");
		switch (subclass) {
		case USB_SUB_HID_NONE:
			printf("None");
W
wdenk 已提交
77
			break;
78 79 80 81 82 83 84 85 86 87 88 89 90 91 92
		case USB_SUB_HID_BOOT:
			printf("Boot ");
			switch (proto) {
			case USB_PROT_HID_NONE:
				printf("None");
				break;
			case USB_PROT_HID_KEYBOARD:
				printf("Keyboard");
				break;
			case USB_PROT_HID_MOUSE:
				printf("Mouse");
				break;
			default:
				printf("reserved");
				break;
W
wdenk 已提交
93 94
			}
			break;
95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134
		default:
			printf("reserved");
			break;
		}
		break;
	case USB_CLASS_MASS_STORAGE:
		printf("Mass Storage, ");
		switch (subclass) {
		case US_SC_RBC:
			printf("RBC ");
			break;
		case US_SC_8020:
			printf("SFF-8020i (ATAPI)");
			break;
		case US_SC_QIC:
			printf("QIC-157 (Tape)");
			break;
		case US_SC_UFI:
			printf("UFI");
			break;
		case US_SC_8070:
			printf("SFF-8070");
			break;
		case US_SC_SCSI:
			printf("Transp. SCSI");
			break;
		default:
			printf("reserved");
			break;
		}
		printf(", ");
		switch (proto) {
		case US_PR_CB:
			printf("Command/Bulk");
			break;
		case US_PR_CBI:
			printf("Command/Bulk/Int");
			break;
		case US_PR_BULK:
			printf("Bulk only");
W
wdenk 已提交
135 136
			break;
		default:
137 138 139 140 141 142 143
			printf("reserved");
			break;
		}
		break;
	default:
		printf("%s", usb_get_class_desc(dclass));
		break;
W
wdenk 已提交
144 145 146
	}
}

147
void usb_display_string(struct usb_device *dev, int index)
W
wdenk 已提交
148 149
{
	char buffer[256];
150 151 152
	if (index != 0) {
		if (usb_string(dev, index, &buffer[0], 256) > 0)
			printf("String: \"%s\"", buffer);
W
wdenk 已提交
153 154 155 156 157
	}
}

void usb_display_desc(struct usb_device *dev)
{
158 159 160 161 162 163 164 165 166 167
	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),
				   (dev->descriptor.bcdUSB>>8) & 0xff,
				   dev->descriptor.bcdUSB & 0xff);

		if (strlen(dev->mf) || strlen(dev->prod) ||
		    strlen(dev->serial))
			printf(" - %s %s %s\n", dev->mf, dev->prod,
				dev->serial);
W
wdenk 已提交
168 169
		if (dev->descriptor.bDeviceClass) {
			printf(" - Class: ");
170 171 172
			usb_display_class_sub(dev->descriptor.bDeviceClass,
					      dev->descriptor.bDeviceSubClass,
					      dev->descriptor.bDeviceProtocol);
W
wdenk 已提交
173
			printf("\n");
174 175 176 177
		} else {
			printf(" - Class: (from Interface) %s\n",
			       usb_get_class_desc(
				dev->config.if_desc[0].bInterfaceClass));
W
wdenk 已提交
178
		}
179 180 181 182 183 184 185
		printf(" - PacketSize: %d  Configurations: %d\n",
			dev->descriptor.bMaxPacketSize0,
			dev->descriptor.bNumConfigurations);
		printf(" - Vendor: 0x%04x  Product 0x%04x Version %d.%d\n",
			dev->descriptor.idVendor, dev->descriptor.idProduct,
			(dev->descriptor.bcdDevice>>8) & 0xff,
			dev->descriptor.bcdDevice & 0xff);
W
wdenk 已提交
186 187 188 189
	}

}

190 191
void usb_display_conf_desc(struct usb_config_descriptor *config,
			   struct usb_device *dev)
W
wdenk 已提交
192
{
193 194 195 196 197
	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);
W
wdenk 已提交
198 199
	if (config->iConfiguration) {
		printf("   - ");
200
		usb_display_string(dev, config->iConfiguration);
W
wdenk 已提交
201 202 203 204
		printf("\n");
	}
}

205 206
void usb_display_if_desc(struct usb_interface_descriptor *ifdesc,
			 struct usb_device *dev)
W
wdenk 已提交
207
{
208 209 210
	printf("     Interface: %d\n", ifdesc->bInterfaceNumber);
	printf("     - Alternate Setting %d, Endpoints: %d\n",
		ifdesc->bAlternateSetting, ifdesc->bNumEndpoints);
W
wdenk 已提交
211
	printf("     - Class ");
212 213
	usb_display_class_sub(ifdesc->bInterfaceClass,
		ifdesc->bInterfaceSubClass, ifdesc->bInterfaceProtocol);
W
wdenk 已提交
214 215 216
	printf("\n");
	if (ifdesc->iInterface) {
		printf("     - ");
217
		usb_display_string(dev, ifdesc->iInterface);
W
wdenk 已提交
218 219 220 221 222 223
		printf("\n");
	}
}

void usb_display_ep_desc(struct usb_endpoint_descriptor *epdesc)
{
224 225 226 227 228 229 230 231 232 233 234 235 236 237 238
	printf("     - Endpoint %d %s ", epdesc->bEndpointAddress & 0xf,
		(epdesc->bEndpointAddress & 0x80) ? "In" : "Out");
	switch ((epdesc->bmAttributes & 0x03)) {
	case 0:
		printf("Control");
		break;
	case 1:
		printf("Isochronous");
		break;
	case 2:
		printf("Bulk");
		break;
	case 3:
		printf("Interrupt");
		break;
W
wdenk 已提交
239
	}
240 241 242
	printf(" MaxPacket %d", epdesc->wMaxPacketSize);
	if ((epdesc->bmAttributes & 0x03) == 0x3)
		printf(" Interval %dms", epdesc->bInterval);
W
wdenk 已提交
243 244 245 246 247 248 249 250 251
	printf("\n");
}

/* 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_endpoint_descriptor *epdesc;
252 253 254 255 256 257 258 259 260
	int i, ii;

	config = &dev->config;
	usb_display_conf_desc(config, dev);
	for (i = 0; i < config->no_of_if; i++) {
		ifdesc = &config->if_desc[i];
		usb_display_if_desc(ifdesc, dev);
		for (ii = 0; ii < ifdesc->no_of_ep; ii++) {
			epdesc = &ifdesc->ep_desc[ii];
W
wdenk 已提交
261 262 263 264 265 266 267
			usb_display_ep_desc(epdesc);
		}
	}
	printf("\n");
}

/* shows the device tree recursively */
268
void usb_show_tree_graph(struct usb_device *dev, char *pre)
W
wdenk 已提交
269
{
270 271
	int i, index;
	int has_child, last_child, port;
W
wdenk 已提交
272

273 274
	index = strlen(pre);
	printf(" %s", pre);
W
wdenk 已提交
275
	/* check if the device has connected children */
276 277 278 279
	has_child = 0;
	for (i = 0; i < dev->maxchild; i++) {
		if (dev->children[i] != NULL)
			has_child = 1;
W
wdenk 已提交
280 281
	}
	/* check if we are the last one */
282 283 284
	last_child = 1;
	if (dev->parent != NULL) {
		for (i = 0; i < dev->parent->maxchild; i++) {
W
wdenk 已提交
285
			/* search for children */
286 287 288 289 290 291 292
			if (dev->parent->children[i] == dev) {
				/* found our pointer, see if we have a
				 * little sister
				 */
				port = i;
				while (i++ < dev->parent->maxchild) {
					if (dev->parent->children[i] != NULL) {
W
wdenk 已提交
293
						/* found a sister */
294
						last_child = 0;
W
wdenk 已提交
295 296 297 298 299 300 301
						break;
					} /* if */
				} /* while */
			} /* device found */
		} /* for all children of the parent */
		printf("\b+-");
		/* correct last child */
302 303
		if (last_child)
			pre[index-1] = ' ';
W
wdenk 已提交
304 305 306
	} /* if not root hub */
	else
		printf(" ");
307 308 309 310 311 312
	printf("%d ", dev->devnum);
	pre[index++] = ' ';
	pre[index++] = has_child ? '|' : ' ';
	pre[index] = 0;
	printf(" %s (%s, %dmA)\n", usb_get_class_desc(
					dev->config.if_desc[0].bInterfaceClass),
M
Michael Trimarchi 已提交
313
					dev->speed ? "1.5MBit/s" : "12MBit/s",
314 315 316 317 318 319 320 321 322
					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);
	printf(" %s\n", pre);
	if (dev->maxchild > 0) {
		for (i = 0; i < dev->maxchild; i++) {
			if (dev->children[i] != NULL) {
				usb_show_tree_graph(dev->children[i], pre);
				pre[index] = 0;
W
wdenk 已提交
323 324 325 326 327 328 329 330 331 332
			}
		}
	}
}

/* main routine for the tree command */
void usb_show_tree(struct usb_device *dev)
{
	char preamble[32];

333 334
	memset(preamble, 0, 32);
	usb_show_tree_graph(dev, &preamble[0]);
W
wdenk 已提交
335 336 337 338 339 340 341
}


/******************************************************************************
 * usb boot command intepreter. Derived from diskboot
 */
#ifdef CONFIG_USB_STORAGE
342
int do_usbboot(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
W
wdenk 已提交
343 344 345
{
	char *boot_device = NULL;
	char *ep;
346
	int dev, part = 1, rcode;
347
	ulong addr, cnt;
W
wdenk 已提交
348 349 350
	disk_partition_t info;
	image_header_t *hdr;
	block_dev_desc_t *stor_dev;
351
#if defined(CONFIG_FIT)
352
	const void *fit_hdr = NULL;
353
#endif
W
wdenk 已提交
354 355 356

	switch (argc) {
	case 1:
357
		addr = CONFIG_SYS_LOAD_ADDR;
358
		boot_device = getenv("bootdevice");
W
wdenk 已提交
359 360 361
		break;
	case 2:
		addr = simple_strtoul(argv[1], NULL, 16);
362
		boot_device = getenv("bootdevice");
W
wdenk 已提交
363 364 365 366 367 368
		break;
	case 3:
		addr = simple_strtoul(argv[1], NULL, 16);
		boot_device = argv[2];
		break;
	default:
369
		cmd_usage(cmdtp);
W
wdenk 已提交
370 371 372 373
		return 1;
	}

	if (!boot_device) {
374
		puts("\n** No boot device **\n");
W
wdenk 已提交
375 376 377 378
		return 1;
	}

	dev = simple_strtoul(boot_device, &ep, 16);
379
	stor_dev = usb_stor_get_dev(dev);
W
wdenk 已提交
380
	if (stor_dev->type == DEV_TYPE_UNKNOWN) {
381
		printf("\n** Device %d not available\n", dev);
W
wdenk 已提交
382 383
		return 1;
	}
384
	if (stor_dev->block_read == NULL) {
W
wdenk 已提交
385 386 387 388 389
		printf("storage device not initialized. Use usb scan\n");
		return 1;
	}
	if (*ep) {
		if (*ep != ':') {
390
			puts("\n** Invalid boot device, use `dev[:part]' **\n");
W
wdenk 已提交
391 392 393 394 395
			return 1;
		}
		part = simple_strtoul(++ep, NULL, 16);
	}

396
	if (get_partition_info(stor_dev, part, &info)) {
W
wdenk 已提交
397
		/* try to boot raw .... */
398 399
		strncpy((char *)&info.type[0], BOOT_PART_TYPE,
			sizeof(BOOT_PART_TYPE));
W
Wolfgang Denk 已提交
400
		strncpy((char *)&info.name[0], "Raw", 4);
401 402 403
		info.start = 0;
		info.blksz = 0x200;
		info.size = 2880;
W
wdenk 已提交
404 405
		printf("error reading partinfo...try to boot raw\n");
	}
406 407 408 409 410
	if ((strncmp((char *)info.type, BOOT_PART_TYPE,
	    sizeof(info.type)) != 0) &&
	    (strncmp((char *)info.type, BOOT_PART_COMP,
	    sizeof(info.type)) != 0)) {
		printf("\n** Invalid partition type \"%.32s\""
W
wdenk 已提交
411 412 413 414
			" (expect \"" BOOT_PART_TYPE "\")\n",
			info.type);
		return 1;
	}
415
	printf("\nLoading from USB device %d, partition %d: "
W
wdenk 已提交
416 417 418
		"Name: %.32s  Type: %.32s\n",
		dev, part, info.name, info.type);

419
	debug("First Block: %ld,  # of blocks: %ld, Block Size: %ld\n",
W
wdenk 已提交
420 421 422
		info.start, info.size, info.blksz);

	if (stor_dev->block_read(dev, info.start, 1, (ulong *)addr) != 1) {
423
		printf("** Read error on %d:%d\n", dev, part);
W
wdenk 已提交
424 425 426
		return 1;
	}

427
	switch (genimg_get_format((void *)addr)) {
428 429
	case IMAGE_FORMAT_LEGACY:
		hdr = (image_header_t *)addr;
W
wdenk 已提交
430

431 432
		if (!image_check_hcrc(hdr)) {
			puts("\n** Bad Header Checksum **\n");
433 434
			return 1;
		}
W
wdenk 已提交
435

436
		image_print_contents(hdr);
437

438
		cnt = image_get_image_size(hdr);
439 440 441
		break;
#if defined(CONFIG_FIT)
	case IMAGE_FORMAT_FIT:
442
		fit_hdr = (const void *)addr;
443
		puts("Fit image detected...\n");
444

445
		cnt = fit_get_size(fit_hdr);
446
		break;
447 448
#endif
	default:
449
		puts("** Unknown image type\n");
450 451 452 453 454 455 456
		return 1;
	}

	cnt += info.blksz - 1;
	cnt /= info.blksz;
	cnt -= 1;

457
	if (stor_dev->block_read(dev, info.start+1, cnt,
W
wdenk 已提交
458
		      (ulong *)(addr+info.blksz)) != cnt) {
459
		printf("\n** Read error on %d:%d\n", dev, part);
W
wdenk 已提交
460 461
		return 1;
	}
462 463

#if defined(CONFIG_FIT)
464 465 466 467 468 469
	/* This cannot be done earlier, we need complete FIT image in RAM
	 * first
	 */
	if (genimg_get_format((void *)addr) == IMAGE_FORMAT_FIT) {
		if (!fit_check_format(fit_hdr)) {
			puts("** Bad FIT image format\n");
470 471
			return 1;
		}
472
		fit_print_contents(fit_hdr);
473
	}
474 475
#endif

W
wdenk 已提交
476 477 478
	/* Loading ok, update default load address */
	load_addr = addr;

479
	flush_cache(addr, (cnt+1)*info.blksz);
W
wdenk 已提交
480 481

	/* Check if we should attempt an auto-start */
482
	if (((ep = getenv("autostart")) != NULL) && (strcmp(ep, "yes") == 0)) {
W
wdenk 已提交
483
		char *local_args[2];
484
		extern int do_bootm(cmd_tbl_t *, int, int, char *[]);
W
wdenk 已提交
485 486
		local_args[0] = argv[0];
		local_args[1] = NULL;
487 488
		printf("Automatic boot of image at addr 0x%08lX ...\n", addr);
		rcode = do_bootm(cmdtp, 0, 1, local_args);
W
wdenk 已提交
489 490 491 492 493 494 495
		return rcode;
	}
	return 0;
}
#endif /* CONFIG_USB_STORAGE */


496
/******************************************************************************
W
wdenk 已提交
497 498
 * usb command intepreter
 */
499
int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
W
wdenk 已提交
500 501 502 503
{

	int i;
	struct usb_device *dev = NULL;
504
	extern char usb_started;
W
wdenk 已提交
505
#ifdef CONFIG_USB_STORAGE
W
wdenk 已提交
506
	block_dev_desc_t *stor_dev;
W
wdenk 已提交
507
#endif
W
wdenk 已提交
508

509
	if ((strncmp(argv[1], "reset", 5) == 0) ||
510
		 (strncmp(argv[1], "start", 5) == 0)) {
W
wdenk 已提交
511 512
		usb_stop();
		printf("(Re)start USB...\n");
513 514 515
		i = usb_init();
#ifdef CONFIG_USB_STORAGE
		/* try to recognize storage devices immediately */
W
Wolfgang Denk 已提交
516
		if (i >= 0)
W
Wolfgang Denk 已提交
517
			usb_stor_curr_dev = usb_stor_scan(1);
518
#endif
W
wdenk 已提交
519 520
		return 0;
	}
521
	if (strncmp(argv[1], "stop", 4) == 0) {
W
wdenk 已提交
522
#ifdef CONFIG_USB_KEYBOARD
523 524 525 526
		if (argc == 2) {
			if (usb_kbd_deregister() != 0) {
				printf("USB not stopped: usbkbd still"
					" using USB\n");
W
wdenk 已提交
527 528
				return 1;
			}
529 530 531
		} else {
			/* forced stop, switch console in to serial */
			console_assign(stdin, "serial");
W
wdenk 已提交
532 533 534 535 536 537 538
			usb_kbd_deregister();
		}
#endif
		printf("stopping USB..\n");
		usb_stop();
		return 0;
	}
539 540 541 542
	if (!usb_started) {
		printf("USB is stopped. Please issue 'usb start' first.\n");
		return 1;
	}
543
	if (strncmp(argv[1], "tree", 4) == 0) {
W
wdenk 已提交
544 545 546 547
		printf("\nDevice Tree:\n");
		usb_show_tree(usb_get_dev_index(0));
		return 0;
	}
548
	if (strncmp(argv[1], "inf", 3) == 0) {
W
wdenk 已提交
549
		int d;
550 551 552 553
		if (argc == 2) {
			for (d = 0; d < USB_MAX_DEVICE; d++) {
				dev = usb_get_dev_index(d);
				if (dev == NULL)
W
wdenk 已提交
554 555 556 557 558
					break;
				usb_display_desc(dev);
				usb_display_config(dev);
			}
			return 0;
559
		} else {
W
wdenk 已提交
560 561
			int d;

562 563 564 565 566
			i = simple_strtoul(argv[2], NULL, 16);
			printf("config for device %d\n", i);
			for (d = 0; d < USB_MAX_DEVICE; d++) {
				dev = usb_get_dev_index(d);
				if (dev == NULL)
W
wdenk 已提交
567
					break;
568
				if (dev->devnum == i)
W
wdenk 已提交
569 570
					break;
			}
571
			if (dev == NULL) {
W
wdenk 已提交
572 573
				printf("*** NO Device avaiable ***\n");
				return 0;
574
			} else {
W
wdenk 已提交
575 576 577 578 579 580 581
				usb_display_desc(dev);
				usb_display_config(dev);
			}
		}
		return 0;
	}
#ifdef CONFIG_USB_STORAGE
582
	if (strncmp(argv[1], "stor", 4) == 0)
583
		return usb_stor_info();
584

585
	if (strncmp(argv[1], "part", 4) == 0) {
C
Christian Eggers 已提交
586
		int devno, ok = 0;
587 588 589 590
		if (argc == 2) {
			for (devno = 0; devno < USB_MAX_STOR_DEV; ++devno) {
				stor_dev = usb_stor_get_dev(devno);
				if (stor_dev->type != DEV_TYPE_UNKNOWN) {
C
Christian Eggers 已提交
591 592 593
					ok++;
					if (devno)
						printf("\n");
594
					printf("print_part of %x\n", devno);
C
Christian Eggers 已提交
595 596 597
					print_part(stor_dev);
				}
			}
598 599 600 601
		} else {
			devno = simple_strtoul(argv[2], NULL, 16);
			stor_dev = usb_stor_get_dev(devno);
			if (stor_dev->type != DEV_TYPE_UNKNOWN) {
W
wdenk 已提交
602
				ok++;
603
				printf("print_part of %x\n", devno);
W
wdenk 已提交
604 605 606 607 608 609 610 611 612
				print_part(stor_dev);
			}
		}
		if (!ok) {
			printf("\nno USB devices available\n");
			return 1;
		}
		return 0;
	}
613 614
	if (strcmp(argv[1], "read") == 0) {
		if (usb_stor_curr_dev < 0) {
W
wdenk 已提交
615 616 617
			printf("no current device selected\n");
			return 1;
		}
618
		if (argc == 5) {
W
wdenk 已提交
619 620 621 622
			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;
623 624 625 626 627 628 629 630
			printf("\nUSB read: 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_read(usb_stor_curr_dev, blk, cnt,
						 (ulong *)addr);
			printf("%ld blocks read: %s\n", n,
				(n == cnt) ? "OK" : "ERROR");
			if (n == cnt)
W
wdenk 已提交
631 632 633 634
				return 0;
			return 1;
		}
	}
635 636
	if (strncmp(argv[1], "dev", 3) == 0) {
		if (argc == 3) {
W
wdenk 已提交
637
			int dev = (int)simple_strtoul(argv[2], NULL, 10);
638
			printf("\nUSB device %d: ", dev);
W
wdenk 已提交
639 640 641 642
			if (dev >= USB_MAX_STOR_DEV) {
				printf("unknown device\n");
				return 1;
			}
643 644
			printf("\n    Device %d: ", dev);
			stor_dev = usb_stor_get_dev(dev);
W
wdenk 已提交
645
			dev_print(stor_dev);
646
			if (stor_dev->type == DEV_TYPE_UNKNOWN)
W
wdenk 已提交
647 648 649 650
				return 1;
			usb_stor_curr_dev = dev;
			printf("... is now current device\n");
			return 0;
651 652 653
		} else {
			printf("\nUSB device %d: ", usb_stor_curr_dev);
			stor_dev = usb_stor_get_dev(usb_stor_curr_dev);
W
wdenk 已提交
654
			dev_print(stor_dev);
655
			if (stor_dev->type == DEV_TYPE_UNKNOWN)
W
wdenk 已提交
656 657 658 659 660 661
				return 1;
			return 0;
		}
		return 0;
	}
#endif /* CONFIG_USB_STORAGE */
662
	cmd_usage(cmdtp);
W
wdenk 已提交
663 664 665
	return 1;
}

W
wdenk 已提交
666
#ifdef CONFIG_USB_STORAGE
W
wdenk 已提交
667 668
U_BOOT_CMD(
	usb,	5,	1,	do_usb,
P
Peter Tyser 已提交
669
	"USB sub-system",
W
wdenk 已提交
670
	"reset - reset (rescan) USB controller\n"
671 672 673
	"usb stop [f]  - stop USB [f]=force stop\n"
	"usb tree  - show USB device tree\n"
	"usb info [dev] - show available USB devices\n"
674
	"usb storage  - show details of USB storage devices\n"
675
	"usb dev [dev] - show or set current USB storage device\n"
676 677
	"usb part [dev] - print partition table of one or all USB storage"
	" devices\n"
678 679
	"usb read addr blk# cnt - read `cnt' blocks starting at block `blk#'\n"
	"    to memory address `addr'\n"
W
wdenk 已提交
680 681 682
);


W
wdenk 已提交
683 684
U_BOOT_CMD(
	usbboot,	3,	1,	do_usbboot,
P
Peter Tyser 已提交
685
	"boot from USB device",
W
wdenk 已提交
686 687 688 689
	"loadAddr dev:part\n"
);

#else
W
wdenk 已提交
690 691
U_BOOT_CMD(
	usb,	5,	1,	do_usb,
P
Peter Tyser 已提交
692
	"USB sub-system",
W
wdenk 已提交
693 694 695 696 697
	"reset - reset (rescan) USB controller\n"
	"usb  tree  - show USB device tree\n"
	"usb  info [dev] - show available USB devices\n"
);
#endif