Changeset 239eea41 in mainline for uspace/lib/usbhost

Timestamp:

2018-02-05T02:04:58Z (8 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/usbhost/src/ddf_helpers.c (modified) (3 diffs)

uspace/lib/usbhost/src/ddf_helpers.c

@@ -271 +271 @@
  * @return Error code.
  */
-static errno_t transfer(ddf_fun_t *fun, usb_target_t target,
-    usb_direction_t dir, uint64_t setup_data, char *data, size_t size,
+static errno_t transfer(ddf_fun_t *fun, const usbhc_iface_transfer_request_t *req,
     usbhc_iface_transfer_callback_t callback, void *arg)
 {
@@ -279 +278 @@
         assert(dev);
 
-        target.address = dev->address;
+        const usb_target_t target = {{
+                .address = dev->address,
+                .endpoint = req->endpoint,
+                .stream = req->stream,
+        }};
 
         if (!usb_target_is_valid(&target))
                 return EINVAL;
 
-        if (size > 0 && data == NULL)
+        if (req->size > 0 && req->base == NULL)
                 return EBADMEM;
 
@@ -290 +293 @@
                 return EBADMEM;
 
-        const char *name = (dir == USB_DIRECTION_IN) ? "READ" : "WRITE";
-
-        return bus_device_send_batch(dev, target, dir,
-            (char *) data, size, setup_data,
+        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);
 }