Changes in uspace/lib/usbdev/src/pipesinit.c [58563585:9d58539] in mainline

File:

• uspace/lib/usbdev/src/pipesinit.c (modified) (14 diffs)

uspace/lib/usbdev/src/pipesinit.c

@@ -34 +34 @@
  *
  */
+#include <usb/usb.h>
 #include <usb/dev/pipes.h>
 #include <usb/dev/dp.h>
 #include <usb/dev/request.h>
-#include <usb/usb.h>
-#include <usb/descriptor.h>
-
+#include <errno.h>
 #include <assert.h>
-#include <errno.h>
 
 #define DEV_DESCR_MAX_PACKET_SIZE_OFFSET 7
@@ -150 +148 @@
  * @param interface Interface descriptor under which belongs the @p endpoint.
  * @param endpoint Endpoint descriptor.
+ * @param wire Connection backing the endpoint pipes.
  * @return Error code.
  */
@@ -155 +154 @@
     usb_endpoint_mapping_t *mapping, size_t mapping_count,
     usb_standard_interface_descriptor_t *interface,
-    usb_standard_endpoint_descriptor_t *endpoint_desc,
-    usb_dev_session_t *bus_session)
+    usb_standard_endpoint_descriptor_t *endpoint,
+    usb_device_connection_t *wire)
 {
 
@@ -164 +163 @@
 
         /* Actual endpoint number is in bits 0..3 */
-        const usb_endpoint_t ep_no = endpoint_desc->endpoint_address & 0x0F;
+        const usb_endpoint_t ep_no = endpoint->endpoint_address & 0x0F;
 
         const usb_endpoint_description_t description = {
                 /* Endpoint direction is set by bit 7 */
-                .direction = (endpoint_desc->endpoint_address & 128)
+                .direction = (endpoint->endpoint_address & 128)
                     ? USB_DIRECTION_IN : USB_DIRECTION_OUT,
                 /* Transfer type is in bits 0..2 and
                  * the enum values corresponds 1:1 */
-                .transfer_type = endpoint_desc->attributes & 3,
+                .transfer_type = endpoint->attributes & 3,
 
                 /* Get interface characteristics. */
@@ -191 +190 @@
 
         if (ep_mapping->present) {
-                return EEXIST;
-        }
-
-        int rc = usb_pipe_initialize(&ep_mapping->pipe,
-            ep_no, description.transfer_type,
-            ED_MPS_PACKET_SIZE_GET(
-                uint16_usb2host(endpoint_desc->max_packet_size)),
-            description.direction,
-            ED_MPS_TRANS_OPPORTUNITIES_GET(
-                uint16_usb2host(endpoint_desc->max_packet_size)), bus_session);
+                return EEXISTS;
+        }
+
+        int rc = usb_pipe_initialize(&ep_mapping->pipe, wire,
+            ep_no, description.transfer_type, endpoint->max_packet_size,
+            description.direction);
         if (rc != EOK) {
                 return rc;
@@ -206 +201 @@
 
         ep_mapping->present = true;
-        ep_mapping->descriptor = endpoint_desc;
+        ep_mapping->descriptor = endpoint;
         ep_mapping->interface = interface;
 
@@ -224 +219 @@
     usb_endpoint_mapping_t *mapping, size_t mapping_count,
     const usb_dp_parser_t *parser, const usb_dp_parser_data_t *parser_data,
-    const uint8_t *interface_descriptor, usb_dev_session_t *bus_session)
+    const uint8_t *interface_descriptor)
 {
         const uint8_t *descriptor = usb_dp_get_nested_descriptor(parser,
@@ -240 +235 @@
                             (usb_standard_endpoint_descriptor_t *)
                                 descriptor,
-                            bus_session);
+                            (usb_device_connection_t *) parser_data->arg);
                 }
 
@@ -284 +279 @@
     usb_endpoint_mapping_t *mapping, size_t mapping_count,
     const uint8_t *config_descriptor, size_t config_descriptor_size,
-    usb_dev_session_t *bus_session)
-{
-        if (config_descriptor == NULL)
+    usb_device_connection_t *connection)
+{
+        assert(connection);
+
+        if (config_descriptor == NULL) {
                 return EBADMEM;
-        
-        if (config_descriptor_size <
-            sizeof(usb_standard_configuration_descriptor_t)) {
+        }
+        if (config_descriptor_size
+            < sizeof(usb_standard_configuration_descriptor_t)) {
                 return ERANGE;
         }
@@ -308 +305 @@
                 .data = config_descriptor,
                 .size = config_descriptor_size,
+                .arg = connection
         };
 
@@ -320 +318 @@
         do {
                 (void) process_interface(mapping, mapping_count,
-                    &dp_parser, &dp_data, interface, bus_session);
+                    &dp_parser, &dp_data, interface);
                 interface = usb_dp_get_sibling_descriptor(&dp_parser, &dp_data,
                     config_descriptor, interface);
@@ -341 +339 @@
 {
         assert(pipe);
-        static_assert(DEV_DESCR_MAX_PACKET_SIZE_OFFSET < CTRL_PIPE_MIN_PACKET_SIZE);
+        assert(DEV_DESCR_MAX_PACKET_SIZE_OFFSET < CTRL_PIPE_MIN_PACKET_SIZE);
 
         if ((pipe->direction != USB_DIRECTION_BOTH) ||
@@ -348 +346 @@
                 return EINVAL;
         }
+
+
+        usb_pipe_start_long_transfer(pipe);
 
         uint8_t dev_descr_start[CTRL_PIPE_MIN_PACKET_SIZE];
@@ -365 +366 @@
                 }
         }
+        usb_pipe_end_long_transfer(pipe);
         if (rc != EOK) {
                 return rc;