Changeset b4b534ac in mainline for uspace/lib/usbdev/src/pipesinit.c

Timestamp:

2016-07-22T08:24:47Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jan.vesely/helenos/usb

File:

• uspace/lib/usbdev/src/pipesinit.c (modified) (11 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 <assert.h>
 #include <errno.h>
-#include <assert.h>
 
 #define DEV_DESCR_MAX_PACKET_SIZE_OFFSET 7
@@ -148 +150 @@
  * @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 +156 @@
     usb_standard_interface_descriptor_t *interface,
     usb_standard_endpoint_descriptor_t *endpoint_desc,
-    usb_device_connection_t *wire)
+    usb_dev_session_t *bus_session)
 {
 
@@ -193 +194 @@
         }
 
-        int rc = usb_pipe_initialize(&ep_mapping->pipe, wire,
+        int rc = usb_pipe_initialize(&ep_mapping->pipe,
             ep_no, description.transfer_type,
-            uint16_usb2host(endpoint_desc->max_packet_size),
-            description.direction);
+            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);
         if (rc != EOK) {
                 return rc;
@@ -220 +224 @@
     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)
+    const uint8_t *interface_descriptor, usb_dev_session_t *bus_session)
 {
         const uint8_t *descriptor = usb_dp_get_nested_descriptor(parser,
@@ -236 +240 @@
                             (usb_standard_endpoint_descriptor_t *)
                                 descriptor,
-                            (usb_device_connection_t *) parser_data->arg);
+                            bus_session);
                 }
 
@@ -280 +284 @@
     usb_endpoint_mapping_t *mapping, size_t mapping_count,
     const uint8_t *config_descriptor, size_t config_descriptor_size,
-    usb_device_connection_t *connection)
-{
-        assert(connection);
+    usb_dev_session_t *bus_session)
+{
 
         if (config_descriptor == NULL) {
@@ -306 +309 @@
                 .data = config_descriptor,
                 .size = config_descriptor_size,
-                .arg = connection
         };
 
@@ -319 +321 @@
         do {
                 (void) process_interface(mapping, mapping_count,
-                    &dp_parser, &dp_data, interface);
+                    &dp_parser, &dp_data, interface, bus_session);
                 interface = usb_dp_get_sibling_descriptor(&dp_parser, &dp_data,
                     config_descriptor, interface);
@@ -347 +349 @@
                 return EINVAL;
         }
-
-
-        usb_pipe_start_long_transfer(pipe);
 
         uint8_t dev_descr_start[CTRL_PIPE_MIN_PACKET_SIZE];
@@ -367 +366 @@
                 }
         }
-        usb_pipe_end_long_transfer(pipe);
         if (rc != EOK) {
                 return rc;