cmd_usb.c 18 KB
Newer Older
wdenk's avatar
wdenk committed
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>
wdenk's avatar
wdenk committed
30
#include <asm/byteorder.h>
31
#include <asm/unaligned.h>
32
#include <part.h>
wdenk's avatar
wdenk committed
33 34
#include <usb.h>

wdenk's avatar
wdenk committed
35
#ifdef CONFIG_USB_STORAGE
36
static int usb_stor_curr_dev = -1; /* current device */
wdenk's avatar
wdenk committed
37
#endif
38 39 40
#ifdef CONFIG_USB_HOST_ETHER
static int usb_ether_curr_dev = -1; /* current ethernet device */
#endif
wdenk's avatar
wdenk committed
41

wdenk's avatar
wdenk committed
42
/* some display routines (info command) */
43
char *usb_get_class_desc(unsigned char dclass)
wdenk's avatar
wdenk committed
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 "";
wdenk's avatar
wdenk committed
66 67 68
	}
}

69 70
void usb_display_class_sub(unsigned char dclass, unsigned char subclass,
			   unsigned char proto)
wdenk's avatar
wdenk committed
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");
wdenk's avatar
wdenk committed
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;
wdenk's avatar
wdenk committed
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");
wdenk's avatar
wdenk committed
139 140
			break;
		default:
141 142 143 144 145 146 147
			printf("reserved");
			break;
		}
		break;
	default:
		printf("%s", usb_get_class_desc(dclass));
		break;
wdenk's avatar
wdenk committed
148 149 150
	}
}

151
void usb_display_string(struct usb_device *dev, int index)
wdenk's avatar
wdenk committed
152 153
{
	char buffer[256];
154 155 156
	if (index != 0) {
		if (usb_string(dev, index, &buffer[0], 256) > 0)
			printf("String: \"%s\"", buffer);
wdenk's avatar
wdenk committed
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,
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);
wdenk's avatar
wdenk committed
172 173
		if (dev->descriptor.bDeviceClass) {
			printf(" - Class: ");
174 175 176
			usb_display_class_sub(dev->descriptor.bDeviceClass,
					      dev->descriptor.bDeviceSubClass,
					      dev->descriptor.bDeviceProtocol);
wdenk's avatar
wdenk committed
177
			printf("\n");
178 179 180
		} else {
			printf(" - Class: (from Interface) %s\n",
			       usb_get_class_desc(
181
				dev->config.if_desc[0].desc.bInterfaceClass));
wdenk's avatar
wdenk committed
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);
wdenk's avatar
wdenk committed
190 191 192 193
	}

}

194
void usb_display_conf_desc(struct usb_configuration_descriptor *config,
195
			   struct usb_device *dev)
wdenk's avatar
wdenk committed
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 " : "",
201
		config->bMaxPower*2);
wdenk's avatar
wdenk committed
202 203
	if (config->iConfiguration) {
		printf("   - ");
204
		usb_display_string(dev, config->iConfiguration);
wdenk's avatar
wdenk committed
205 206 207 208
		printf("\n");
	}
}

209 210
void usb_display_if_desc(struct usb_interface_descriptor *ifdesc,
			 struct usb_device *dev)
wdenk's avatar
wdenk committed
211
{
212 213 214
	printf("     Interface: %d\n", ifdesc->bInterfaceNumber);
	printf("     - Alternate Setting %d, Endpoints: %d\n",
		ifdesc->bAlternateSetting, ifdesc->bNumEndpoints);
wdenk's avatar
wdenk committed
215
	printf("     - Class ");
216 217
	usb_display_class_sub(ifdesc->bInterfaceClass,
		ifdesc->bInterfaceSubClass, ifdesc->bInterfaceProtocol);
wdenk's avatar
wdenk committed
218 219 220
	printf("\n");
	if (ifdesc->iInterface) {
		printf("     - ");
221
		usb_display_string(dev, ifdesc->iInterface);
wdenk's avatar
wdenk committed
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;
wdenk's avatar
wdenk committed
243
	}
244
	printf(" MaxPacket %d", get_unaligned(&epdesc->wMaxPacketSize));
245 246
	if ((epdesc->bmAttributes & 0x03) == 0x3)
		printf(" Interval %dms", epdesc->bInterval);
wdenk's avatar
wdenk committed
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)
{
253 254
	struct usb_config *config;
	struct usb_interface *ifdesc;
wdenk's avatar
wdenk committed
255
	struct usb_endpoint_descriptor *epdesc;
256 257 258
	int i, ii;

	config = &dev->config;
259
	usb_display_conf_desc(&config->desc, dev);
260 261
	for (i = 0; i < config->no_of_if; i++) {
		ifdesc = &config->if_desc[i];
262
		usb_display_if_desc(&ifdesc->desc, dev);
263 264
		for (ii = 0; ii < ifdesc->no_of_ep; ii++) {
			epdesc = &ifdesc->ep_desc[ii];
wdenk's avatar
wdenk committed
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";
}

wdenk's avatar
wdenk committed
281
/* shows the device tree recursively */
282
void usb_show_tree_graph(struct usb_device *dev, char *pre)
wdenk's avatar
wdenk committed
283
{
284
	int i, index;
285
	int has_child, last_child;
wdenk's avatar
wdenk committed
286

287 288
	index = strlen(pre);
	printf(" %s", pre);
wdenk's avatar
wdenk committed
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;
wdenk's avatar
wdenk committed
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++) {
wdenk's avatar
wdenk committed
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) {
wdenk's avatar
wdenk committed
306
						/* found a sister */
307
						last_child = 0;
wdenk's avatar
wdenk committed
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] = ' ';
wdenk's avatar
wdenk committed
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(
325
					dev->config.if_desc[0].desc.bInterfaceClass),
326
					portspeed(dev->speed),
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;
wdenk's avatar
wdenk committed
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]);
wdenk's avatar
wdenk committed
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[])
wdenk's avatar
wdenk committed
356 357 358
{
	char *boot_device = NULL;
	char *ep;
359
	int dev, part = 1;
360
	ulong addr, cnt;
wdenk's avatar
wdenk committed
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
wdenk's avatar
wdenk committed
367 368 369

	switch (argc) {
	case 1:
370
		addr = CONFIG_SYS_LOAD_ADDR;
371
		boot_device = getenv("bootdevice");
wdenk's avatar
wdenk committed
372 373 374
		break;
	case 2:
		addr = simple_strtoul(argv[1], NULL, 16);
375
		boot_device = getenv("bootdevice");
wdenk's avatar
wdenk committed
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_RET_USAGE;
wdenk's avatar
wdenk committed
383 384 385
	}

	if (!boot_device) {
386
		puts("\n** No boot device **\n");
wdenk's avatar
wdenk committed
387 388 389 390
		return 1;
	}

	dev = simple_strtoul(boot_device, &ep, 16);
391
	stor_dev = usb_stor_get_dev(dev);
Kim B. Heino's avatar
Kim B. Heino committed
392
	if (stor_dev == NULL || stor_dev->type == DEV_TYPE_UNKNOWN) {
393
		printf("\n** Device %d not available\n", dev);
wdenk's avatar
wdenk committed
394 395
		return 1;
	}
396
	if (stor_dev->block_read == NULL) {
wdenk's avatar
wdenk committed
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");
wdenk's avatar
wdenk committed
403 404 405 406 407
			return 1;
		}
		part = simple_strtoul(++ep, NULL, 16);
	}

408
	if (get_partition_info(stor_dev, part, &info)) {
wdenk's avatar
wdenk committed
409
		/* try to boot raw .... */
410 411
		strncpy((char *)&info.type[0], BOOT_PART_TYPE,
			sizeof(BOOT_PART_TYPE));
Wolfgang Denk's avatar
Wolfgang Denk committed
412
		strncpy((char *)&info.name[0], "Raw", 4);
413 414 415
		info.start = 0;
		info.blksz = 0x200;
		info.size = 2880;
wdenk's avatar
wdenk committed
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\""
wdenk's avatar
wdenk committed
423 424 425 426
			" (expect \"" BOOT_PART_TYPE "\")\n",
			info.type);
		return 1;
	}
427
	printf("\nLoading from USB device %d, partition %d: "
wdenk's avatar
wdenk committed
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",
wdenk's avatar
wdenk committed
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);
wdenk's avatar
wdenk committed
436 437 438
		return 1;
	}

439
	switch (genimg_get_format((void *)addr)) {
440 441
	case IMAGE_FORMAT_LEGACY:
		hdr = (image_header_t *)addr;
wdenk's avatar
wdenk committed
442

443 444
		if (!image_check_hcrc(hdr)) {
			puts("\n** Bad Header Checksum **\n");
445 446
			return 1;
		}
wdenk's avatar
wdenk committed
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,
wdenk's avatar
wdenk committed
470
		      (ulong *)(addr+info.blksz)) != cnt) {
471
		printf("\n** Read error on %d:%d\n", dev, part);
wdenk's avatar
wdenk committed
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

wdenk's avatar
wdenk committed
488 489 490
	/* Loading ok, update default load address */
	load_addr = addr;

491
	flush_cache(addr, (cnt+1)*info.blksz);
wdenk's avatar
wdenk committed
492

493
	return bootm_maybe_autostart(cmdtp, argv[0]);
wdenk's avatar
wdenk committed
494 495 496 497
}
#endif /* CONFIG_USB_STORAGE */


498
/******************************************************************************
wdenk's avatar
wdenk committed
499 500
 * usb command intepreter
 */
501
int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
wdenk's avatar
wdenk committed
502 503 504 505
{

	int i;
	struct usb_device *dev = NULL;
506
	extern char usb_started;
wdenk's avatar
wdenk committed
507
#ifdef CONFIG_USB_STORAGE
wdenk's avatar
wdenk committed
508
	block_dev_desc_t *stor_dev;
wdenk's avatar
wdenk committed
509
#endif
wdenk's avatar
wdenk committed
510

511
	if (argc < 2)
512
		return CMD_RET_USAGE;
513

514
	if ((strncmp(argv[1], "reset", 5) == 0) ||
515
		 (strncmp(argv[1], "start", 5) == 0)) {
516
		bootstage_mark_name(BOOTSTAGE_ID_USB_START, "usb_start");
wdenk's avatar
wdenk committed
517 518
		usb_stop();
		printf("(Re)start USB...\n");
519
		i = usb_init();
520
		if (i >= 0) {
521
#ifdef CONFIG_USB_STORAGE
522
			/* try to recognize storage devices immediately */
Wolfgang Denk's avatar
Wolfgang Denk committed
523
			usb_stor_curr_dev = usb_stor_scan(1);
524
#endif
525 526 527 528 529
#ifdef CONFIG_USB_HOST_ETHER
			/* try to recognize ethernet devices immediately */
			usb_ether_curr_dev = usb_host_eth_scan(1);
#endif
		}
wdenk's avatar
wdenk committed
530 531
		return 0;
	}
532
	if (strncmp(argv[1], "stop", 4) == 0) {
wdenk's avatar
wdenk committed
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");
wdenk's avatar
wdenk committed
538 539
				return 1;
			}
540 541 542
		} else {
			/* forced stop, switch console in to serial */
			console_assign(stdin, "serial");
wdenk's avatar
wdenk committed
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) {
wdenk's avatar
wdenk committed
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) {
wdenk's avatar
wdenk committed
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)
wdenk's avatar
wdenk committed
565 566 567 568 569
					break;
				usb_display_desc(dev);
				usb_display_config(dev);
			}
			return 0;
570
		} else {
wdenk's avatar
wdenk committed
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)
wdenk's avatar
wdenk committed
578
					break;
579
				if (dev->devnum == i)
wdenk's avatar
wdenk committed
580 581
					break;
			}
582
			if (dev == NULL) {
583
				printf("*** No device available ***\n");
wdenk's avatar
wdenk committed
584
				return 0;
585
			} else {
wdenk's avatar
wdenk committed
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) {
Christian Eggers's avatar
Christian Eggers committed
597
		int devno, ok = 0;
598
		if (argc == 2) {
Kim B. Heino's avatar
Kim B. Heino committed
599
			for (devno = 0; ; ++devno) {
600
				stor_dev = usb_stor_get_dev(devno);
Kim B. Heino's avatar
Kim B. Heino committed
601 602
				if (stor_dev == NULL)
					break;
603
				if (stor_dev->type != DEV_TYPE_UNKNOWN) {
Christian Eggers's avatar
Christian Eggers committed
604 605 606
					ok++;
					if (devno)
						printf("\n");
607
					debug("print_part of %x\n", devno);
Christian Eggers's avatar
Christian Eggers committed
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);
Kim B. Heino's avatar
Kim B. Heino committed
614 615
			if (stor_dev != NULL &&
			    stor_dev->type != DEV_TYPE_UNKNOWN) {
wdenk's avatar
wdenk committed
616
				ok++;
617
				debug("print_part of %x\n", devno);
wdenk's avatar
wdenk committed
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) {
wdenk's avatar
wdenk committed
629 630 631
			printf("no current device selected\n");
			return 1;
		}
632
		if (argc == 5) {
wdenk's avatar
wdenk committed
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)
wdenk's avatar
wdenk committed
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) {
wdenk's avatar
wdenk committed
673
			int dev = (int)simple_strtoul(argv[2], NULL, 10);
674
			printf("\nUSB device %d: ", dev);
Kim B. Heino's avatar
Kim B. Heino committed
675 676
			stor_dev = usb_stor_get_dev(dev);
			if (stor_dev == NULL) {
wdenk's avatar
wdenk committed
677 678 679
				printf("unknown device\n");
				return 1;
			}
680
			printf("\n    Device %d: ", dev);
wdenk's avatar
wdenk committed
681
			dev_print(stor_dev);
682
			if (stor_dev->type == DEV_TYPE_UNKNOWN)
wdenk's avatar
wdenk committed
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);
wdenk's avatar
wdenk committed
690
			dev_print(stor_dev);
691
			if (stor_dev->type == DEV_TYPE_UNKNOWN)
wdenk's avatar
wdenk committed
692 693 694 695 696 697
				return 1;
			return 0;
		}
		return 0;
	}
#endif /* CONFIG_USB_STORAGE */
698
	return CMD_RET_USAGE;
wdenk's avatar
wdenk committed
699 700
}

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


721 722
U_BOOT_CMD(
	usbboot,	3,	1,	do_usbboot,
Peter Tyser's avatar
Peter Tyser committed
723
	"boot from USB device",
Wolfgang Denk's avatar
Wolfgang Denk committed
724
	"loadAddr dev:part"
wdenk's avatar
wdenk committed
725 726 727
);

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