]>
Commit | Line | Data |
---|---|---|
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 | * | |
8 | * See file CREDITS for list of people who contributed to this | |
9 | * project. | |
10 | * | |
11 | * This program is free software; you can redistribute it and/or | |
12 | * modify it under the terms of the GNU General Public License as | |
13 | * published by the Free Software Foundation; either version 2 of | |
14 | * the License, or (at your option) any later version. | |
15 | * | |
16 | * This program is distributed in the hope that it will be useful, | |
17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 | * GNU General Public License for more details. | |
20 | * | |
21 | * You should have received a copy of the GNU General Public License | |
22 | * along with this program; if not, write to the Free Software | |
23 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, | |
24 | * MA 02111-1307 USA | |
25 | * | |
26 | */ | |
27 | ||
28 | #include <common.h> | |
29 | #include <command.h> | |
414eec35 | 30 | #include <asm/byteorder.h> |
e887afc9 WD |
31 | |
32 | #if (CONFIG_COMMANDS & CFG_CMD_USB) | |
33 | ||
34 | #include <usb.h> | |
e887afc9 | 35 | |
1968e615 | 36 | #ifdef CONFIG_USB_STORAGE |
e887afc9 | 37 | static int usb_stor_curr_dev=-1; /* current device */ |
1968e615 | 38 | #endif |
e887afc9 | 39 | |
a2663ea4 | 40 | /* some display routines (info command) */ |
e887afc9 WD |
41 | char * usb_get_class_desc(unsigned char dclass) |
42 | { | |
43 | switch(dclass) { | |
44 | case USB_CLASS_PER_INTERFACE: | |
45 | return("See Interface"); | |
46 | case USB_CLASS_AUDIO: | |
47 | return("Audio"); | |
48 | case USB_CLASS_COMM: | |
49 | return("Communication"); | |
50 | case USB_CLASS_HID: | |
51 | return("Human Interface"); | |
52 | case USB_CLASS_PRINTER: | |
53 | return("Printer"); | |
54 | case USB_CLASS_MASS_STORAGE: | |
55 | return("Mass Storage"); | |
56 | case USB_CLASS_HUB: | |
57 | return("Hub"); | |
58 | case USB_CLASS_DATA: | |
59 | return("CDC Data"); | |
60 | case USB_CLASS_VENDOR_SPEC: | |
61 | return("Vendor specific"); | |
62 | default : | |
63 | return(""); | |
64 | } | |
65 | } | |
66 | ||
67 | void usb_display_class_sub(unsigned char dclass,unsigned char subclass,unsigned char proto) | |
68 | { | |
69 | switch(dclass) { | |
70 | case USB_CLASS_PER_INTERFACE: | |
71 | printf("See Interface"); | |
72 | break; | |
73 | case USB_CLASS_HID: | |
74 | printf("Human Interface, Subclass: "); | |
75 | switch(subclass) { | |
76 | case USB_SUB_HID_NONE: | |
77 | printf("None"); | |
78 | break; | |
79 | case USB_SUB_HID_BOOT: | |
80 | printf("Boot "); | |
81 | switch(proto) { | |
82 | case USB_PROT_HID_NONE: | |
83 | printf("None"); | |
84 | break; | |
85 | case USB_PROT_HID_KEYBOARD: | |
86 | printf("Keyboard"); | |
87 | break; | |
88 | case USB_PROT_HID_MOUSE: | |
89 | printf("Mouse"); | |
90 | break; | |
91 | default: | |
92 | printf("reserved"); | |
93 | } | |
94 | break; | |
95 | default: | |
96 | printf("reserved"); | |
97 | } | |
98 | break; | |
99 | case USB_CLASS_MASS_STORAGE: | |
100 | printf("Mass Storage, "); | |
101 | switch(subclass) { | |
102 | case US_SC_RBC: | |
103 | printf("RBC "); | |
104 | break; | |
105 | case US_SC_8020: | |
106 | printf("SFF-8020i (ATAPI)"); | |
107 | break; | |
108 | case US_SC_QIC: | |
109 | printf("QIC-157 (Tape)"); | |
110 | break; | |
111 | case US_SC_UFI: | |
112 | printf("UFI"); | |
113 | break; | |
114 | case US_SC_8070: | |
115 | printf("SFF-8070"); | |
116 | break; | |
117 | case US_SC_SCSI: | |
118 | printf("Transp. SCSI"); | |
119 | break; | |
120 | default: | |
121 | printf("reserved"); | |
122 | break; | |
123 | } | |
124 | printf(", "); | |
125 | switch(proto) { | |
126 | case US_PR_CB: | |
127 | printf("Command/Bulk"); | |
128 | break; | |
129 | case US_PR_CBI: | |
130 | printf("Command/Bulk/Int"); | |
131 | break; | |
132 | case US_PR_BULK: | |
133 | printf("Bulk only"); | |
134 | break; | |
135 | default: | |
136 | printf("reserved"); | |
137 | } | |
138 | break; | |
139 | default: | |
140 | printf("%s",usb_get_class_desc(dclass)); | |
141 | } | |
142 | } | |
143 | ||
144 | void usb_display_string(struct usb_device *dev,int index) | |
145 | { | |
146 | char buffer[256]; | |
147 | if (index!=0) { | |
148 | if (usb_string(dev,index,&buffer[0],256)>0); | |
149 | printf("String: \"%s\"",buffer); | |
150 | } | |
151 | } | |
152 | ||
153 | void usb_display_desc(struct usb_device *dev) | |
154 | { | |
155 | if (dev->descriptor.bDescriptorType==USB_DT_DEVICE) { | |
156 | printf("%d: %s, USB Revision %x.%x\n",dev->devnum,usb_get_class_desc(dev->config.if_desc[0].bInterfaceClass), | |
157 | (dev->descriptor.bcdUSB>>8) & 0xff,dev->descriptor.bcdUSB & 0xff); | |
158 | if (strlen(dev->mf) || strlen(dev->prod) || strlen(dev->serial)) | |
159 | printf(" - %s %s %s\n",dev->mf,dev->prod,dev->serial); | |
160 | if (dev->descriptor.bDeviceClass) { | |
161 | printf(" - Class: "); | |
162 | usb_display_class_sub(dev->descriptor.bDeviceClass,dev->descriptor.bDeviceSubClass,dev->descriptor.bDeviceProtocol); | |
163 | printf("\n"); | |
164 | } | |
165 | else { | |
166 | printf(" - Class: (from Interface) %s\n",usb_get_class_desc(dev->config.if_desc[0].bInterfaceClass)); | |
167 | } | |
168 | printf(" - PacketSize: %d Configurations: %d\n",dev->descriptor.bMaxPacketSize0,dev->descriptor.bNumConfigurations); | |
169 | 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); | |
170 | } | |
171 | ||
172 | } | |
173 | ||
174 | void usb_display_conf_desc(struct usb_config_descriptor *config,struct usb_device *dev) | |
175 | { | |
176 | printf(" Configuration: %d\n",config->bConfigurationValue); | |
177 | printf(" - Interfaces: %d %s%s%dmA\n",config->bNumInterfaces,(config->bmAttributes & 0x40) ? "Self Powered " : "Bus Powered ", | |
178 | (config->bmAttributes & 0x20) ? "Remote Wakeup " : "",config->MaxPower*2); | |
179 | if (config->iConfiguration) { | |
180 | printf(" - "); | |
181 | usb_display_string(dev,config->iConfiguration); | |
182 | printf("\n"); | |
183 | } | |
184 | } | |
185 | ||
186 | void usb_display_if_desc(struct usb_interface_descriptor *ifdesc,struct usb_device *dev) | |
187 | { | |
188 | printf(" Interface: %d\n",ifdesc->bInterfaceNumber); | |
189 | printf(" - Alternate Settings %d, Endpoints: %d\n",ifdesc->bAlternateSetting,ifdesc->bNumEndpoints); | |
190 | printf(" - Class "); | |
191 | usb_display_class_sub(ifdesc->bInterfaceClass,ifdesc->bInterfaceSubClass,ifdesc->bInterfaceProtocol); | |
192 | printf("\n"); | |
193 | if (ifdesc->iInterface) { | |
194 | printf(" - "); | |
195 | usb_display_string(dev,ifdesc->iInterface); | |
196 | printf("\n"); | |
197 | } | |
198 | } | |
199 | ||
200 | void usb_display_ep_desc(struct usb_endpoint_descriptor *epdesc) | |
201 | { | |
202 | printf(" - Endpoint %d %s ",epdesc->bEndpointAddress & 0xf,(epdesc->bEndpointAddress & 0x80) ? "In" : "Out"); | |
203 | switch((epdesc->bmAttributes & 0x03)) | |
204 | { | |
205 | case 0: printf("Control"); break; | |
206 | case 1: printf("Isochronous"); break; | |
207 | case 2: printf("Bulk"); break; | |
208 | case 3: printf("Interrupt"); break; | |
209 | } | |
210 | printf(" MaxPacket %d",epdesc->wMaxPacketSize); | |
211 | if ((epdesc->bmAttributes & 0x03)==0x3) | |
212 | printf(" Interval %dms",epdesc->bInterval); | |
213 | printf("\n"); | |
214 | } | |
215 | ||
216 | /* main routine to diasplay the configs, interfaces and endpoints */ | |
217 | void usb_display_config(struct usb_device *dev) | |
218 | { | |
219 | struct usb_config_descriptor *config; | |
220 | struct usb_interface_descriptor *ifdesc; | |
221 | struct usb_endpoint_descriptor *epdesc; | |
222 | int i,ii; | |
223 | ||
224 | config= &dev->config; | |
225 | usb_display_conf_desc(config,dev); | |
226 | for(i=0;i<config->no_of_if;i++) { | |
227 | ifdesc= &config->if_desc[i]; | |
228 | usb_display_if_desc(ifdesc,dev); | |
229 | for(ii=0;ii<ifdesc->no_of_ep;ii++) { | |
230 | epdesc= &ifdesc->ep_desc[ii]; | |
231 | usb_display_ep_desc(epdesc); | |
232 | } | |
233 | } | |
234 | printf("\n"); | |
235 | } | |
236 | ||
237 | /* shows the device tree recursively */ | |
238 | void usb_show_tree_graph(struct usb_device *dev,char *pre) | |
239 | { | |
240 | int i,index; | |
241 | int has_child,last_child,port; | |
242 | ||
243 | index=strlen(pre); | |
244 | printf(" %s",pre); | |
245 | /* check if the device has connected children */ | |
246 | has_child=0; | |
247 | for(i=0;i<dev->maxchild;i++) { | |
248 | if (dev->children[i]!=NULL) | |
249 | has_child=1; | |
250 | } | |
251 | /* check if we are the last one */ | |
252 | last_child=1; | |
253 | if (dev->parent!=NULL) { | |
254 | for(i=0;i<dev->parent->maxchild;i++) { | |
255 | /* search for children */ | |
256 | if (dev->parent->children[i]==dev) { | |
257 | /* found our pointer, see if we have a little sister */ | |
258 | port=i; | |
259 | while(i++<dev->parent->maxchild) { | |
260 | if (dev->parent->children[i]!=NULL) { | |
261 | /* found a sister */ | |
262 | last_child=0; | |
263 | break; | |
264 | } /* if */ | |
265 | } /* while */ | |
266 | } /* device found */ | |
267 | } /* for all children of the parent */ | |
268 | printf("\b+-"); | |
269 | /* correct last child */ | |
270 | if (last_child) { | |
271 | pre[index-1]=' '; | |
272 | } | |
273 | } /* if not root hub */ | |
274 | else | |
275 | printf(" "); | |
276 | printf("%d ",dev->devnum); | |
277 | pre[index++]=' '; | |
278 | pre[index++]= has_child ? '|' : ' '; | |
279 | pre[index]=0; | |
280 | printf(" %s (%s, %dmA)\n",usb_get_class_desc(dev->config.if_desc[0].bInterfaceClass), | |
281 | dev->slow ? "1.5MBit/s" : "12MBit/s",dev->config.MaxPower * 2); | |
282 | if (strlen(dev->mf) || | |
283 | strlen(dev->prod) || | |
284 | strlen(dev->serial)) | |
285 | printf(" %s %s %s %s\n",pre,dev->mf,dev->prod,dev->serial); | |
286 | printf(" %s\n",pre); | |
287 | if (dev->maxchild>0) { | |
288 | for(i=0;i<dev->maxchild;i++) { | |
289 | if (dev->children[i]!=NULL) { | |
290 | usb_show_tree_graph(dev->children[i],pre); | |
291 | pre[index]=0; | |
292 | } | |
293 | } | |
294 | } | |
295 | } | |
296 | ||
297 | /* main routine for the tree command */ | |
298 | void usb_show_tree(struct usb_device *dev) | |
299 | { | |
300 | char preamble[32]; | |
301 | ||
302 | memset(preamble,0,32); | |
303 | usb_show_tree_graph(dev,&preamble[0]); | |
304 | } | |
305 | ||
306 | ||
e887afc9 WD |
307 | /****************************************************************************** |
308 | * usb boot command intepreter. Derived from diskboot | |
309 | */ | |
310 | #ifdef CONFIG_USB_STORAGE | |
311 | int do_usbboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) | |
312 | { | |
313 | char *boot_device = NULL; | |
314 | char *ep; | |
2f916943 | 315 | int dev, part=1, rcode; |
1a344f29 | 316 | ulong addr, cnt, checksum; |
e887afc9 WD |
317 | disk_partition_t info; |
318 | image_header_t *hdr; | |
319 | block_dev_desc_t *stor_dev; | |
320 | ||
321 | ||
322 | switch (argc) { | |
323 | case 1: | |
324 | addr = CFG_LOAD_ADDR; | |
325 | boot_device = getenv ("bootdevice"); | |
326 | break; | |
327 | case 2: | |
328 | addr = simple_strtoul(argv[1], NULL, 16); | |
329 | boot_device = getenv ("bootdevice"); | |
330 | break; | |
331 | case 3: | |
332 | addr = simple_strtoul(argv[1], NULL, 16); | |
333 | boot_device = argv[2]; | |
334 | break; | |
335 | default: | |
336 | printf ("Usage:\n%s\n", cmdtp->usage); | |
337 | return 1; | |
338 | } | |
339 | ||
340 | if (!boot_device) { | |
341 | puts ("\n** No boot device **\n"); | |
342 | return 1; | |
343 | } | |
344 | ||
345 | dev = simple_strtoul(boot_device, &ep, 16); | |
346 | stor_dev=usb_stor_get_dev(dev); | |
347 | if (stor_dev->type == DEV_TYPE_UNKNOWN) { | |
348 | printf ("\n** Device %d not available\n", dev); | |
349 | return 1; | |
350 | } | |
351 | if (stor_dev->block_read==NULL) { | |
352 | printf("storage device not initialized. Use usb scan\n"); | |
353 | return 1; | |
354 | } | |
355 | if (*ep) { | |
356 | if (*ep != ':') { | |
357 | puts ("\n** Invalid boot device, use `dev[:part]' **\n"); | |
358 | return 1; | |
359 | } | |
360 | part = simple_strtoul(++ep, NULL, 16); | |
361 | } | |
362 | ||
363 | if (get_partition_info (stor_dev, part, &info)) { | |
364 | /* try to boot raw .... */ | |
77ddac94 WD |
365 | strncpy((char *)&info.type[0], BOOT_PART_TYPE, sizeof(BOOT_PART_TYPE)); |
366 | strncpy((char *)&info.name[0], "Raw", 4); | |
e887afc9 WD |
367 | info.start=0; |
368 | info.blksz=0x200; | |
369 | info.size=2880; | |
370 | printf("error reading partinfo...try to boot raw\n"); | |
371 | } | |
77ddac94 WD |
372 | if ((strncmp((char *)info.type, BOOT_PART_TYPE, sizeof(info.type)) != 0) && |
373 | (strncmp((char *)info.type, BOOT_PART_COMP, sizeof(info.type)) != 0)) { | |
e887afc9 WD |
374 | printf ("\n** Invalid partition type \"%.32s\"" |
375 | " (expect \"" BOOT_PART_TYPE "\")\n", | |
376 | info.type); | |
377 | return 1; | |
378 | } | |
379 | printf ("\nLoading from USB device %d, partition %d: " | |
380 | "Name: %.32s Type: %.32s\n", | |
381 | dev, part, info.name, info.type); | |
382 | ||
1a344f29 | 383 | debug ("First Block: %ld, # of blocks: %ld, Block Size: %ld\n", |
e887afc9 WD |
384 | info.start, info.size, info.blksz); |
385 | ||
386 | if (stor_dev->block_read(dev, info.start, 1, (ulong *)addr) != 1) { | |
387 | printf ("** Read error on %d:%d\n", dev, part); | |
388 | return 1; | |
389 | } | |
390 | ||
391 | hdr = (image_header_t *)addr; | |
392 | ||
f8883cb1 | 393 | if (ntohl(hdr->ih_magic) != IH_MAGIC) { |
e887afc9 WD |
394 | printf("\n** Bad Magic Number **\n"); |
395 | return 1; | |
396 | } | |
397 | ||
1a344f29 WD |
398 | checksum = ntohl(hdr->ih_hcrc); |
399 | hdr->ih_hcrc = 0; | |
400 | ||
77ddac94 | 401 | if (crc32 (0, (uchar *)hdr, sizeof(image_header_t)) != checksum) { |
1a344f29 WD |
402 | puts ("\n** Bad Header Checksum **\n"); |
403 | return 1; | |
404 | } | |
2f916943 | 405 | hdr->ih_hcrc = htonl(checksum); /* restore checksum for later use */ |
1a344f29 WD |
406 | |
407 | print_image_hdr (hdr); | |
408 | ||
f8883cb1 | 409 | cnt = (ntohl(hdr->ih_size) + sizeof(image_header_t)); |
1a344f29 WD |
410 | cnt += info.blksz - 1; |
411 | cnt /= info.blksz; | |
412 | cnt -= 1; | |
413 | ||
e887afc9 WD |
414 | if (stor_dev->block_read (dev, info.start+1, cnt, |
415 | (ulong *)(addr+info.blksz)) != cnt) { | |
416 | printf ("\n** Read error on %d:%d\n", dev, part); | |
417 | return 1; | |
418 | } | |
419 | /* Loading ok, update default load address */ | |
420 | load_addr = addr; | |
421 | ||
422 | flush_cache (addr, (cnt+1)*info.blksz); | |
423 | ||
424 | /* Check if we should attempt an auto-start */ | |
425 | if (((ep = getenv("autostart")) != NULL) && (strcmp(ep,"yes") == 0)) { | |
426 | char *local_args[2]; | |
427 | extern int do_bootm (cmd_tbl_t *, int, int, char *[]); | |
428 | local_args[0] = argv[0]; | |
429 | local_args[1] = NULL; | |
430 | printf ("Automatic boot of image at addr 0x%08lX ...\n", addr); | |
431 | rcode=do_bootm (cmdtp, 0, 1, local_args); | |
432 | return rcode; | |
433 | } | |
434 | return 0; | |
435 | } | |
436 | #endif /* CONFIG_USB_STORAGE */ | |
437 | ||
438 | ||
e887afc9 WD |
439 | /********************************************************************************* |
440 | * usb command intepreter | |
441 | */ | |
442 | int do_usb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) | |
443 | { | |
444 | ||
445 | int i; | |
446 | struct usb_device *dev = NULL; | |
1968e615 | 447 | #ifdef CONFIG_USB_STORAGE |
e887afc9 | 448 | block_dev_desc_t *stor_dev; |
1968e615 | 449 | #endif |
e887afc9 | 450 | |
9c998aa8 WD |
451 | if ((strncmp(argv[1], "reset", 5) == 0) || |
452 | (strncmp(argv[1], "start", 5) == 0)){ | |
e887afc9 WD |
453 | usb_stop(); |
454 | printf("(Re)start USB...\n"); | |
9c998aa8 WD |
455 | i = usb_init(); |
456 | #ifdef CONFIG_USB_STORAGE | |
457 | /* try to recognize storage devices immediately */ | |
095b8a37 | 458 | if (i >= 0) |
9c998aa8 | 459 | usb_stor_curr_dev = usb_stor_scan(1); |
9c998aa8 | 460 | #endif |
e887afc9 WD |
461 | return 0; |
462 | } | |
463 | if (strncmp(argv[1],"stop",4) == 0) { | |
464 | #ifdef CONFIG_USB_KEYBOARD | |
465 | if (argc==2) { | |
466 | if (usb_kbd_deregister()!=0) { | |
467 | printf("USB not stopped: usbkbd still using USB\n"); | |
468 | return 1; | |
469 | } | |
470 | } | |
471 | else { /* forced stop, switch console in to serial */ | |
472 | console_assign(stdin,"serial"); | |
473 | usb_kbd_deregister(); | |
474 | } | |
475 | #endif | |
476 | printf("stopping USB..\n"); | |
477 | usb_stop(); | |
478 | return 0; | |
479 | } | |
480 | if (strncmp(argv[1],"tree",4) == 0) { | |
481 | printf("\nDevice Tree:\n"); | |
482 | usb_show_tree(usb_get_dev_index(0)); | |
483 | return 0; | |
484 | } | |
485 | if (strncmp(argv[1],"inf",3) == 0) { | |
486 | int d; | |
487 | if (argc==2) { | |
488 | for(d=0;d<USB_MAX_DEVICE;d++) { | |
489 | dev=usb_get_dev_index(d); | |
490 | if (dev==NULL) | |
491 | break; | |
492 | usb_display_desc(dev); | |
493 | usb_display_config(dev); | |
494 | } | |
495 | return 0; | |
496 | } | |
497 | else { | |
498 | int d; | |
499 | ||
500 | i=simple_strtoul(argv[2], NULL, 16); | |
501 | printf("config for device %d\n",i); | |
502 | for(d=0;d<USB_MAX_DEVICE;d++) { | |
503 | dev=usb_get_dev_index(d); | |
504 | if (dev==NULL) | |
505 | break; | |
506 | if (dev->devnum==i) | |
507 | break; | |
508 | } | |
509 | if (dev==NULL) { | |
510 | printf("*** NO Device avaiable ***\n"); | |
511 | return 0; | |
512 | } | |
513 | else { | |
514 | usb_display_desc(dev); | |
515 | usb_display_config(dev); | |
516 | } | |
517 | } | |
518 | return 0; | |
519 | } | |
520 | #ifdef CONFIG_USB_STORAGE | |
9c998aa8 WD |
521 | if (strncmp(argv[1], "scan", 4) == 0) { |
522 | printf(" NOTE: this command is obsolete and will be phased out\n"); | |
523 | printf(" please use 'usb storage' for USB storage devices information\n\n"); | |
524 | usb_stor_info(); | |
e887afc9 WD |
525 | return 0; |
526 | } | |
9c998aa8 WD |
527 | |
528 | if (strncmp(argv[1], "stor", 4) == 0) { | |
529 | usb_stor_info(); | |
530 | return 0; | |
531 | } | |
532 | ||
e887afc9 WD |
533 | if (strncmp(argv[1],"part",4) == 0) { |
534 | int devno, ok; | |
535 | for (ok=0, devno=0; devno<USB_MAX_STOR_DEV; ++devno) { | |
536 | stor_dev=usb_stor_get_dev(devno); | |
537 | if (stor_dev->type!=DEV_TYPE_UNKNOWN) { | |
538 | ok++; | |
539 | if (devno) | |
540 | printf("\n"); | |
541 | printf("print_part of %x\n",devno); | |
542 | print_part(stor_dev); | |
543 | } | |
544 | } | |
545 | if (!ok) { | |
546 | printf("\nno USB devices available\n"); | |
547 | return 1; | |
548 | } | |
549 | return 0; | |
550 | } | |
551 | if (strcmp(argv[1],"read") == 0) { | |
552 | if (usb_stor_curr_dev<0) { | |
553 | printf("no current device selected\n"); | |
554 | return 1; | |
555 | } | |
556 | if (argc==5) { | |
557 | unsigned long addr = simple_strtoul(argv[2], NULL, 16); | |
558 | unsigned long blk = simple_strtoul(argv[3], NULL, 16); | |
559 | unsigned long cnt = simple_strtoul(argv[4], NULL, 16); | |
560 | unsigned long n; | |
561 | printf ("\nUSB read: device %d block # %ld, count %ld ... ", | |
562 | usb_stor_curr_dev, blk, cnt); | |
563 | stor_dev=usb_stor_get_dev(usb_stor_curr_dev); | |
564 | n = stor_dev->block_read(usb_stor_curr_dev, blk, cnt, (ulong *)addr); | |
565 | printf ("%ld blocks read: %s\n",n,(n==cnt) ? "OK" : "ERROR"); | |
566 | if (n==cnt) | |
567 | return 0; | |
568 | return 1; | |
569 | } | |
570 | } | |
9c998aa8 WD |
571 | if (strncmp(argv[1], "dev", 3) == 0) { |
572 | if (argc == 3) { | |
e887afc9 WD |
573 | int dev = (int)simple_strtoul(argv[2], NULL, 10); |
574 | printf ("\nUSB device %d: ", dev); | |
575 | if (dev >= USB_MAX_STOR_DEV) { | |
576 | printf("unknown device\n"); | |
577 | return 1; | |
578 | } | |
579 | printf ("\n Device %d: ", dev); | |
580 | stor_dev=usb_stor_get_dev(dev); | |
581 | dev_print(stor_dev); | |
582 | if (stor_dev->type == DEV_TYPE_UNKNOWN) { | |
583 | return 1; | |
584 | } | |
585 | usb_stor_curr_dev = dev; | |
586 | printf("... is now current device\n"); | |
587 | return 0; | |
588 | } | |
589 | else { | |
590 | printf ("\nUSB device %d: ", usb_stor_curr_dev); | |
591 | stor_dev=usb_stor_get_dev(usb_stor_curr_dev); | |
592 | dev_print(stor_dev); | |
593 | if (stor_dev->type == DEV_TYPE_UNKNOWN) { | |
594 | return 1; | |
595 | } | |
596 | return 0; | |
597 | } | |
598 | return 0; | |
599 | } | |
600 | #endif /* CONFIG_USB_STORAGE */ | |
601 | printf ("Usage:\n%s\n", cmdtp->usage); | |
602 | return 1; | |
603 | } | |
604 | ||
605 | ||
606 | #endif /* (CONFIG_COMMANDS & CFG_CMD_USB) */ | |
607 | ||
608 | ||
8bde7f77 WD |
609 | #if (CONFIG_COMMANDS & CFG_CMD_USB) |
610 | ||
611 | #ifdef CONFIG_USB_STORAGE | |
0d498393 WD |
612 | U_BOOT_CMD( |
613 | usb, 5, 1, do_usb, | |
8bde7f77 WD |
614 | "usb - USB sub-system\n", |
615 | "reset - reset (rescan) USB controller\n" | |
5cf91d6b WD |
616 | "usb stop [f] - stop USB [f]=force stop\n" |
617 | "usb tree - show USB device tree\n" | |
618 | "usb info [dev] - show available USB devices\n" | |
9c998aa8 | 619 | "usb storage - show details of USB storage devices\n" |
342717f7 | 620 | "usb dev [dev] - show or set current USB storage device\n" |
5cf91d6b WD |
621 | "usb part [dev] - print partition table of one or all USB storage devices\n" |
622 | "usb read addr blk# cnt - read `cnt' blocks starting at block `blk#'\n" | |
623 | " to memory address `addr'\n" | |
8bde7f77 WD |
624 | ); |
625 | ||
626 | ||
0d498393 WD |
627 | U_BOOT_CMD( |
628 | usbboot, 3, 1, do_usbboot, | |
8bde7f77 WD |
629 | "usbboot - boot from USB device\n", |
630 | "loadAddr dev:part\n" | |
631 | ); | |
632 | ||
633 | #else | |
0d498393 WD |
634 | U_BOOT_CMD( |
635 | usb, 5, 1, do_usb, | |
8bde7f77 WD |
636 | "usb - USB sub-system\n", |
637 | "reset - reset (rescan) USB controller\n" | |
638 | "usb tree - show USB device tree\n" | |
639 | "usb info [dev] - show available USB devices\n" | |
640 | ); | |
641 | #endif | |
642 | #endif |