Changeset 3969a42 in mainline

Timestamp:

2013-08-02T15:21:55Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d93f5afb

Parents:

1845003

Message:

libusbdev: Switch pipse to use new data communication paths.

File:

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

uspace/lib/usbdev/src/pipes.c

@@ -121 +121 @@
         memcpy(&setup_packet, setup_buffer, 8);
 
+        async_exch_t *exch = async_exchange_begin(pipe->bus_session);
         size_t act_size = 0;
-        const int rc = usb_device_control_read(pipe->wire,
+        const int rc = usb_read(exch,
             pipe->endpoint_no, setup_packet, buffer, buffer_size, &act_size);
+        async_exchange_end(exch);
 
         if (rc == ESTALL) {
@@ -173 +175 @@
         memcpy(&setup_packet, setup_buffer, 8);
 
-        const int rc = usb_device_control_write(pipe->wire,
+        async_exch_t *exch = async_exchange_begin(pipe->bus_session);
+        const int rc = usb_write(exch,
             pipe->endpoint_no, setup_packet, buffer, buffer_size);
+        async_exchange_end(exch);
 
         if (rc == ESTALL) {
@@ -217 +221 @@
             return ENOTSUP;
 
+        async_exch_t *exch = async_exchange_begin(pipe->bus_session);
         size_t act_size = 0;
-        const int rc = usb_device_read(pipe->wire,
-            pipe->endpoint_no, buffer, size, &act_size);
+        const int rc =
+            usb_read(exch, pipe->endpoint_no, 0, buffer, size, &act_size);
+        async_exchange_end(exch);
 
         if (rc == EOK && size_transfered != NULL) {
@@ -256 +262 @@
             return ENOTSUP;
 
-        return usb_device_write(pipe->wire,
-            pipe->endpoint_no, buffer, size);
+        async_exch_t *exch = async_exchange_begin(pipe->bus_session);
+        const int rc = usb_write(exch, pipe->endpoint_no, 0, buffer, size);
+        async_exchange_end(exch);
+        return rc;
 }