Changeset 1d758fc in mainline for uspace/lib/usbhost/src/ddf_helpers.c

Timestamp:

2018-02-12T10:11:47Z (7 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/usbhost/src/ddf_helpers.c (modified) (5 diffs)

uspace/lib/usbhost/src/ddf_helpers.c

@@ -46 +46 @@
 #include <usb/descriptor.h>
 #include <usb/usb.h>
+#include <usb/dma_buffer.h>
 #include <usb_iface.h>
 #include <usbhc_iface.h>
@@ -271 +272 @@
  * @return Error code.
  */
-static errno_t transfer(ddf_fun_t *fun, const usbhc_iface_transfer_request_t *req,
+static errno_t transfer(ddf_fun_t *fun,
+    const usbhc_iface_transfer_request_t *ifreq,
     usbhc_iface_transfer_callback_t callback, void *arg)
 {
@@ -280 +282 @@
         const usb_target_t target = {{
                 .address = dev->address,
-                .endpoint = req->endpoint,
-                .stream = req->stream,
+                .endpoint = ifreq->endpoint,
+                .stream = ifreq->stream,
         }};
 
@@ -287 +289 @@
                 return EINVAL;
 
-        if (req->size > 0 && req->base == NULL)
+        if (ifreq->offset > 0 && ifreq->size == 0)
+                return EINVAL;
+
+        if (ifreq->size > 0 && !dma_buffer_is_set(&ifreq->buffer))
                 return EBADMEM;
 
@@ -293 +298 @@
                 return EBADMEM;
 
-        const char *name = (req->dir == USB_DIRECTION_IN) ? "READ" : "WRITE";
-
-        char *buffer = req->base + req->offset;
-
-        return bus_device_send_batch(dev, target, req->dir,
-            buffer, req->size, req->setup,
-            callback, arg, name);
+        const transfer_request_t request = {
+                .target = target,
+                .dir = ifreq->dir,
+                .buffer = ifreq->buffer,
+                .offset = ifreq->offset,
+                .size = ifreq->size,
+                .setup = ifreq->setup,
+                .on_complete = callback,
+                .arg = arg,
+                .name = (ifreq->dir == USB_DIRECTION_IN) ? "READ" : "WRITE",
+        };
+
+        return bus_issue_transfer(dev, &request);
 }