cmd_usb.c 17.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
	if (dev->descriptor.bDescriptorType == USB_DT_DEVICE) {
		printf("%d: %s,  USB Revision %x.%x\n", dev->devnum,
T
Tom Rix 已提交
160
		usb_get_class_desc(dev->config.if_desc[0].desc.bInterfaceClass),
161 162 163 164 165 166 167
				   (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
		} else {
			printf(" - Class: (from Interface) %s\n",
			       usb_get_class_desc(
T
Tom Rix 已提交
177
				dev->config.if_desc[0].desc.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
	}

}

T
Tom Rix 已提交
190
void usb_display_conf_desc(struct usb_configuration_descriptor *config,
191
			   struct usb_device *dev)
W
wdenk 已提交
192
{
193 194 195 196
	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 已提交
197
		config->bMaxPower*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
	printf("\n");
}

/* main routine to diasplay the configs, interfaces and endpoints */
void usb_display_config(struct usb_device *dev)
{
T
Tom Rix 已提交
249 250
	struct usb_config *config;
	struct usb_interface *ifdesc;
W
wdenk 已提交
251
	struct usb_endpoint_descriptor *epdesc;
252 253 254
	int i, ii;

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

267 268 269 270 271 272 273 274 275 276
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 已提交
277
/* shows the device tree recursively */
278
void usb_show_tree_graph(struct usb_device *dev, char *pre)
W
wdenk 已提交
279
{
280 281
	int i, index;
	int has_child, last_child, port;
W
wdenk 已提交
282

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

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

343 344
	memset(preamble, 0, 32);
	usb_show_tree_graph(dev, &preamble[0]);
W
wdenk 已提交
345 346 347 348 349 350 351
}


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

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

	if (!boot_device) {
383
		puts("\n** No boot device **\n");
W
wdenk 已提交
384 385 386 387
		return 1;
	}

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

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

428
	debug("First Block: %ld,  # of blocks: %ld, Block Size: %ld\n",
W
wdenk 已提交
429 430 431
		info.start, info.size, info.blksz);

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

436
	switch (genimg_get_format((void *)addr)) {
437 438
	case IMAGE_FORMAT_LEGACY:
		hdr = (image_header_t *)addr;
W
wdenk 已提交
439

440 441
		if (!image_check_hcrc(hdr)) {
			puts("\n** Bad Header Checksum **\n");
442 443
			return 1;
		}
W
wdenk 已提交
444

445
		image_print_contents(hdr);
446

447
		cnt = image_get_image_size(hdr);
448 449 450
		break;
#if defined(CONFIG_FIT)
	case IMAGE_FORMAT_FIT:
451
		fit_hdr = (const void *)addr;
452
		puts("Fit image detected...\n");
453

454
		cnt = fit_get_size(fit_hdr);
455
		break;
456 457
#endif
	default:
458
		puts("** Unknown image type\n");
459 460 461 462 463 464 465
		return 1;
	}

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

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

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

W
wdenk 已提交
485 486 487
	/* Loading ok, update default load address */
	load_addr = addr;

488
	flush_cache(addr, (cnt+1)*info.blksz);
W
wdenk 已提交
489 490

	/* Check if we should attempt an auto-start */
491
	if (((ep = getenv("autostart")) != NULL) && (strcmp(ep, "yes") == 0)) {
W
wdenk 已提交
492 493 494
		char *local_args[2];
		local_args[0] = argv[0];
		local_args[1] = NULL;
495 496
		printf("Automatic boot of image at addr 0x%08lX ...\n", addr);
		rcode = do_bootm(cmdtp, 0, 1, local_args);
W
wdenk 已提交
497 498 499 500 501 502 503
		return rcode;
	}
	return 0;
}
#endif /* CONFIG_USB_STORAGE */


504
/******************************************************************************
W
wdenk 已提交
505 506
 * usb command intepreter
 */
507
int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
W
wdenk 已提交
508 509 510 511
{

	int i;
	struct usb_device *dev = NULL;
512
	extern char usb_started;
W
wdenk 已提交
513
#ifdef CONFIG_USB_STORAGE
W
wdenk 已提交
514
	block_dev_desc_t *stor_dev;
W
wdenk 已提交
515
#endif
W
wdenk 已提交
516

517 518
	if (argc < 2)
		return cmd_usage(cmdtp);
519

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

573 574 575 576 577
			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 已提交
578
					break;
579
				if (dev->devnum == i)
W
wdenk 已提交
580 581
					break;
			}
582
			if (dev == NULL) {
W
wdenk 已提交
583 584
				printf("*** NO Device avaiable ***\n");
				return 0;
585
			} else {
W
wdenk 已提交
586 587 588 589 590 591 592
				usb_display_desc(dev);
				usb_display_config(dev);
			}
		}
		return 0;
	}
#ifdef CONFIG_USB_STORAGE
593
	if (strncmp(argv[1], "stor", 4) == 0)
594
		return usb_stor_info();
595

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

W
wdenk 已提交
701
#ifdef CONFIG_USB_STORAGE
W
wdenk 已提交
702 703
U_BOOT_CMD(
	usb,	5,	1,	do_usb,
P
Peter Tyser 已提交
704
	"USB sub-system",
W
wdenk 已提交
705
	"reset - reset (rescan) USB controller\n"
706 707 708
	"usb stop [f]  - stop USB [f]=force stop\n"
	"usb tree  - show USB device tree\n"
	"usb info [dev] - show available USB devices\n"
709
	"usb storage  - show details of USB storage devices\n"
710
	"usb dev [dev] - show or set current USB storage device\n"
711 712
	"usb part [dev] - print partition table of one or all USB storage"
	" devices\n"
713
	"usb read addr blk# cnt - read `cnt' blocks starting at block `blk#'\n"
714
	"    to memory address `addr'\n"
715 716
	"usb write addr blk# cnt - write `cnt' blocks starting at block `blk#'\n"
	"    from memory address `addr'"
W
wdenk 已提交
717 718 719
);


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

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