Changeset 4e732f1a in mainline for uspace/lib/usbhost/src

Timestamp:

2014-01-24T02:10:16Z (11 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/lib/usbhost/src

Files:

• ddf_helpers.c (modified) (4 diffs)
• endpoint.c (modified) (2 diffs)
• hcd.c (modified) (1 diff)
• usb_bus.c (modified) (2 diffs)

uspace/lib/usbhost/src/ddf_helpers.c

@@ -110 +110 @@
     ddf_fun_t *fun, usb_endpoint_t endpoint,
     usb_transfer_type_t transfer_type, usb_direction_t direction,
-    size_t max_packet_size, unsigned interval)
+    size_t max_packet_size, unsigned packets, unsigned interval)
 {
         assert(fun);
@@ -126 +126 @@
 
         return hcd_add_ep(hcd, target, direction, transfer_type,
-            max_packet_size, size, dev->tt_address, dev->port);
+            max_packet_size, packets, size, dev->tt_address, dev->port);
 }
 
@@ -491 +491 @@
         ret = hcd_add_ep(hcd,
             default_target, USB_DIRECTION_BOTH, USB_TRANSFER_CONTROL,
-            CTRL_PIPE_MIN_PACKET_SIZE, CTRL_PIPE_MIN_PACKET_SIZE,
+            CTRL_PIPE_MIN_PACKET_SIZE, CTRL_PIPE_MIN_PACKET_SIZE, 1,
             tt_address, port);
 
@@ -517 +517 @@
         /* Register EP on the new address */
         ret = hcd_add_ep(hcd, target, USB_DIRECTION_BOTH, USB_TRANSFER_CONTROL,
-            desc.max_packet_size, desc.max_packet_size, tt_address, port);
+            ED_MPS_PACKET_SIZE_GET(uint16_usb2host(desc.max_packet_size)),
+            ED_MPS_TRANS_OPPORTUNITIES_GET(uint16_usb2host(desc.max_packet_size)),
+            ED_MPS_PACKET_SIZE_GET(uint16_usb2host(desc.max_packet_size)),
+            tt_address, port);
         if (ret != EOK) {
                 hcd_remove_ep(hcd, default_target, USB_DIRECTION_BOTH);

uspace/lib/usbhost/src/endpoint.c

@@ -50 +50 @@
 endpoint_t * endpoint_create(usb_address_t address, usb_endpoint_t endpoint,
     usb_direction_t direction, usb_transfer_type_t type, usb_speed_t speed,
-    size_t max_packet_size, size_t bw, usb_address_t tt_address, unsigned tt_p)
+    size_t max_packet_size, unsigned packets, size_t bw,
+    usb_address_t tt_address, unsigned tt_p)
 {
         endpoint_t *instance = malloc(sizeof(endpoint_t));
@@ -60 +61 @@
                 instance->speed = speed;
                 instance->max_packet_size = max_packet_size;
+                instance->packets = packets;
                 instance->bandwidth = bw;
                 instance->toggle = 0;

uspace/lib/usbhost/src/hcd.c

@@ -132 +132 @@
 
 int hcd_add_ep(hcd_t *hcd, usb_target_t target, usb_direction_t dir,
-    usb_transfer_type_t type, size_t max_packet_size, size_t size,
-    usb_address_t tt_address, unsigned tt_port)
+    usb_transfer_type_t type, size_t max_packet_size, unsigned packets,
+    size_t size, usb_address_t tt_address, unsigned tt_port)
 {
         assert(hcd);
         return usb_bus_add_ep(&hcd->bus, target.address,
-            target.endpoint, dir, type, max_packet_size, size, register_helper,
-            hcd, tt_address, tt_port);
+            target.endpoint, dir, type, max_packet_size, packets, size,
+            register_helper, hcd, tt_address, tt_port);
 }
 

uspace/lib/usbhost/src/usb_bus.c

@@ -301 +301 @@
 int usb_bus_add_ep(usb_bus_t *instance,
     usb_address_t address, usb_endpoint_t endpoint, usb_direction_t direction,
-    usb_transfer_type_t type, size_t max_packet_size, size_t data_size,
-    ep_add_callback_t callback, void *arg, usb_address_t tt_address,
-    unsigned tt_port)
+    usb_transfer_type_t type, size_t max_packet_size, unsigned packets,
+    size_t data_size, ep_add_callback_t callback, void *arg,
+    usb_address_t tt_address, unsigned tt_port)
 {
         assert(instance);
@@ -337 +337 @@
 
         ep = endpoint_create(address, endpoint, direction, type, speed,
-            max_packet_size, bw, tt_address, tt_port);
+            max_packet_size, packets, bw, tt_address, tt_port);
         if (!ep) {
                 fibril_mutex_unlock(&instance->guard);