cmd_usb.c 18.0 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 <asm/unaligned.h>
32
#include <part.h>
W
wdenk 已提交
33 34
#include <usb.h>

W
wdenk 已提交
35
#ifdef CONFIG_USB_STORAGE
36
static int usb_stor_curr_dev = -1; /* current device */
W
wdenk 已提交
37
#endif
38 39 40
#ifdef CONFIG_USB_HOST_ETHER
static int usb_ether_curr_dev = -1; /* current ethernet device */
#endif
W
wdenk 已提交
41

W
wdenk 已提交
42
/* some display routines (info command) */
43
char *usb_get_class_desc(unsigned char dclass)
W
wdenk 已提交
44
{
45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65
	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 已提交
66 67 68
	}
}

69 70
void usb_display_class_sub(unsigned char dclass, unsigned char subclass,
			   unsigned char proto)
W
wdenk 已提交
71
{
72 73 74 75 76 77 78 79 80
	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 已提交
81
			break;
82 83 84 85 86 87 88 89 90 91 92 93 94 95 96
		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 已提交
97 98
			}
			break;
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 135 136 137 138
		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 已提交
139 140
			break;
		default:
141 142 143 144 145 146 147
			printf("reserved");
			break;
		}
		break;
	default:
		printf("%s", usb_get_class_desc(dclass));
		break;
W
wdenk 已提交
148 149 150
	}
}

151
void usb_display_string(struct usb_device *dev, int index)
W
wdenk 已提交
152
{
P
Puneet Saxena 已提交
153 154
	ALLOC_CACHE_ALIGN_BUFFER(char, buffer, 256);

155 156 157
	if (index != 0) {
		if (usb_string(dev, index, &buffer[0], 256) > 0)
			printf("String: \"%s\"", buffer);
W
wdenk 已提交
158 159 160 161 162
	}
}

void usb_display_desc(struct usb_device *dev)
{
163 164
	if (dev->descriptor.bDescriptorType == USB_DT_DEVICE) {
		printf("%d: %s,  USB Revision %x.%x\n", dev->devnum,
T
Tom Rix 已提交
165
		usb_get_class_desc(dev->config.if_desc[0].desc.bInterfaceClass),
166 167 168 169 170 171 172
				   (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 已提交
173 174
		if (dev->descriptor.bDeviceClass) {
			printf(" - Class: ");
175 176 177
			usb_display_class_sub(dev->descriptor.bDeviceClass,
					      dev->descriptor.bDeviceSubClass,
					      dev->descriptor.bDeviceProtocol);
W
wdenk 已提交
178
			printf("\n");
179 180 181
		} else {
			printf(" - Class: (from Interface) %s\n",
			       usb_get_class_desc(
T
Tom Rix 已提交
182
				dev->config.if_desc[0].desc.bInterfaceClass));
W
wdenk 已提交
183
		}
184 185 186 187 188 189 190
		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 已提交
191 192 193 194
	}

}

T
Tom Rix 已提交
195
void usb_display_conf_desc(struct usb_configuration_descriptor *config,
196
			   struct usb_device *dev)
W
wdenk 已提交
197
{
198 199 200 201
	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 " : "",
T
Tom Rix 已提交
202
		config->bMaxPower*2);
W
wdenk 已提交
203 204
	if (config->iConfiguration) {
		printf("   - ");
205
		usb_display_string(dev, config->iConfiguration);
W
wdenk 已提交
206 207 208 209
		printf("\n");
	}
}

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

void usb_display_ep_desc(struct usb_endpoint_descriptor *epdesc)
{
229 230 231 232 233 234 235 236 237 238 239 240 241 242 243
	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 已提交
244
	}
245
	printf(" MaxPacket %d", get_unaligned(&epdesc->wMaxPacketSize));
246 247
	if ((epdesc->bmAttributes & 0x03) == 0x3)
		printf(" Interval %dms", epdesc->bInterval);
W
wdenk 已提交
248 249 250 251 252 253
	printf("\n");
}

/* main routine to diasplay the configs, interfaces and endpoints */
void usb_display_config(struct usb_device *dev)
{
T
Tom Rix 已提交
254 255
	struct usb_config *config;
	struct usb_interface *ifdesc;
W
wdenk 已提交
256
	struct usb_endpoint_descriptor *epdesc;
257 258 259
	int i, ii;

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

272 273 274 275 276 277 278 279 280 281
static inline char *portspeed(int speed)
{
	if (speed == USB_SPEED_HIGH)
		return "480 Mb/s";
	else if (speed == USB_SPEED_LOW)
		return "1.5 Mb/s";
	else
		return "12 Mb/s";
}

W
wdenk 已提交
282
/* shows the device tree recursively */
283
void usb_show_tree_graph(struct usb_device *dev, char *pre)
W
wdenk 已提交
284
{
285
	int i, index;
286
	int has_child, last_child;
W
wdenk 已提交
287

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

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

347 348
	memset(preamble, 0, 32);
	usb_show_tree_graph(dev, &preamble[0]);
W
wdenk 已提交
349 350 351 352 353 354 355
}


/******************************************************************************
 * usb boot command intepreter. Derived from diskboot
 */
#ifdef CONFIG_USB_STORAGE
356
int do_usbboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
W
wdenk 已提交
357 358 359
{
	char *boot_device = NULL;
	char *ep;
360
	int dev, part = 1;
361
	ulong addr, cnt;
W
wdenk 已提交
362 363 364
	disk_partition_t info;
	image_header_t *hdr;
	block_dev_desc_t *stor_dev;
365
#if defined(CONFIG_FIT)
366
	const void *fit_hdr = NULL;
367
#endif
W
wdenk 已提交
368 369 370

	switch (argc) {
	case 1:
371
		addr = CONFIG_SYS_LOAD_ADDR;
372
		boot_device = getenv("bootdevice");
W
wdenk 已提交
373 374 375
		break;
	case 2:
		addr = simple_strtoul(argv[1], NULL, 16);
376
		boot_device = getenv("bootdevice");
W
wdenk 已提交
377 378 379 380 381 382
		break;
	case 3:
		addr = simple_strtoul(argv[1], NULL, 16);
		boot_device = argv[2];
		break;
	default:
383
		return CMD_RET_USAGE;
W
wdenk 已提交
384 385 386
	}

	if (!boot_device) {
387
		puts("\n** No boot device **\n");
W
wdenk 已提交
388 389 390 391
		return 1;
	}

	dev = simple_strtoul(boot_device, &ep, 16);
392
	stor_dev = usb_stor_get_dev(dev);
K
Kim B. Heino 已提交
393
	if (stor_dev == NULL || stor_dev->type == DEV_TYPE_UNKNOWN) {
394
		printf("\n** Device %d not available\n", dev);
W
wdenk 已提交
395 396
		return 1;
	}
397
	if (stor_dev->block_read == NULL) {
W
wdenk 已提交
398 399 400 401 402
		printf("storage device not initialized. Use usb scan\n");
		return 1;
	}
	if (*ep) {
		if (*ep != ':') {
403
			puts("\n** Invalid boot device, use `dev[:part]' **\n");
W
wdenk 已提交
404 405 406 407 408
			return 1;
		}
		part = simple_strtoul(++ep, NULL, 16);
	}

409
	if (get_partition_info(stor_dev, part, &info)) {
W
wdenk 已提交
410
		/* try to boot raw .... */
411 412
		strncpy((char *)&info.type[0], BOOT_PART_TYPE,
			sizeof(BOOT_PART_TYPE));
W
Wolfgang Denk 已提交
413
		strncpy((char *)&info.name[0], "Raw", 4);
414 415 416
		info.start = 0;
		info.blksz = 0x200;
		info.size = 2880;
W
wdenk 已提交
417 418
		printf("error reading partinfo...try to boot raw\n");
	}
419 420 421 422 423
	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 已提交
424 425 426 427
			" (expect \"" BOOT_PART_TYPE "\")\n",
			info.type);
		return 1;
	}
428
	printf("\nLoading from USB device %d, partition %d: "
W
wdenk 已提交
429 430 431
		"Name: %.32s  Type: %.32s\n",
		dev, part, info.name, info.type);

432
	debug("First Block: %ld,  # of blocks: %ld, Block Size: %ld\n",
W
wdenk 已提交
433 434 435
		info.start, info.size, info.blksz);

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

440
	switch (genimg_get_format((void *)addr)) {
441 442
	case IMAGE_FORMAT_LEGACY:
		hdr = (image_header_t *)addr;
W
wdenk 已提交
443

444 445
		if (!image_check_hcrc(hdr)) {
			puts("\n** Bad Header Checksum **\n");
446 447
			return 1;
		}
W
wdenk 已提交
448

449
		image_print_contents(hdr);
450

451
		cnt = image_get_image_size(hdr);
452 453 454
		break;
#if defined(CONFIG_FIT)
	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 461
#endif
	default:
462
		puts("** Unknown image type\n");
463 464 465 466 467 468 469
		return 1;
	}

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

470
	if (stor_dev->block_read(dev, info.start+1, cnt,
W
wdenk 已提交
471
		      (ulong *)(addr+info.blksz)) != cnt) {
472
		printf("\n** Read error on %d:%d\n", dev, part);
W
wdenk 已提交
473 474
		return 1;
	}
475 476

#if defined(CONFIG_FIT)
477 478 479 480 481 482
	/* 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");
483 484
			return 1;
		}
485
		fit_print_contents(fit_hdr);
486
	}
487 488
#endif

W
wdenk 已提交
489 490 491
	/* Loading ok, update default load address */
	load_addr = addr;

492
	flush_cache(addr, (cnt+1)*info.blksz);
W
wdenk 已提交
493

494
	return bootm_maybe_autostart(cmdtp, argv[0]);
W
wdenk 已提交
495 496 497 498
}
#endif /* CONFIG_USB_STORAGE */


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

	int i;
	struct usb_device *dev = NULL;
507
	extern char usb_started;
W
wdenk 已提交
508
#ifdef CONFIG_USB_STORAGE
W
wdenk 已提交
509
	block_dev_desc_t *stor_dev;
W
wdenk 已提交
510
#endif
W
wdenk 已提交
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");
W
wdenk 已提交
518 519
		usb_stop();
		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 */
W
Wolfgang Denk 已提交
524
			usb_stor_curr_dev = usb_stor_scan(1);
525
#endif
526 527 528 529 530
#ifdef CONFIG_USB_HOST_ETHER
			/* try to recognize ethernet devices immediately */
			usb_ether_curr_dev = usb_host_eth_scan(1);
#endif
		}
W
wdenk 已提交
531 532
		return 0;
	}
533
	if (strncmp(argv[1], "stop", 4) == 0) {
W
wdenk 已提交
534
#ifdef CONFIG_USB_KEYBOARD
535 536 537 538
		if (argc == 2) {
			if (usb_kbd_deregister() != 0) {
				printf("USB not stopped: usbkbd still"
					" using USB\n");
W
wdenk 已提交
539 540
				return 1;
			}
541 542 543
		} else {
			/* forced stop, switch console in to serial */
			console_assign(stdin, "serial");
W
wdenk 已提交
544 545 546 547 548 549 550
			usb_kbd_deregister();
		}
#endif
		printf("stopping USB..\n");
		usb_stop();
		return 0;
	}
551 552 553 554
	if (!usb_started) {
		printf("USB is stopped. Please issue 'usb start' first.\n");
		return 1;
	}
555
	if (strncmp(argv[1], "tree", 4) == 0) {
W
wdenk 已提交
556 557 558 559
		printf("\nDevice Tree:\n");
		usb_show_tree(usb_get_dev_index(0));
		return 0;
	}
560
	if (strncmp(argv[1], "inf", 3) == 0) {
W
wdenk 已提交
561
		int d;
562 563 564 565
		if (argc == 2) {
			for (d = 0; d < USB_MAX_DEVICE; d++) {
				dev = usb_get_dev_index(d);
				if (dev == NULL)
W
wdenk 已提交
566 567 568 569 570
					break;
				usb_display_desc(dev);
				usb_display_config(dev);
			}
			return 0;
571
		} else {
W
wdenk 已提交
572 573
			int d;

574 575 576 577 578
			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 已提交
579
					break;
580
				if (dev->devnum == i)
W
wdenk 已提交
581 582
					break;
			}
583
			if (dev == NULL) {
584
				printf("*** No device available ***\n");
W
wdenk 已提交
585
				return 0;
586
			} else {
W
wdenk 已提交
587 588 589 590 591 592 593
				usb_display_desc(dev);
				usb_display_config(dev);
			}
		}
		return 0;
	}
#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) {
C
Christian Eggers 已提交
598
		int devno, ok = 0;
599
		if (argc == 2) {
K
Kim B. Heino 已提交
600
			for (devno = 0; ; ++devno) {
601
				stor_dev = usb_stor_get_dev(devno);
K
Kim B. Heino 已提交
602 603
				if (stor_dev == NULL)
					break;
604
				if (stor_dev->type != DEV_TYPE_UNKNOWN) {
C
Christian Eggers 已提交
605 606 607
					ok++;
					if (devno)
						printf("\n");
608
					debug("print_part of %x\n", devno);
C
Christian Eggers 已提交
609 610 611
					print_part(stor_dev);
				}
			}
612 613 614
		} else {
			devno = simple_strtoul(argv[2], NULL, 16);
			stor_dev = usb_stor_get_dev(devno);
K
Kim B. Heino 已提交
615 616
			if (stor_dev != NULL &&
			    stor_dev->type != DEV_TYPE_UNKNOWN) {
W
wdenk 已提交
617
				ok++;
618
				debug("print_part of %x\n", devno);
W
wdenk 已提交
619 620 621 622 623 624 625 626 627
				print_part(stor_dev);
			}
		}
		if (!ok) {
			printf("\nno USB devices available\n");
			return 1;
		}
		return 0;
	}
628 629
	if (strcmp(argv[1], "read") == 0) {
		if (usb_stor_curr_dev < 0) {
W
wdenk 已提交
630 631 632
			printf("no current device selected\n");
			return 1;
		}
633
		if (argc == 5) {
W
wdenk 已提交
634 635 636 637
			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;
638 639 640 641 642 643 644 645
			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 已提交
646 647 648 649
				return 0;
			return 1;
		}
	}
650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671
	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;
		}
	}
672 673
	if (strncmp(argv[1], "dev", 3) == 0) {
		if (argc == 3) {
W
wdenk 已提交
674
			int dev = (int)simple_strtoul(argv[2], NULL, 10);
675
			printf("\nUSB device %d: ", dev);
K
Kim B. Heino 已提交
676 677
			stor_dev = usb_stor_get_dev(dev);
			if (stor_dev == NULL) {
W
wdenk 已提交
678 679 680
				printf("unknown device\n");
				return 1;
			}
681
			printf("\n    Device %d: ", dev);
W
wdenk 已提交
682
			dev_print(stor_dev);
683
			if (stor_dev->type == DEV_TYPE_UNKNOWN)
W
wdenk 已提交
684 685 686 687
				return 1;
			usb_stor_curr_dev = dev;
			printf("... is now current device\n");
			return 0;
688 689 690
		} else {
			printf("\nUSB device %d: ", usb_stor_curr_dev);
			stor_dev = usb_stor_get_dev(usb_stor_curr_dev);
W
wdenk 已提交
691
			dev_print(stor_dev);
692
			if (stor_dev->type == DEV_TYPE_UNKNOWN)
W
wdenk 已提交
693 694 695 696 697 698
				return 1;
			return 0;
		}
		return 0;
	}
#endif /* CONFIG_USB_STORAGE */
699
	return CMD_RET_USAGE;
W
wdenk 已提交
700 701
}

W
wdenk 已提交
702
#ifdef CONFIG_USB_STORAGE
W
wdenk 已提交
703 704
U_BOOT_CMD(
	usb,	5,	1,	do_usb,
P
Peter Tyser 已提交
705
	"USB sub-system",
706 707
	"start - start (scan) USB controller\n"
	"usb reset - reset (rescan) USB controller\n"
708 709
	"usb stop [f] - stop USB [f]=force stop\n"
	"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 714
	"usb part [dev] - print partition table of one or all USB storage"
	" devices\n"
715
	"usb read addr blk# cnt - read `cnt' blocks starting at block `blk#'\n"
716
	"    to memory address `addr'\n"
717 718
	"usb write addr blk# cnt - write `cnt' blocks starting at block `blk#'\n"
	"    from memory address `addr'"
W
wdenk 已提交
719 720 721
);


W
wdenk 已提交
722 723
U_BOOT_CMD(
	usbboot,	3,	1,	do_usbboot,
P
Peter Tyser 已提交
724
	"boot from USB device",
W
Wolfgang Denk 已提交
725
	"loadAddr dev:part"
W
wdenk 已提交
726 727 728
);

#else
W
wdenk 已提交
729 730
U_BOOT_CMD(
	usb,	5,	1,	do_usb,
P
Peter Tyser 已提交
731
	"USB sub-system",
732 733
	"start - start (scan) USB controller\n"
	"usb reset - reset (rescan) USB controller\n"
734 735
	"usb tree - show USB device tree\n"
	"usb info [dev] - show available USB devices"
W
wdenk 已提交
736 737
);
#endif