diff options
| author | wdenk <wdenk> | 2003-09-11 19:48:06 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-09-11 19:48:06 +0000 |
| commit | a43278a43d522fba7fea0ed3045b718a9c8d22ac (patch) | |
| tree | c21920a271992ce76e5e679c3e3e8bb11054d356 /cpu | |
| parent | 7205e4075d8b50e4dd89fe39ed03860b23cbb704 (diff) | |
* Patch by Gary Jennejohn, 11 Sep 2003:
- allow for longer timeouts for USB mass storage devices
* Patch by Denis Peter, 11 Sep 2003:
- fix USB data pointer assignment for bulk only transfer.
- prevent to display erased directories in FAT filesystem.
* Change output format for NAND flash - make it look like for other
memory, too
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/arm920t/usb_ohci.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/cpu/arm920t/usb_ohci.c b/cpu/arm920t/usb_ohci.c index 41ba233c445..55af0348dca 100644 --- a/cpu/arm920t/usb_ohci.c +++ b/cpu/arm920t/usb_ohci.c @@ -1197,8 +1197,15 @@ int submit_common_msg(struct usb_device *dev, unsigned long pipe, void *buffer, wait_ms(10); /* ohci_dump_status(&gohci); */ + + /* allow more time for a BULK device to react - some are slow */ +#define BULK_TO 2000 /* timeout in milliseconds */ + if (usb_pipetype (pipe) == PIPE_BULK) + timeout = BULK_TO; + else + timeout = 100; + /* wait for it to complete */ - timeout = 100; for (;;) { /* check whether the controller is done */ stat = hc_interrupt(); |