Changeset bd575647 in mainline for uspace/lib/usbdev/src/pipesio.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/pipesio.c (modified) (2 diffs)

uspace/lib/usbdev/src/pipesio.c

@@ -71 +71 @@
             return ENOTSUP;
 
-        int ret = pipe_add_ref(pipe, false);
-        if (ret != EOK) {
-                return ret;
-        }
-
-        /* Ensure serialization over the phone. */
-        pipe_start_transaction(pipe);
-        async_exch_t *exch = async_exchange_begin(pipe->hc_sess);
-        if (!exch) {
-                pipe_end_transaction(pipe);
-                pipe_drop_ref(pipe);
-                return ENOMEM;
-        }
-
-        ret = usbhc_read(exch, pipe->wire->address, pipe->endpoint_no,
-            setup, buffer, size, size_transfered);
-        async_exchange_end(exch);
-        pipe_end_transaction(pipe);
-        pipe_drop_ref(pipe);
-        return ret;
+        return usb_hc_control_read(pipe->wire->hc_connection,
+            pipe->wire->address, pipe->endpoint_no, setup, buffer, size,
+            size_transfered);
 }
 
@@ -109 +92 @@
             return ENOTSUP;
 
-        int ret = pipe_add_ref(pipe, false);
-        if (ret != EOK) {
-                return ret;
-        }
-
-        /* Ensure serialization over the phone. */
-        pipe_start_transaction(pipe);
-        async_exch_t *exch = async_exchange_begin(pipe->hc_sess);
-        if (!exch) {
-                pipe_end_transaction(pipe);
-                pipe_drop_ref(pipe);
-                return ENOMEM;
-        }
-        ret = usbhc_write(exch, pipe->wire->address, pipe->endpoint_no,
-            setup, buffer, size);
-        async_exchange_end(exch);
-        pipe_end_transaction(pipe);
-        pipe_drop_ref(pipe);
-        return ret;
+        return usb_hc_control_write(pipe->wire->hc_connection,
+            pipe->wire->address, pipe->endpoint_no, setup, buffer, size);
 }