Changeset 4e732f1a in mainline for uspace/drv/bus/usb

Timestamp:

2014-01-24T02:10:16Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

42de21a

Parents:

3de7a62

Message:

usb: Add support for multiple packets per microframe.

Location:

uspace/drv/bus/usb

Files:

• ehci/hw_struct/queue_head.c (modified) (1 diff)
• ehci/hw_struct/queue_head.h (modified) (1 diff)
• ohci/hw_struct/endpoint_descriptor.c (modified) (1 diff)

uspace/drv/bus/usb/ehci/hw_struct/queue_head.c

@@ -79 +79 @@
         }
 
-        // TODO Fix 'multi' 1 packet should be safe. Probably won't work
-        // without enabling parking mode in async schedule
         // TODO Figure out how to correctly use CMASK and SMASK for LS/FS
         // INT transfers. Current values are just guesses
-        /* Setting TT stuff on HS endpoints is OK, the fields are ignored */
+        /* Setting TT stuff on HS endpoints is OK, the fields are ignored,
+         * and so is setting multi on async (should be 1 anyway)*/
         EHCI_MEM32_WR(instance->ep_cap,
-            QH_EP_CAP_MULTI_SET(1) |
+            QH_EP_CAP_MULTI_SET(ep->packets) |
             QH_EP_CAP_TT_PORT_SET(ep->tt.port) |
             QH_EP_CAP_TT_ADDR_SET(ep->tt.address) |

uspace/drv/bus/usb/ehci/hw_struct/queue_head.h

@@ -39 +39 @@
 #include <usb/host/endpoint.h>
 
+#include "../utils/malloc32.h"
 #include "link_pointer.h"
 #include "mem_access.h"

uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.c

@@ -63 +63 @@
 {
         assert(instance);
-        memset(instance, 0, sizeof(ed_t));
+        memset(instance, 0, sizeof(*instance));
 
         if (ep == NULL) {