Changeset 33b88723 in mainline

Timestamp:

2011-01-30T23:39:33Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

284c629

Parents:

fe4dd14

Message:

Implementation of pipe control transfers

File:

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

uspace/lib/usb/src/pipes.c

@@ -264 +264 @@
     void *data_buffer, size_t data_buffer_size, size_t *data_transfered_size)
 {
-        return ENOTSUP;
+        assert(pipe);
+
+        int rc;
+        usb_handle_t handle;
+
+        rc = usb_endpoint_pipe_async_control_read(pipe,
+            setup_buffer, setup_buffer_size,
+            data_buffer, data_buffer_size, data_transfered_size,
+            &handle);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        rc = usb_endpoint_pipe_wait_for(pipe, handle);
+        return rc;
 }
 
@@ -283 +297 @@
     void *data_buffer, size_t data_buffer_size)
 {
-        return ENOTSUP;
+        assert(pipe);
+
+        int rc;
+        usb_handle_t handle;
+
+        rc = usb_endpoint_pipe_async_control_write(pipe,
+            setup_buffer, setup_buffer_size,
+            data_buffer, data_buffer_size,
+            &handle);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        rc = usb_endpoint_pipe_wait_for(pipe, handle);
+        return rc;
 }
 
@@ -391 +419 @@
     usb_handle_t *handle)
 {
-        return ENOTSUP;
+        assert(pipe);
+
+        if (pipe->hc_phone < 0) {
+                return EBADF;
+        }
+
+        if ((pipe->direction != USB_DIRECTION_BOTH)
+            || (pipe->transfer_type != USB_TRANSFER_CONTROL)) {
+                return EBADF;
+        }
+
+        int rc;
+        _PREPARE_TARGET(target, pipe);
+
+        rc = usb_drv_async_control_read(pipe->hc_phone, target,
+            setup_buffer, setup_buffer_size,
+            data_buffer, data_buffer_size, data_transfered_size,
+            handle);
+
+        return rc;
 }
 
@@ -412 +459 @@
     usb_handle_t *handle)
 {
-        return ENOTSUP;
+        assert(pipe);
+
+        if (pipe->hc_phone < 0) {
+                return EBADF;
+        }
+
+        if ((pipe->direction != USB_DIRECTION_BOTH)
+            || (pipe->transfer_type != USB_TRANSFER_CONTROL)) {
+                return EBADF;
+        }
+
+        int rc;
+        _PREPARE_TARGET(target, pipe);
+
+        rc = usb_drv_async_control_write(pipe->hc_phone, target,
+            setup_buffer, setup_buffer_size,
+            data_buffer, data_buffer_size,
+            handle);
+
+        return rc;
 }