Changeset 1d758fc in mainline for uspace/lib/usbdev/src/pipes.c

Timestamp:

2018-02-12T10:11:47Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

5fe3f954

Parents:

2f762a7

git-author:

Ondřej Hlavatý <aearsis@…> (2018-02-05 03:28:50)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-02-12 10:11:47)

Message:

usb: rethinking DMA buffers

File:

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

uspace/lib/usbdev/src/pipes.c

@@ -83 +83 @@
 
         /* Only control writes make sense without buffer */
-        if ((t->dir != USB_DIRECTION_OUT || !t->is_control)
-            && (t->req.base == NULL || t->req.size == 0))
+        if ((t->dir != USB_DIRECTION_OUT || !t->is_control) && t->req.size == 0)
                 return EINVAL;
 
         /* Nonzero size requires buffer */
-        if (t->req.base == NULL && t->req.size != 0)
+        if (!dma_buffer_is_set(&t->req.buffer) && t->req.size != 0)
                 return EINVAL;
 
@@ -119 +118 @@
 /**
  * Setup the transfer request inside transfer according to dma buffer provided.
+ *
+ * TODO: The buffer could have been allocated as a more strict one. Currently,
+ * we assume that the policy is just the requested one.
  */
 static void setup_dma_buffer(transfer_t *t, void *base, void *ptr, size_t size)
 {
-        t->req.base = base;
+        t->req.buffer.virt = base;
+        t->req.buffer.policy = t->pipe->desc.transfer_buffer_policy;
         t->req.offset = ptr - base;
         t->req.size = size;
-        t->req.buffer_policy = t->pipe->desc.transfer_buffer_policy;
 }
 
@@ -133 +135 @@
 static errno_t transfer_wrap_dma(transfer_t *t, void *buf, size_t size)
 {
+        if (size == 0) {
+                setup_dma_buffer(t, NULL, NULL, 0);
+                return transfer_common(t);
+        }
+
         void *dma_buf = usb_pipe_alloc_buffer(t->pipe, size);
         setup_dma_buffer(t, dma_buf, dma_buf, size);
@@ -364 +371 @@
         .direction = USB_DIRECTION_BOTH,
         .max_transfer_size = CTRL_PIPE_MIN_PACKET_SIZE,
+        .transfer_buffer_policy = DMA_POLICY_STRICT,
 };