Changes in uspace/lib/usbdev/src/pipesinit.c [277ff98:3ddbd38] in mainline

File:

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

uspace/lib/usbdev/src/pipesinit.c

@@ -349 +349 @@
         fibril_mutex_initialize(&pipe->guard);
         pipe->wire = connection;
+        pipe->hc_sess = NULL;
+        fibril_mutex_initialize(&pipe->hc_sess_mutex);
         pipe->endpoint_no = endpoint_no;
         pipe->transfer_type = transfer_type;
         pipe->max_packet_size = max_packet_size;
         pipe->direction = direction;
+        pipe->refcount = 0;
+        pipe->refcount_soft = 0;
         pipe->auto_reset_halt = false;
 
@@ -371 +375 @@
         assert(connection);
 
-        int rc = usb_pipe_initialize(pipe, connection, 0, USB_TRANSFER_CONTROL,
-            CTRL_PIPE_MIN_PACKET_SIZE, USB_DIRECTION_BOTH);
+        int rc = usb_pipe_initialize(pipe, connection,
+            0, USB_TRANSFER_CONTROL, CTRL_PIPE_MIN_PACKET_SIZE,
+            USB_DIRECTION_BOTH);
 
         pipe->auto_reset_halt = true;
@@ -437 +442 @@
  * @return Error code.
  */
-int usb_pipe_register(usb_pipe_t *pipe, unsigned interval)
+int usb_pipe_register(usb_pipe_t *pipe, unsigned interval,
+    usb_hc_connection_t *hc_connection)
 {
         assert(pipe);
         assert(pipe->wire);
-        assert(pipe->wire->hc_connection);
-
-        return usb_hc_register_endpoint(pipe->wire->hc_connection,
-           pipe->wire->address, pipe->endpoint_no, pipe->transfer_type,
-           pipe->direction, pipe->max_packet_size, interval);
+        assert(hc_connection);
+
+        if (!usb_hc_connection_is_opened(hc_connection))
+                return EBADF;
+        async_exch_t *exch = async_exchange_begin(hc_connection->hc_sess);
+        if (!exch)
+                return ENOMEM;
+        const int ret = usbhc_register_endpoint(exch,
+            pipe->wire->address, pipe->endpoint_no, pipe->transfer_type,
+            pipe->direction, pipe->max_packet_size, interval);
+
+        async_exchange_end(exch);
+        return ret;
 }
 
@@ -454 +468 @@
  * @return Error code.
  */
-int usb_pipe_unregister(usb_pipe_t *pipe)
+int usb_pipe_unregister(usb_pipe_t *pipe,
+    usb_hc_connection_t *hc_connection)
 {
         assert(pipe);
         assert(pipe->wire);
-        assert(pipe->wire->hc_connection);
-
-        return usb_hc_unregister_endpoint(pipe->wire->hc_connection,
+        assert(hc_connection);
+
+        if (!usb_hc_connection_is_opened(hc_connection))
+                return EBADF;
+
+        async_exch_t *exch = async_exchange_begin(hc_connection->hc_sess);
+        if (!exch)
+                return ENOMEM;
+        const int ret = usbhc_unregister_endpoint(exch,
             pipe->wire->address, pipe->endpoint_no, pipe->direction);
+        async_exchange_end(exch);
+
+        return ret;
 }