Changeset 239eea41 in mainline for uspace/lib/usbdev

Timestamp:

2018-02-05T02:04:58Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

fc3dfe6d

Parents:

af16ebe

Message:

libdrv usbhc iface: wrap transfer arguments into structure

File:

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

uspace/lib/usbdev/src/pipes.c

@@ -39 +39 @@
 
 #include <assert.h>
+#include <bitops.h>
 #include <async.h>
+#include <as.h>
 #include <errno.h>
 #include <mem.h>
@@ -61 +63 @@
 }
 
+/* Helper structure to avoid passing loads of arguments through */
 typedef struct {
         usb_pipe_t *pipe;
         usb_direction_t dir;
-        bool is_control;
-        uint64_t setup;
+        bool is_control;        // Only for checking purposes
         void *buffer;
         size_t buffer_size;
+
+        usbhc_iface_transfer_request_t req;
+
         size_t transferred_size;
 } transfer_t;
@@ -80 +85 @@
                 return ENOMEM;
 
-        const errno_t rc = usbhc_transfer(exch, t->pipe->desc.endpoint_no,
-            t->dir, t->setup, t->buffer, t->buffer_size, &t->transferred_size);
+        t->req.dir = t->dir;
+        t->req.endpoint = t->pipe->desc.endpoint_no;
+
+        /* We support only aligned buffers for now. */
+        t->req.base = t->buffer;
+        t->req.offset = 0;
+        t->req.size = t->buffer_size;
+
+        const errno_t rc = usbhc_transfer(exch, &t->req, &t->transferred_size);
 
         async_exchange_end(exch);
@@ -143 +155 @@
                 return EINVAL;
         
-        memcpy(&t->setup, setup, 8);
+        memcpy(&t->req.setup, setup, 8);
         return EOK;
 }