Changeset 4e17d54 in mainline

Timestamp:

2018-01-31T17:12:13Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

da9d6ca

Parents:

50206e9

Message:

usbdev: pipe operations with dma buffers

Location:

uspace/lib/usbdev

Files:

• include/usb/dev/pipes.h (modified) (1 diff)
• src/pipes.c (modified) (1 diff)

uspace/lib/usbdev/include/usb/dev/pipes.h

@@ -110 +110 @@
 errno_t usb_pipe_write(usb_pipe_t *, const void *, size_t);
 
+errno_t usb_pipe_read_dma(usb_pipe_t *, void *, size_t, size_t *);
+errno_t usb_pipe_write_dma(usb_pipe_t *, void *, size_t);
+
 errno_t usb_pipe_control_read(usb_pipe_t *, const void *, size_t,
     void *, size_t, size_t *);

uspace/lib/usbdev/src/pipes.c

@@ -258 +258 @@
 }
 
+/**
+ * Request a read (in) transfer on an endpoint pipe, declaring that buffer
+ * is pointing to a memory area previously allocated by usb_pipe_alloc_buffer.
+ *
+ * @param[in] pipe Pipe used for the transfer.
+ * @param[in] buffer Buffer, previously allocated with usb_pipe_alloc_buffer.
+ * @param[in] size Size of the buffer (in bytes).
+ * @param[out] size_transferred Number of bytes that were actually transferred.
+ * @return Error code.
+ */
+errno_t usb_pipe_read_dma(usb_pipe_t *pipe, void *buffer, size_t size,
+    size_t *size_transferred)
+{
+        assert(pipe);
+
+        if (buffer == NULL || size == 0)
+                return EINVAL;
+
+        if (pipe->desc.direction != USB_DIRECTION_IN
+            || pipe->desc.transfer_type == USB_TRANSFER_CONTROL)
+                return EBADF;
+
+        async_exch_t *exch = async_exchange_begin(pipe->bus_session);
+        if (!exch)
+                return ENOMEM;
+
+        const errno_t rc = usbhc_transfer(exch, pipe->desc.endpoint_no,
+            USB_DIRECTION_IN, 0, buffer, size, size_transferred);
+        async_exchange_end(exch);
+        return rc;
+}
+
+/**
+ * Request a write (out) transfer on an endpoint pipe, declaring that buffer
+ * is pointing to a memory area previously allocated by usb_pipe_alloc_buffer.
+ *
+ * @param[in] pipe Pipe used for the transfer.
+ * @param[in] buffer Buffer, previously allocated with usb_pipe_alloc_buffer.
+ * @param[in] size Size of the buffer (in bytes).
+ * @return Error code.
+ */
+errno_t usb_pipe_write_dma(usb_pipe_t *pipe, void *buffer, size_t size)
+{
+        assert(pipe);
+
+        if (buffer == NULL || size == 0) {
+                return EINVAL;
+        }
+
+        if (pipe->desc.direction != USB_DIRECTION_OUT
+            || pipe->desc.transfer_type == USB_TRANSFER_CONTROL)
+                return EBADF;
+
+        async_exch_t *exch = async_exchange_begin(pipe->bus_session);
+        if (!exch)
+                return ENOMEM;
+
+        const errno_t rc = usbhc_transfer(exch, pipe->desc.endpoint_no, USB_DIRECTION_OUT, 0, buffer, size, NULL);
+        async_exchange_end(exch);
+        return rc;
+}
+
 /** Initialize USB endpoint pipe.
  *