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

Timestamp:

2011-12-11T16:30:42Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7d5ef94

Parents:

2c202c5

Message:

libusbdev: Use shared hc_connection for pipes.

File:

• uspace/lib/usbdev/src/pipesinit.c (modified) (3 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;
 
@@ -442 +438 @@
  * @return Error code.
  */
-int usb_pipe_register(usb_pipe_t *pipe, unsigned interval,
-    usb_hc_connection_t *hc_connection)
+int usb_pipe_register(usb_pipe_t *pipe, unsigned interval)
 {
         assert(pipe);
         assert(pipe->wire);
-        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;
+        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);
 }
 
@@ -468 +455 @@
  * @return Error code.
  */
-int usb_pipe_unregister(usb_pipe_t *pipe,
-    usb_hc_connection_t *hc_connection)
+int usb_pipe_unregister(usb_pipe_t *pipe)
 {
         assert(pipe);
         assert(pipe->wire);
-        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,
+        assert(pipe->wire->hc_connection);
+
+        return usb_hc_unregister_endpoint(pipe->wire->hc_connection,
             pipe->wire->address, pipe->endpoint_no, pipe->direction);
-        async_exchange_end(exch);
-
-        return ret;
 }