cmd_usb.c 16.6 KB
Newer Older
wdenk's avatar
wdenk committed
1 2 3 4 5 6 7
/*
 * (C) Copyright 2001
 * Denis Peter, MPL AG Switzerland
 *
 * Most of this source has been derived from the Linux USB
 * project.
 *
8
 * SPDX-License-Identifier:	GPL-2.0+
wdenk's avatar
wdenk committed
9 10 11 12
 */

#include <common.h>
#include <command.h>
wdenk's avatar
wdenk committed
13
#include <asm/byteorder.h>
14
#include <asm/unaligned.h>
15
#include <part.h>
wdenk's avatar
wdenk committed
16 17
#include <usb.h>

18
#ifdef CONFIG_USB_STORAGE
19
static int usb_stor_curr_dev = -1; /* current device */
20
#endif
21 22 23
#ifdef CONFIG_USB_HOST_ETHER
static int usb_ether_curr_dev = -1; /* current ethernet device */
#endif
wdenk's avatar
wdenk committed
24

25
/* some display routines (info command) */
26
static char *usb_get_class_desc(unsigned char dclass)
wdenk's avatar
wdenk committed
27
{
28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48
	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 "";
wdenk's avatar
wdenk committed
49 50 51
	}
}

52 53
static void usb_display_class_sub(unsigned char dclass, unsigned char subclass,
				  unsigned char proto)
wdenk's avatar
wdenk committed
54
{
55 56 57 58 59 60 61 62 63
	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");
wdenk's avatar
wdenk committed
64
			break;
65 66 67 68 69 70 71 72 73 74 75 76 77 78 79
		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;
wdenk's avatar
wdenk committed
80 81
			}
			break;
82 83 84 85 86 87 88 89 90 91 92 93 94 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
		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");
wdenk's avatar
wdenk committed
122 123
			break;
		default:
124 125 126 127 128 129 130
			printf("reserved");
			break;
		}
		break;
	default:
		printf("%s", usb_get_class_desc(dclass));
		break;
wdenk's avatar
wdenk committed
131 132 133
	}
}

134
static void usb_display_string(struct usb_device *dev, int index)
wdenk's avatar
wdenk committed
135
{
136 137
	ALLOC_CACHE_ALIGN_BUFFER(char, buffer, 256);

138 139 140
	if (index != 0) {
		if (usb_string(dev, index, &buffer[0], 256) > 0)
			printf("String: \"%s\"", buffer);
wdenk's avatar
wdenk committed
141 142 143
	}
}

144
static void usb_display_desc(struct usb_device *dev)
wdenk's avatar
wdenk committed
145
{
146 147
	if (dev->descriptor.bDescriptorType == USB_DT_DEVICE) {
		printf("%d: %s,  USB Revision %x.%x\n", dev->devnum,
148
		usb_get_class_desc(dev->config.if_desc[0].desc.bInterfaceClass),
149 150 151 152 153 154 155
				   (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);
wdenk's avatar
wdenk committed
156 157
		if (dev->descriptor.bDeviceClass) {
			printf(" - Class: ");
158 159 160
			usb_display_class_sub(dev->descriptor.bDeviceClass,
					      dev->descriptor.bDeviceSubClass,
					      dev->descriptor.bDeviceProtocol);
wdenk's avatar
wdenk committed
161
			printf("\n");
162 163 164
		} else {
			printf(" - Class: (from Interface) %s\n",
			       usb_get_class_desc(
165
				dev->config.if_desc[0].desc.bInterfaceClass));
wdenk's avatar
wdenk committed
166
		}
167 168 169 170 171 172 173
		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);
wdenk's avatar
wdenk committed
174 175 176 177
	}

}

178
static void usb_display_conf_desc(struct usb_config_descriptor *config,
179
				  struct usb_device *dev)
wdenk's avatar
wdenk committed
180
{
181 182 183 184
	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 " : "",
185
		config->bMaxPower*2);
wdenk's avatar
wdenk committed
186 187
	if (config->iConfiguration) {
		printf("   - ");
188
		usb_display_string(dev, config->iConfiguration);
wdenk's avatar
wdenk committed
189 190 191 192
		printf("\n");
	}
}

193 194
static void usb_display_if_desc(struct usb_interface_descriptor *ifdesc,
				struct usb_device *dev)
wdenk's avatar
wdenk committed
195
{
196 197 198
	printf("     Interface: %d\n", ifdesc->bInterfaceNumber);
	printf("     - Alternate Setting %d, Endpoints: %d\n",
		ifdesc->bAlternateSetting, ifdesc->bNumEndpoints);
wdenk's avatar
wdenk committed
199
	printf("     - Class ");
200 201
	usb_display_class_sub(ifdesc->bInterfaceClass,
		ifdesc->bInterfaceSubClass, ifdesc->bInterfaceProtocol);
wdenk's avatar
wdenk committed
202 203 204
	printf("\n");
	if (ifdesc->iInterface) {
		printf("     - ");
205
		usb_display_string(dev, ifdesc->iInterface);
wdenk's avatar
wdenk committed
206 207 208 209
		printf("\n");
	}
}

210
static void usb_display_ep_desc(struct usb_endpoint_descriptor *epdesc)
wdenk's avatar
wdenk committed
211
{
212 213 214 215 216 217 218 219 220 221 222 223 224 225 226
	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;
wdenk's avatar
wdenk committed
227
	}
228
	printf(" MaxPacket %d", get_unaligned(&epdesc->wMaxPacketSize));
229 230
	if ((epdesc->bmAttributes & 0x03) == 0x3)
		printf(" Interval %dms", epdesc->bInterval);
wdenk's avatar
wdenk committed
231 232 233 234
	printf("\n");
}

/* main routine to diasplay the configs, interfaces and endpoints */
235
static void usb_display_config(struct usb_device *dev)
wdenk's avatar
wdenk committed
236
{
237 238
	struct usb_config *config;
	struct usb_interface *ifdesc;
wdenk's avatar
wdenk committed
239
	struct usb_endpoint_descriptor *epdesc;
240 241 242
	int i, ii;

	config = &dev->config;
243
	usb_display_conf_desc(&config->desc, dev);
244 245
	for (i = 0; i < config->no_of_if; i++) {
		ifdesc = &config->if_desc[i];
246
		usb_display_if_desc(&ifdesc->desc, dev);
247 248
		for (ii = 0; ii < ifdesc->no_of_ep; ii++) {
			epdesc = &ifdesc->ep_desc[ii];
wdenk's avatar
wdenk committed
249 250 251 252 253 254
			usb_display_ep_desc(epdesc);
		}
	}
	printf("\n");
}

255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270
static struct usb_device *usb_find_device(int devnum)
{
	struct usb_device *dev;
	int d;

	for (d = 0; d < USB_MAX_DEVICE; d++) {
		dev = usb_get_dev_index(d);
		if (dev == NULL)
			return NULL;
		if (dev->devnum == devnum)
			return dev;
	}

	return NULL;
}

271 272
static inline char *portspeed(int speed)
{
273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290
	char *speed_str;

	switch (speed) {
	case USB_SPEED_SUPER:
		speed_str = "5 Gb/s";
		break;
	case USB_SPEED_HIGH:
		speed_str = "480 Mb/s";
		break;
	case USB_SPEED_LOW:
		speed_str = "1.5 Mb/s";
		break;
	default:
		speed_str = "12 Mb/s";
		break;
	}

	return speed_str;
291 292
}

wdenk's avatar
wdenk committed
293
/* shows the device tree recursively */
294
static void usb_show_tree_graph(struct usb_device *dev, char *pre)
wdenk's avatar
wdenk committed
295
{
296
	int i, index;
297
	int has_child, last_child;
wdenk's avatar
wdenk committed
298

299 300
	index = strlen(pre);
	printf(" %s", pre);
wdenk's avatar
wdenk committed
301
	/* check if the device has connected children */
302 303 304 305
	has_child = 0;
	for (i = 0; i < dev->maxchild; i++) {
		if (dev->children[i] != NULL)
			has_child = 1;
wdenk's avatar
wdenk committed
306 307
	}
	/* check if we are the last one */
308 309 310
	last_child = 1;
	if (dev->parent != NULL) {
		for (i = 0; i < dev->parent->maxchild; i++) {
wdenk's avatar
wdenk committed
311
			/* search for children */
312 313 314 315 316 317
			if (dev->parent->children[i] == dev) {
				/* found our pointer, see if we have a
				 * little sister
				 */
				while (i++ < dev->parent->maxchild) {
					if (dev->parent->children[i] != NULL) {
wdenk's avatar
wdenk committed
318
						/* found a sister */
319
						last_child = 0;
wdenk's avatar
wdenk committed
320 321 322 323 324 325 326
						break;
					} /* if */
				} /* while */
			} /* device found */
		} /* for all children of the parent */
		printf("\b+-");
		/* correct last child */
327 328
		if (last_child)
			pre[index-1] = ' ';
wdenk's avatar
wdenk committed
329 330 331
	} /* if not root hub */
	else
		printf(" ");
332 333 334 335 336
	printf("%d ", dev->devnum);
	pre[index++] = ' ';
	pre[index++] = has_child ? '|' : ' ';
	pre[index] = 0;
	printf(" %s (%s, %dmA)\n", usb_get_class_desc(
337
					dev->config.if_desc[0].desc.bInterfaceClass),
338
					portspeed(dev->speed),
339
					dev->config.desc.bMaxPower * 2);
340 341 342 343 344 345 346 347
	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;
wdenk's avatar
wdenk committed
348 349 350 351 352 353
			}
		}
	}
}

/* main routine for the tree command */
354
static void usb_show_tree(struct usb_device *dev)
wdenk's avatar
wdenk committed
355 356 357
{
	char preamble[32];

358 359
	memset(preamble, 0, 32);
	usb_show_tree_graph(dev, &preamble[0]);
wdenk's avatar
wdenk committed
360 361
}

362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421
static int usb_test(struct usb_device *dev, int port, char* arg)
{
	int mode;

	if (port > dev->maxchild) {
		printf("Device is no hub or does not have %d ports.\n", port);
		return 1;
	}

	switch (arg[0]) {
	case 'J':
	case 'j':
		printf("Setting Test_J mode");
		mode = USB_TEST_MODE_J;
		break;
	case 'K':
	case 'k':
		printf("Setting Test_K mode");
		mode = USB_TEST_MODE_K;
		break;
	case 'S':
	case 's':
		printf("Setting Test_SE0_NAK mode");
		mode = USB_TEST_MODE_SE0_NAK;
		break;
	case 'P':
	case 'p':
		printf("Setting Test_Packet mode");
		mode = USB_TEST_MODE_PACKET;
		break;
	case 'F':
	case 'f':
		printf("Setting Test_Force_Enable mode");
		mode = USB_TEST_MODE_FORCE_ENABLE;
		break;
	default:
		printf("Unrecognized test mode: %s\nAvailable modes: "
		       "J, K, S[E0_NAK], P[acket], F[orce_Enable]\n", arg);
		return 1;
	}

	if (port)
		printf(" on downstream facing port %d...\n", port);
	else
		printf(" on upstream facing port...\n");

	if (usb_control_msg(dev, usb_sndctrlpipe(dev, 0), USB_REQ_SET_FEATURE,
			    port ? USB_RT_PORT : USB_RECIP_DEVICE,
			    port ? USB_PORT_FEAT_TEST : USB_FEAT_TEST,
			    (mode << 8) | port,
			    NULL, 0, USB_CNTL_TIMEOUT) == -1) {
		printf("Error during SET_FEATURE.\n");
		return 1;
	} else {
		printf("Test mode successfully set. Use 'usb start' "
		       "to return to normal operation.\n");
		return 0;
	}
}

wdenk's avatar
wdenk committed
422 423 424 425 426

/******************************************************************************
 * usb boot command intepreter. Derived from diskboot
 */
#ifdef CONFIG_USB_STORAGE
427
static int do_usbboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
wdenk's avatar
wdenk committed
428
{
429
	return common_diskboot(cmdtp, "usb", argc, argv);
wdenk's avatar
wdenk committed
430 431 432
}
#endif /* CONFIG_USB_STORAGE */

433
static int do_usb_stop_keyboard(int force)
434 435
{
#ifdef CONFIG_USB_KEYBOARD
436
	if (usb_kbd_deregister(force) != 0) {
437 438 439 440 441 442
		printf("USB not stopped: usbkbd still using USB\n");
		return 1;
	}
#endif
	return 0;
}
wdenk's avatar
wdenk committed
443

444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463
static void do_usb_start(void)
{
	bootstage_mark_name(BOOTSTAGE_ID_USB_START, "usb_start");

	if (usb_init() < 0)
		return;

#ifdef CONFIG_USB_STORAGE
	/* try to recognize storage devices immediately */
	usb_stor_curr_dev = usb_stor_scan(1);
#endif
#ifdef CONFIG_USB_HOST_ETHER
	/* try to recognize ethernet devices immediately */
	usb_ether_curr_dev = usb_host_eth_scan(1);
#endif
#ifdef CONFIG_USB_KEYBOARD
	drv_usb_kbd_init();
#endif
}

464
/******************************************************************************
wdenk's avatar
wdenk committed
465 466
 * usb command intepreter
 */
467
static int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
wdenk's avatar
wdenk committed
468 469 470 471
{

	int i;
	struct usb_device *dev = NULL;
472
	extern char usb_started;
473
#ifdef CONFIG_USB_STORAGE
wdenk's avatar
wdenk committed
474
	block_dev_desc_t *stor_dev;
475
#endif
wdenk's avatar
wdenk committed
476

477
	if (argc < 2)
478
		return CMD_RET_USAGE;
479

480 481 482 483 484 485 486 487 488 489
	if (strncmp(argv[1], "start", 5) == 0) {
		if (usb_started)
			return 0; /* Already started */
		printf("starting USB...\n");
		do_usb_start();
		return 0;
	}

	if (strncmp(argv[1], "reset", 5) == 0) {
		printf("resetting USB...\n");
490
		if (do_usb_stop_keyboard(1) != 0)
491
			return 1;
wdenk's avatar
wdenk committed
492
		usb_stop();
493
		do_usb_start();
wdenk's avatar
wdenk committed
494 495
		return 0;
	}
496
	if (strncmp(argv[1], "stop", 4) == 0) {
497
		if (argc != 2)
498
			console_assign(stdin, "serial");
499
		if (do_usb_stop_keyboard(0) != 0)
500
			return 1;
wdenk's avatar
wdenk committed
501 502 503 504
		printf("stopping USB..\n");
		usb_stop();
		return 0;
	}
505 506 507 508
	if (!usb_started) {
		printf("USB is stopped. Please issue 'usb start' first.\n");
		return 1;
	}
509
	if (strncmp(argv[1], "tree", 4) == 0) {
510 511 512 513 514 515 516 517
		puts("USB device tree:\n");
		for (i = 0; i < USB_MAX_DEVICE; i++) {
			dev = usb_get_dev_index(i);
			if (dev == NULL)
				break;
			if (dev->parent == NULL)
				usb_show_tree(dev);
		}
wdenk's avatar
wdenk committed
518 519
		return 0;
	}
520
	if (strncmp(argv[1], "inf", 3) == 0) {
wdenk's avatar
wdenk committed
521
		int d;
522 523 524 525
		if (argc == 2) {
			for (d = 0; d < USB_MAX_DEVICE; d++) {
				dev = usb_get_dev_index(d);
				if (dev == NULL)
wdenk's avatar
wdenk committed
526 527 528 529 530
					break;
				usb_display_desc(dev);
				usb_display_config(dev);
			}
			return 0;
531
		} else {
532
			i = simple_strtoul(argv[2], NULL, 10);
533
			printf("config for device %d\n", i);
534
			dev = usb_find_device(i);
535
			if (dev == NULL) {
536
				printf("*** No device available ***\n");
wdenk's avatar
wdenk committed
537
				return 0;
538
			} else {
wdenk's avatar
wdenk committed
539 540 541 542 543 544
				usb_display_desc(dev);
				usb_display_config(dev);
			}
		}
		return 0;
	}
545 546 547 548 549 550 551 552 553 554 555 556
	if (strncmp(argv[1], "test", 4) == 0) {
		if (argc < 5)
			return CMD_RET_USAGE;
		i = simple_strtoul(argv[2], NULL, 10);
		dev = usb_find_device(i);
		if (dev == NULL) {
			printf("Device %d does not exist.\n", i);
			return 1;
		}
		i = simple_strtoul(argv[3], NULL, 10);
		return usb_test(dev, i, argv[4]);
	}
wdenk's avatar
wdenk committed
557
#ifdef CONFIG_USB_STORAGE
558
	if (strncmp(argv[1], "stor", 4) == 0)
559
		return usb_stor_info();
560

561
	if (strncmp(argv[1], "part", 4) == 0) {
562
		int devno, ok = 0;
563
		if (argc == 2) {
Kim B. Heino's avatar
Kim B. Heino committed
564
			for (devno = 0; ; ++devno) {
565
				stor_dev = usb_stor_get_dev(devno);
Kim B. Heino's avatar
Kim B. Heino committed
566 567
				if (stor_dev == NULL)
					break;
568
				if (stor_dev->type != DEV_TYPE_UNKNOWN) {
569 570 571
					ok++;
					if (devno)
						printf("\n");
572
					debug("print_part of %x\n", devno);
573 574 575
					print_part(stor_dev);
				}
			}
576 577 578
		} else {
			devno = simple_strtoul(argv[2], NULL, 16);
			stor_dev = usb_stor_get_dev(devno);
Kim B. Heino's avatar
Kim B. Heino committed
579 580
			if (stor_dev != NULL &&
			    stor_dev->type != DEV_TYPE_UNKNOWN) {
wdenk's avatar
wdenk committed
581
				ok++;
582
				debug("print_part of %x\n", devno);
wdenk's avatar
wdenk committed
583 584 585 586 587 588 589 590 591
				print_part(stor_dev);
			}
		}
		if (!ok) {
			printf("\nno USB devices available\n");
			return 1;
		}
		return 0;
	}
592 593
	if (strcmp(argv[1], "read") == 0) {
		if (usb_stor_curr_dev < 0) {
wdenk's avatar
wdenk committed
594 595 596
			printf("no current device selected\n");
			return 1;
		}
597
		if (argc == 5) {
wdenk's avatar
wdenk committed
598 599 600 601
			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;
602 603 604 605 606 607 608 609
			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)
wdenk's avatar
wdenk committed
610 611 612 613
				return 0;
			return 1;
		}
	}
614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635
	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;
		}
	}
636 637
	if (strncmp(argv[1], "dev", 3) == 0) {
		if (argc == 3) {
wdenk's avatar
wdenk committed
638
			int dev = (int)simple_strtoul(argv[2], NULL, 10);
639
			printf("\nUSB device %d: ", dev);
Kim B. Heino's avatar
Kim B. Heino committed
640 641
			stor_dev = usb_stor_get_dev(dev);
			if (stor_dev == NULL) {
wdenk's avatar
wdenk committed
642 643 644
				printf("unknown device\n");
				return 1;
			}
645
			printf("\n    Device %d: ", dev);
wdenk's avatar
wdenk committed
646
			dev_print(stor_dev);
647
			if (stor_dev->type == DEV_TYPE_UNKNOWN)
wdenk's avatar
wdenk committed
648 649 650 651
				return 1;
			usb_stor_curr_dev = dev;
			printf("... is now current device\n");
			return 0;
652 653 654
		} else {
			printf("\nUSB device %d: ", usb_stor_curr_dev);
			stor_dev = usb_stor_get_dev(usb_stor_curr_dev);
wdenk's avatar
wdenk committed
655
			dev_print(stor_dev);
656
			if (stor_dev->type == DEV_TYPE_UNKNOWN)
wdenk's avatar
wdenk committed
657 658 659 660 661 662
				return 1;
			return 0;
		}
		return 0;
	}
#endif /* CONFIG_USB_STORAGE */
663
	return CMD_RET_USAGE;
wdenk's avatar
wdenk committed
664 665
}

666 667
U_BOOT_CMD(
	usb,	5,	1,	do_usb,
Peter Tyser's avatar
Peter Tyser committed
668
	"USB sub-system",
669 670
	"start - start (scan) USB controller\n"
	"usb reset - reset (rescan) USB controller\n"
671 672
	"usb stop [f] - stop USB [f]=force stop\n"
	"usb tree - show USB device tree\n"
673
	"usb info [dev] - show available USB devices\n"
674 675 676 677
	"usb test [dev] [port] [mode] - set USB 2.0 test mode\n"
	"    (specify port 0 to indicate the device's upstream port)\n"
	"    Available modes: J, K, S[E0_NAK], P[acket], F[orce_Enable]\n"
#ifdef CONFIG_USB_STORAGE
678
	"usb storage - show details of USB storage devices\n"
679
	"usb dev [dev] - show or set current USB storage device\n"
680
	"usb part [dev] - print partition table of one or all USB storage"
681
	"    devices\n"
682
	"usb read addr blk# cnt - read `cnt' blocks starting at block `blk#'\n"
683
	"    to memory address `addr'\n"
684 685
	"usb write addr blk# cnt - write `cnt' blocks starting at block `blk#'\n"
	"    from memory address `addr'"
686
#endif /* CONFIG_USB_STORAGE */
wdenk's avatar
wdenk committed
687 688 689
);


690
#ifdef CONFIG_USB_STORAGE
691 692
U_BOOT_CMD(
	usbboot,	3,	1,	do_usbboot,
Peter Tyser's avatar
Peter Tyser committed
693
	"boot from USB device",
694
	"loadAddr dev:part"
wdenk's avatar
wdenk committed
695
);
696
#endif /* CONFIG_USB_STORAGE */