]> git.ipfire.org Git - u-boot.git/blame - common/cmd_usb.c
dm: usb: Adjust usb_alloc_new_device() to return an error
[u-boot.git] / common / cmd_usb.c
CommitLineData
e887afc9
WD
1/*
2 * (C) Copyright 2001
3 * Denis Peter, MPL AG Switzerland
4 *
5 * Most of this source has been derived from the Linux USB
6 * project.
7 *
1a459660 8 * SPDX-License-Identifier: GPL-2.0+
e887afc9
WD
9 */
10
11#include <common.h>
12#include <command.h>
414eec35 13#include <asm/byteorder.h>
b2fb47f1 14#include <asm/unaligned.h>
735dd97b 15#include <part.h>
e887afc9 16#include <usb.h>
e887afc9 17
1968e615 18#ifdef CONFIG_USB_STORAGE
d0ff51ba 19static int usb_stor_curr_dev = -1; /* current device */
1968e615 20#endif
89d48367
SG
21#ifdef CONFIG_USB_HOST_ETHER
22static int usb_ether_curr_dev = -1; /* current ethernet device */
23#endif
e887afc9 24
a2663ea4 25/* some display routines (info command) */
088f1b19 26static char *usb_get_class_desc(unsigned char dclass)
e887afc9 27{
de39f8c1
MT
28 switch (dclass) {
29 case USB_CLASS_PER_INTERFACE:
30 return "See Interface";
31 case USB_CLASS_AUDIO:
32 return "Audio";
33 case USB_CLASS_COMM:
34 return "Communication";
35 case USB_CLASS_HID:
36 return "Human Interface";
37 case USB_CLASS_PRINTER:
38 return "Printer";
39 case USB_CLASS_MASS_STORAGE:
40 return "Mass Storage";
41 case USB_CLASS_HUB:
42 return "Hub";
43 case USB_CLASS_DATA:
44 return "CDC Data";
45 case USB_CLASS_VENDOR_SPEC:
46 return "Vendor specific";
47 default:
48 return "";
e887afc9
WD
49 }
50}
51
088f1b19
KP
52static void usb_display_class_sub(unsigned char dclass, unsigned char subclass,
53 unsigned char proto)
e887afc9 54{
de39f8c1
MT
55 switch (dclass) {
56 case USB_CLASS_PER_INTERFACE:
57 printf("See Interface");
58 break;
59 case USB_CLASS_HID:
60 printf("Human Interface, Subclass: ");
61 switch (subclass) {
62 case USB_SUB_HID_NONE:
63 printf("None");
e887afc9 64 break;
de39f8c1
MT
65 case USB_SUB_HID_BOOT:
66 printf("Boot ");
67 switch (proto) {
68 case USB_PROT_HID_NONE:
69 printf("None");
70 break;
71 case USB_PROT_HID_KEYBOARD:
72 printf("Keyboard");
73 break;
74 case USB_PROT_HID_MOUSE:
75 printf("Mouse");
76 break;
77 default:
78 printf("reserved");
79 break;
e887afc9
WD
80 }
81 break;
de39f8c1
MT
82 default:
83 printf("reserved");
84 break;
85 }
86 break;
87 case USB_CLASS_MASS_STORAGE:
88 printf("Mass Storage, ");
89 switch (subclass) {
90 case US_SC_RBC:
91 printf("RBC ");
92 break;
93 case US_SC_8020:
94 printf("SFF-8020i (ATAPI)");
95 break;
96 case US_SC_QIC:
97 printf("QIC-157 (Tape)");
98 break;
99 case US_SC_UFI:
100 printf("UFI");
101 break;
102 case US_SC_8070:
103 printf("SFF-8070");
104 break;
105 case US_SC_SCSI:
106 printf("Transp. SCSI");
107 break;
108 default:
109 printf("reserved");
110 break;
111 }
112 printf(", ");
113 switch (proto) {
114 case US_PR_CB:
115 printf("Command/Bulk");
116 break;
117 case US_PR_CBI:
118 printf("Command/Bulk/Int");
119 break;
120 case US_PR_BULK:
121 printf("Bulk only");
e887afc9
WD
122 break;
123 default:
de39f8c1
MT
124 printf("reserved");
125 break;
126 }
127 break;
128 default:
129 printf("%s", usb_get_class_desc(dclass));
130 break;
e887afc9
WD
131 }
132}
133
088f1b19 134static void usb_display_string(struct usb_device *dev, int index)
e887afc9 135{
f5766139
PS
136 ALLOC_CACHE_ALIGN_BUFFER(char, buffer, 256);
137
de39f8c1
MT
138 if (index != 0) {
139 if (usb_string(dev, index, &buffer[0], 256) > 0)
140 printf("String: \"%s\"", buffer);
e887afc9
WD
141 }
142}
143
088f1b19 144static void usb_display_desc(struct usb_device *dev)
e887afc9 145{
de39f8c1
MT
146 if (dev->descriptor.bDescriptorType == USB_DT_DEVICE) {
147 printf("%d: %s, USB Revision %x.%x\n", dev->devnum,
8f8bd565 148 usb_get_class_desc(dev->config.if_desc[0].desc.bInterfaceClass),
de39f8c1
MT
149 (dev->descriptor.bcdUSB>>8) & 0xff,
150 dev->descriptor.bcdUSB & 0xff);
151
152 if (strlen(dev->mf) || strlen(dev->prod) ||
153 strlen(dev->serial))
154 printf(" - %s %s %s\n", dev->mf, dev->prod,
155 dev->serial);
e887afc9
WD
156 if (dev->descriptor.bDeviceClass) {
157 printf(" - Class: ");
de39f8c1
MT
158 usb_display_class_sub(dev->descriptor.bDeviceClass,
159 dev->descriptor.bDeviceSubClass,
160 dev->descriptor.bDeviceProtocol);
e887afc9 161 printf("\n");
de39f8c1
MT
162 } else {
163 printf(" - Class: (from Interface) %s\n",
164 usb_get_class_desc(
8f8bd565 165 dev->config.if_desc[0].desc.bInterfaceClass));
e887afc9 166 }
de39f8c1
MT
167 printf(" - PacketSize: %d Configurations: %d\n",
168 dev->descriptor.bMaxPacketSize0,
169 dev->descriptor.bNumConfigurations);
170 printf(" - Vendor: 0x%04x Product 0x%04x Version %d.%d\n",
171 dev->descriptor.idVendor, dev->descriptor.idProduct,
172 (dev->descriptor.bcdDevice>>8) & 0xff,
173 dev->descriptor.bcdDevice & 0xff);
e887afc9
WD
174 }
175
176}
177
c60795f4 178static void usb_display_conf_desc(struct usb_config_descriptor *config,
088f1b19 179 struct usb_device *dev)
e887afc9 180{
de39f8c1
MT
181 printf(" Configuration: %d\n", config->bConfigurationValue);
182 printf(" - Interfaces: %d %s%s%dmA\n", config->bNumInterfaces,
183 (config->bmAttributes & 0x40) ? "Self Powered " : "Bus Powered ",
184 (config->bmAttributes & 0x20) ? "Remote Wakeup " : "",
8f8bd565 185 config->bMaxPower*2);
e887afc9
WD
186 if (config->iConfiguration) {
187 printf(" - ");
de39f8c1 188 usb_display_string(dev, config->iConfiguration);
e887afc9
WD
189 printf("\n");
190 }
191}
192
088f1b19
KP
193static void usb_display_if_desc(struct usb_interface_descriptor *ifdesc,
194 struct usb_device *dev)
e887afc9 195{
de39f8c1
MT
196 printf(" Interface: %d\n", ifdesc->bInterfaceNumber);
197 printf(" - Alternate Setting %d, Endpoints: %d\n",
198 ifdesc->bAlternateSetting, ifdesc->bNumEndpoints);
e887afc9 199 printf(" - Class ");
de39f8c1
MT
200 usb_display_class_sub(ifdesc->bInterfaceClass,
201 ifdesc->bInterfaceSubClass, ifdesc->bInterfaceProtocol);
e887afc9
WD
202 printf("\n");
203 if (ifdesc->iInterface) {
204 printf(" - ");
de39f8c1 205 usb_display_string(dev, ifdesc->iInterface);
e887afc9
WD
206 printf("\n");
207 }
208}
209
088f1b19 210static void usb_display_ep_desc(struct usb_endpoint_descriptor *epdesc)
e887afc9 211{
de39f8c1
MT
212 printf(" - Endpoint %d %s ", epdesc->bEndpointAddress & 0xf,
213 (epdesc->bEndpointAddress & 0x80) ? "In" : "Out");
214 switch ((epdesc->bmAttributes & 0x03)) {
215 case 0:
216 printf("Control");
217 break;
218 case 1:
219 printf("Isochronous");
220 break;
221 case 2:
222 printf("Bulk");
223 break;
224 case 3:
225 printf("Interrupt");
226 break;
e887afc9 227 }
b2fb47f1 228 printf(" MaxPacket %d", get_unaligned(&epdesc->wMaxPacketSize));
de39f8c1
MT
229 if ((epdesc->bmAttributes & 0x03) == 0x3)
230 printf(" Interval %dms", epdesc->bInterval);
e887afc9
WD
231 printf("\n");
232}
233
234/* main routine to diasplay the configs, interfaces and endpoints */
088f1b19 235static void usb_display_config(struct usb_device *dev)
e887afc9 236{
8f8bd565
TR
237 struct usb_config *config;
238 struct usb_interface *ifdesc;
e887afc9 239 struct usb_endpoint_descriptor *epdesc;
de39f8c1
MT
240 int i, ii;
241
242 config = &dev->config;
8f8bd565 243 usb_display_conf_desc(&config->desc, dev);
de39f8c1
MT
244 for (i = 0; i < config->no_of_if; i++) {
245 ifdesc = &config->if_desc[i];
8f8bd565 246 usb_display_if_desc(&ifdesc->desc, dev);
de39f8c1
MT
247 for (ii = 0; ii < ifdesc->no_of_ep; ii++) {
248 epdesc = &ifdesc->ep_desc[ii];
e887afc9
WD
249 usb_display_ep_desc(epdesc);
250 }
251 }
252 printf("\n");
253}
254
7d9aa8fd
JW
255static struct usb_device *usb_find_device(int devnum)
256{
cad4291c 257 struct usb_device *udev;
7d9aa8fd
JW
258 int d;
259
260 for (d = 0; d < USB_MAX_DEVICE; d++) {
cad4291c
SG
261 udev = usb_get_dev_index(d);
262 if (udev == NULL)
7d9aa8fd 263 return NULL;
cad4291c
SG
264 if (udev->devnum == devnum)
265 return udev;
7d9aa8fd
JW
266 }
267
268 return NULL;
269}
270
f1c1f540
SR
271static inline char *portspeed(int speed)
272{
6497c667
VG
273 char *speed_str;
274
275 switch (speed) {
276 case USB_SPEED_SUPER:
277 speed_str = "5 Gb/s";
278 break;
279 case USB_SPEED_HIGH:
280 speed_str = "480 Mb/s";
281 break;
282 case USB_SPEED_LOW:
283 speed_str = "1.5 Mb/s";
284 break;
285 default:
286 speed_str = "12 Mb/s";
287 break;
288 }
289
290 return speed_str;
f1c1f540
SR
291}
292
e887afc9 293/* shows the device tree recursively */
088f1b19 294static void usb_show_tree_graph(struct usb_device *dev, char *pre)
e887afc9 295{
de39f8c1 296 int i, index;
10f4dd78 297 int has_child, last_child;
e887afc9 298
de39f8c1
MT
299 index = strlen(pre);
300 printf(" %s", pre);
e887afc9 301 /* check if the device has connected children */
de39f8c1
MT
302 has_child = 0;
303 for (i = 0; i < dev->maxchild; i++) {
304 if (dev->children[i] != NULL)
305 has_child = 1;
e887afc9
WD
306 }
307 /* check if we are the last one */
cad4291c
SG
308 last_child = (dev->parent != NULL);
309 if (last_child) {
de39f8c1 310 for (i = 0; i < dev->parent->maxchild; i++) {
e887afc9 311 /* search for children */
de39f8c1
MT
312 if (dev->parent->children[i] == dev) {
313 /* found our pointer, see if we have a
314 * little sister
315 */
de39f8c1
MT
316 while (i++ < dev->parent->maxchild) {
317 if (dev->parent->children[i] != NULL) {
e887afc9 318 /* found a sister */
de39f8c1 319 last_child = 0;
e887afc9
WD
320 break;
321 } /* if */
322 } /* while */
323 } /* device found */
324 } /* for all children of the parent */
325 printf("\b+-");
326 /* correct last child */
cad4291c 327 if (last_child && index)
de39f8c1 328 pre[index-1] = ' ';
e887afc9
WD
329 } /* if not root hub */
330 else
331 printf(" ");
de39f8c1
MT
332 printf("%d ", dev->devnum);
333 pre[index++] = ' ';
334 pre[index++] = has_child ? '|' : ' ';
335 pre[index] = 0;
336 printf(" %s (%s, %dmA)\n", usb_get_class_desc(
8f8bd565 337 dev->config.if_desc[0].desc.bInterfaceClass),
f1c1f540 338 portspeed(dev->speed),
8f8bd565 339 dev->config.desc.bMaxPower * 2);
de39f8c1
MT
340 if (strlen(dev->mf) || strlen(dev->prod) || strlen(dev->serial))
341 printf(" %s %s %s %s\n", pre, dev->mf, dev->prod, dev->serial);
342 printf(" %s\n", pre);
343 if (dev->maxchild > 0) {
344 for (i = 0; i < dev->maxchild; i++) {
345 if (dev->children[i] != NULL) {
346 usb_show_tree_graph(dev->children[i], pre);
347 pre[index] = 0;
e887afc9
WD
348 }
349 }
350 }
351}
352
353/* main routine for the tree command */
088f1b19 354static void usb_show_tree(struct usb_device *dev)
e887afc9
WD
355{
356 char preamble[32];
357
cad4291c 358 memset(preamble, '\0', sizeof(preamble));
de39f8c1 359 usb_show_tree_graph(dev, &preamble[0]);
e887afc9
WD
360}
361
7d9aa8fd
JW
362static int usb_test(struct usb_device *dev, int port, char* arg)
363{
364 int mode;
365
366 if (port > dev->maxchild) {
367 printf("Device is no hub or does not have %d ports.\n", port);
368 return 1;
369 }
370
371 switch (arg[0]) {
372 case 'J':
373 case 'j':
374 printf("Setting Test_J mode");
375 mode = USB_TEST_MODE_J;
376 break;
377 case 'K':
378 case 'k':
379 printf("Setting Test_K mode");
380 mode = USB_TEST_MODE_K;
381 break;
382 case 'S':
383 case 's':
384 printf("Setting Test_SE0_NAK mode");
385 mode = USB_TEST_MODE_SE0_NAK;
386 break;
387 case 'P':
388 case 'p':
389 printf("Setting Test_Packet mode");
390 mode = USB_TEST_MODE_PACKET;
391 break;
392 case 'F':
393 case 'f':
394 printf("Setting Test_Force_Enable mode");
395 mode = USB_TEST_MODE_FORCE_ENABLE;
396 break;
397 default:
398 printf("Unrecognized test mode: %s\nAvailable modes: "
399 "J, K, S[E0_NAK], P[acket], F[orce_Enable]\n", arg);
400 return 1;
401 }
402
403 if (port)
404 printf(" on downstream facing port %d...\n", port);
405 else
406 printf(" on upstream facing port...\n");
407
408 if (usb_control_msg(dev, usb_sndctrlpipe(dev, 0), USB_REQ_SET_FEATURE,
409 port ? USB_RT_PORT : USB_RECIP_DEVICE,
410 port ? USB_PORT_FEAT_TEST : USB_FEAT_TEST,
411 (mode << 8) | port,
412 NULL, 0, USB_CNTL_TIMEOUT) == -1) {
413 printf("Error during SET_FEATURE.\n");
414 return 1;
415 } else {
416 printf("Test mode successfully set. Use 'usb start' "
417 "to return to normal operation.\n");
418 return 0;
419 }
420}
421
e887afc9 422
e887afc9
WD
423/******************************************************************************
424 * usb boot command intepreter. Derived from diskboot
425 */
426#ifdef CONFIG_USB_STORAGE
088f1b19 427static int do_usbboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
e887afc9 428{
7405a133 429 return common_diskboot(cmdtp, "usb", argc, argv);
e887afc9
WD
430}
431#endif /* CONFIG_USB_STORAGE */
432
8a8a2257 433static int do_usb_stop_keyboard(int force)
6e78c74f
HG
434{
435#ifdef CONFIG_USB_KEYBOARD
8a8a2257 436 if (usb_kbd_deregister(force) != 0) {
6e78c74f
HG
437 printf("USB not stopped: usbkbd still using USB\n");
438 return 1;
439 }
440#endif
441 return 0;
442}
e887afc9 443
b5072264
HG
444static void do_usb_start(void)
445{
446 bootstage_mark_name(BOOTSTAGE_ID_USB_START, "usb_start");
447
448 if (usb_init() < 0)
449 return;
450
451#ifdef CONFIG_USB_STORAGE
452 /* try to recognize storage devices immediately */
453 usb_stor_curr_dev = usb_stor_scan(1);
454#endif
455#ifdef CONFIG_USB_HOST_ETHER
456 /* try to recognize ethernet devices immediately */
457 usb_ether_curr_dev = usb_host_eth_scan(1);
458#endif
459#ifdef CONFIG_USB_KEYBOARD
460 drv_usb_kbd_init();
461#endif
462}
463
de39f8c1 464/******************************************************************************
e887afc9
WD
465 * usb command intepreter
466 */
088f1b19 467static int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
e887afc9 468{
cad4291c 469 struct usb_device *udev = NULL;
e887afc9 470 int i;
e51aae38 471 extern char usb_started;
1968e615 472#ifdef CONFIG_USB_STORAGE
e887afc9 473 block_dev_desc_t *stor_dev;
1968e615 474#endif
e887afc9 475
47e26b1b 476 if (argc < 2)
4c12eeb8 477 return CMD_RET_USAGE;
65d34254 478
b5072264
HG
479 if (strncmp(argv[1], "start", 5) == 0) {
480 if (usb_started)
481 return 0; /* Already started */
482 printf("starting USB...\n");
483 do_usb_start();
484 return 0;
485 }
486
487 if (strncmp(argv[1], "reset", 5) == 0) {
488 printf("resetting USB...\n");
8a8a2257 489 if (do_usb_stop_keyboard(1) != 0)
6e78c74f 490 return 1;
e887afc9 491 usb_stop();
b5072264 492 do_usb_start();
e887afc9
WD
493 return 0;
494 }
de39f8c1 495 if (strncmp(argv[1], "stop", 4) == 0) {
6e78c74f 496 if (argc != 2)
de39f8c1 497 console_assign(stdin, "serial");
8a8a2257 498 if (do_usb_stop_keyboard(0) != 0)
6e78c74f 499 return 1;
e887afc9
WD
500 printf("stopping USB..\n");
501 usb_stop();
502 return 0;
503 }
e51aae38
BS
504 if (!usb_started) {
505 printf("USB is stopped. Please issue 'usb start' first.\n");
506 return 1;
507 }
de39f8c1 508 if (strncmp(argv[1], "tree", 4) == 0) {
93c2582f
LS
509 puts("USB device tree:\n");
510 for (i = 0; i < USB_MAX_DEVICE; i++) {
cad4291c
SG
511 udev = usb_get_dev_index(i);
512 if (udev == NULL)
93c2582f 513 break;
cad4291c
SG
514 if (udev->parent == NULL)
515 usb_show_tree(udev);
93c2582f 516 }
e887afc9
WD
517 return 0;
518 }
de39f8c1 519 if (strncmp(argv[1], "inf", 3) == 0) {
e887afc9 520 int d;
de39f8c1
MT
521 if (argc == 2) {
522 for (d = 0; d < USB_MAX_DEVICE; d++) {
cad4291c
SG
523 udev = usb_get_dev_index(d);
524 if (udev == NULL)
e887afc9 525 break;
cad4291c
SG
526 usb_display_desc(udev);
527 usb_display_config(udev);
e887afc9
WD
528 }
529 return 0;
de39f8c1 530 } else {
7d9aa8fd 531 i = simple_strtoul(argv[2], NULL, 10);
de39f8c1 532 printf("config for device %d\n", i);
cad4291c
SG
533 udev = usb_find_device(i);
534 if (udev == NULL) {
6052cbab 535 printf("*** No device available ***\n");
e887afc9 536 return 0;
de39f8c1 537 } else {
cad4291c
SG
538 usb_display_desc(udev);
539 usb_display_config(udev);
e887afc9
WD
540 }
541 }
542 return 0;
543 }
7d9aa8fd
JW
544 if (strncmp(argv[1], "test", 4) == 0) {
545 if (argc < 5)
546 return CMD_RET_USAGE;
547 i = simple_strtoul(argv[2], NULL, 10);
cad4291c
SG
548 udev = usb_find_device(i);
549 if (udev == NULL) {
7d9aa8fd
JW
550 printf("Device %d does not exist.\n", i);
551 return 1;
552 }
553 i = simple_strtoul(argv[3], NULL, 10);
cad4291c 554 return usb_test(udev, i, argv[4]);
7d9aa8fd 555 }
e887afc9 556#ifdef CONFIG_USB_STORAGE
de39f8c1 557 if (strncmp(argv[1], "stor", 4) == 0)
f6b44e0e 558 return usb_stor_info();
9c998aa8 559
de39f8c1 560 if (strncmp(argv[1], "part", 4) == 0) {
d4b5f3fa 561 int devno, ok = 0;
de39f8c1 562 if (argc == 2) {
aaad108b 563 for (devno = 0; ; ++devno) {
de39f8c1 564 stor_dev = usb_stor_get_dev(devno);
aaad108b
KH
565 if (stor_dev == NULL)
566 break;
de39f8c1 567 if (stor_dev->type != DEV_TYPE_UNKNOWN) {
d4b5f3fa
CE
568 ok++;
569 if (devno)
570 printf("\n");
060f2853 571 debug("print_part of %x\n", devno);
d4b5f3fa
CE
572 print_part(stor_dev);
573 }
574 }
de39f8c1
MT
575 } else {
576 devno = simple_strtoul(argv[2], NULL, 16);
577 stor_dev = usb_stor_get_dev(devno);
aaad108b
KH
578 if (stor_dev != NULL &&
579 stor_dev->type != DEV_TYPE_UNKNOWN) {
e887afc9 580 ok++;
060f2853 581 debug("print_part of %x\n", devno);
e887afc9
WD
582 print_part(stor_dev);
583 }
584 }
585 if (!ok) {
586 printf("\nno USB devices available\n");
587 return 1;
588 }
589 return 0;
590 }
de39f8c1
MT
591 if (strcmp(argv[1], "read") == 0) {
592 if (usb_stor_curr_dev < 0) {
e887afc9
WD
593 printf("no current device selected\n");
594 return 1;
595 }
de39f8c1 596 if (argc == 5) {
e887afc9
WD
597 unsigned long addr = simple_strtoul(argv[2], NULL, 16);
598 unsigned long blk = simple_strtoul(argv[3], NULL, 16);
599 unsigned long cnt = simple_strtoul(argv[4], NULL, 16);
600 unsigned long n;
de39f8c1
MT
601 printf("\nUSB read: device %d block # %ld, count %ld"
602 " ... ", usb_stor_curr_dev, blk, cnt);
603 stor_dev = usb_stor_get_dev(usb_stor_curr_dev);
604 n = stor_dev->block_read(usb_stor_curr_dev, blk, cnt,
605 (ulong *)addr);
606 printf("%ld blocks read: %s\n", n,
607 (n == cnt) ? "OK" : "ERROR");
608 if (n == cnt)
e887afc9
WD
609 return 0;
610 return 1;
611 }
612 }
127e1084
MJ
613 if (strcmp(argv[1], "write") == 0) {
614 if (usb_stor_curr_dev < 0) {
615 printf("no current device selected\n");
616 return 1;
617 }
618 if (argc == 5) {
619 unsigned long addr = simple_strtoul(argv[2], NULL, 16);
620 unsigned long blk = simple_strtoul(argv[3], NULL, 16);
621 unsigned long cnt = simple_strtoul(argv[4], NULL, 16);
622 unsigned long n;
623 printf("\nUSB write: device %d block # %ld, count %ld"
624 " ... ", usb_stor_curr_dev, blk, cnt);
625 stor_dev = usb_stor_get_dev(usb_stor_curr_dev);
626 n = stor_dev->block_write(usb_stor_curr_dev, blk, cnt,
627 (ulong *)addr);
628 printf("%ld blocks write: %s\n", n,
629 (n == cnt) ? "OK" : "ERROR");
630 if (n == cnt)
631 return 0;
632 return 1;
633 }
634 }
9c998aa8
WD
635 if (strncmp(argv[1], "dev", 3) == 0) {
636 if (argc == 3) {
e887afc9 637 int dev = (int)simple_strtoul(argv[2], NULL, 10);
de39f8c1 638 printf("\nUSB device %d: ", dev);
aaad108b
KH
639 stor_dev = usb_stor_get_dev(dev);
640 if (stor_dev == NULL) {
e887afc9
WD
641 printf("unknown device\n");
642 return 1;
643 }
de39f8c1 644 printf("\n Device %d: ", dev);
e887afc9 645 dev_print(stor_dev);
de39f8c1 646 if (stor_dev->type == DEV_TYPE_UNKNOWN)
e887afc9 647 return 1;
e887afc9
WD
648 usb_stor_curr_dev = dev;
649 printf("... is now current device\n");
650 return 0;
de39f8c1
MT
651 } else {
652 printf("\nUSB device %d: ", usb_stor_curr_dev);
653 stor_dev = usb_stor_get_dev(usb_stor_curr_dev);
e887afc9 654 dev_print(stor_dev);
de39f8c1 655 if (stor_dev->type == DEV_TYPE_UNKNOWN)
e887afc9 656 return 1;
e887afc9
WD
657 return 0;
658 }
659 return 0;
660 }
661#endif /* CONFIG_USB_STORAGE */
4c12eeb8 662 return CMD_RET_USAGE;
e887afc9
WD
663}
664
0d498393
WD
665U_BOOT_CMD(
666 usb, 5, 1, do_usb,
2fb2604d 667 "USB sub-system",
1af9f963
VPP
668 "start - start (scan) USB controller\n"
669 "usb reset - reset (rescan) USB controller\n"
b3813a22
VPP
670 "usb stop [f] - stop USB [f]=force stop\n"
671 "usb tree - show USB device tree\n"
5cf91d6b 672 "usb info [dev] - show available USB devices\n"
7d9aa8fd
JW
673 "usb test [dev] [port] [mode] - set USB 2.0 test mode\n"
674 " (specify port 0 to indicate the device's upstream port)\n"
675 " Available modes: J, K, S[E0_NAK], P[acket], F[orce_Enable]\n"
676#ifdef CONFIG_USB_STORAGE
b3813a22 677 "usb storage - show details of USB storage devices\n"
342717f7 678 "usb dev [dev] - show or set current USB storage device\n"
de39f8c1 679 "usb part [dev] - print partition table of one or all USB storage"
7d9aa8fd 680 " devices\n"
5cf91d6b 681 "usb read addr blk# cnt - read `cnt' blocks starting at block `blk#'\n"
842404ea 682 " to memory address `addr'\n"
127e1084
MJ
683 "usb write addr blk# cnt - write `cnt' blocks starting at block `blk#'\n"
684 " from memory address `addr'"
7d9aa8fd 685#endif /* CONFIG_USB_STORAGE */
8bde7f77
WD
686);
687
688
7d9aa8fd 689#ifdef CONFIG_USB_STORAGE
0d498393
WD
690U_BOOT_CMD(
691 usbboot, 3, 1, do_usbboot,
2fb2604d 692 "boot from USB device",
a89c33db 693 "loadAddr dev:part"
8bde7f77 694);
7d9aa8fd 695#endif /* CONFIG_USB_STORAGE */