Changeset 8582076 in mainline

Timestamp:

2013-01-27T18:44: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:

70a422b

Parents:

fe9d542

Message:

libusbdev: Add device connection to pipe structure.

Location:

uspace/lib/usbdev

Files:

• include/usb/dev/pipes.h (modified) (3 diffs)
• src/devdrv.c (modified) (2 diffs)
• src/pipes.c (modified) (4 diffs)
• src/pipesinit.c (modified) (6 diffs)

uspace/lib/usbdev/include/usb/dev/pipes.h

@@ -42 +42 @@
 #include <usb/descriptor.h>
 #include <usb/dev/usb_device_connection.h>
+#include <usb_iface.h>
 
 #define CTRL_PIPE_MIN_PACKET_SIZE 8
@@ -69 +70 @@
          */
         bool auto_reset_halt;
+
+        usb_dev_session_t *bus_session;
 } usb_pipe_t;
 
@@ -106 +109 @@
 
 int usb_pipe_initialize(usb_pipe_t *, usb_device_connection_t *,
-    usb_endpoint_t, usb_transfer_type_t, size_t, usb_direction_t);
+    usb_endpoint_t, usb_transfer_type_t, size_t, usb_direction_t,
+    usb_dev_session_t *);
 int usb_pipe_initialize_default_control(usb_pipe_t *,
-    usb_device_connection_t *);
+    usb_device_connection_t *, usb_dev_session_t *);
 
 int usb_pipe_probe_default_control(usb_pipe_t *);
 int usb_pipe_initialize_from_configuration(usb_endpoint_mapping_t *,
-    size_t, const uint8_t *, size_t, usb_device_connection_t *);
+    size_t, const uint8_t *, size_t, usb_device_connection_t *,
+    usb_dev_session_t *);
 
 int usb_pipe_register(usb_pipe_t *, unsigned);

uspace/lib/usbdev/src/devdrv.c

@@ -237 +237 @@
         int rc = usb_pipe_initialize_from_configuration(pipes, pipe_count,
             usb_dev->descriptors.full_config,
-            usb_dev->descriptors.full_config_size, &usb_dev->wire);
+            usb_dev->descriptors.full_config_size, &usb_dev->wire,
+            usb_dev->bus_session);
         if (rc != EOK) {
                 free(pipes);
@@ -454 +455 @@
          * during device initialization. */
         rc = usb_pipe_initialize_default_control(
-            &usb_dev->ctrl_pipe, &usb_dev->wire);
+            &usb_dev->ctrl_pipe, &usb_dev->wire, usb_dev->bus_session);
         if (rc != EOK) {
                 usb_dev_disconnect(usb_dev->bus_session);

uspace/lib/usbdev/src/pipes.c

@@ -273 +273 @@
     usb_device_connection_t *connection, usb_endpoint_t endpoint_no,
     usb_transfer_type_t transfer_type, size_t max_packet_size,
-    usb_direction_t direction)
+    usb_direction_t direction, usb_dev_session_t *bus_session)
 {
         assert(pipe);
@@ -284 +284 @@
         pipe->direction = direction;
         pipe->auto_reset_halt = false;
+        pipe->bus_session = bus_session;
 
         return EOK;
@@ -295 +296 @@
  */
 int usb_pipe_initialize_default_control(usb_pipe_t *pipe,
-    usb_device_connection_t *connection)
+    usb_device_connection_t *connection, usb_dev_session_t *bus_session)
 {
         assert(pipe);
@@ -301 +302 @@
 
         int rc = usb_pipe_initialize(pipe, connection, 0, USB_TRANSFER_CONTROL,
-            CTRL_PIPE_MIN_PACKET_SIZE, USB_DIRECTION_BOTH);
+            CTRL_PIPE_MIN_PACKET_SIZE, USB_DIRECTION_BOTH, bus_session);
 
         pipe->auto_reset_halt = true;

uspace/lib/usbdev/src/pipesinit.c

@@ -155 +155 @@
     usb_standard_interface_descriptor_t *interface,
     usb_standard_endpoint_descriptor_t *endpoint_desc,
-    usb_device_connection_t *wire)
+    usb_device_connection_t *wire, usb_dev_session_t *bus_session)
 {
 
@@ -196 +196 @@
             ep_no, description.transfer_type,
             uint16_usb2host(endpoint_desc->max_packet_size),
-            description.direction);
+            description.direction, bus_session);
         if (rc != EOK) {
                 return rc;
@@ -220 +220 @@
     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 +236 @@
                             (usb_standard_endpoint_descriptor_t *)
                                 descriptor,
-                            (usb_device_connection_t *) parser_data->arg);
+                            (usb_device_connection_t *) parser_data->arg,
+                            bus_session);
                 }
 
@@ -280 +281 @@
     usb_endpoint_mapping_t *mapping, size_t mapping_count,
     const uint8_t *config_descriptor, size_t config_descriptor_size,
-    usb_device_connection_t *connection)
+    usb_device_connection_t *connection, usb_dev_session_t *bus_session)
 {
         assert(connection);
@@ -319 +320 @@
         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);