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 <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 153
{
	char buffer[256];
154 155 156
	if (index != 0) {
		if (usb_string(dev, index, &buffer[0], 256) > 0)
			printf("String: \"%s\"", buffer);
W
wdenk 已提交
157 158 159 160 161
	}
}

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

}

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

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

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

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

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

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

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

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

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


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

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

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

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

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

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

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

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

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

448
		image_print_contents(hdr);
449

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

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

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

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

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

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

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

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


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

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

511 512
	if (argc < 2)
		return cmd_usage(cmdtp);
513

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

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

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

W
wdenk 已提交
700
#ifdef CONFIG_USB_STORAGE
W
wdenk 已提交
701 702
U_BOOT_CMD(
	usb,	5,	1,	do_usb,
P
Peter Tyser 已提交
703
	"USB sub-system",
704 705
	"start - start (scan) USB controller\n"
	"usb reset - reset (rescan) USB controller\n"
706 707
	"usb stop [f] - stop USB [f]=force stop\n"
	"usb tree - show USB device tree\n"
708
	"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",
730 731
	"start - start (scan) USB controller\n"
	"usb reset - reset (rescan) USB controller\n"
732 733
	"usb tree - show USB device tree\n"
	"usb info [dev] - show available USB devices"
W
wdenk 已提交
734 735
);
#endif