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

Timestamp:

2018-01-31T16:02:34Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

3b60ea0

Parents:

2b3dd78

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-31 15:49:24)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-31 16:02:34)

Message:

libdrv: usbhc_iface now shares memory instead of sending data

Two more things that come along:
1) The two callbacks (read, write) were joined. As they were joined in

the only implementation (ddf_helpers) anyway, and now the code is
almost the same, we took the opportunity and joined them. The bad
thing about it is that there are not enough IPC arguments to
transfer the direction, so we still have to use two "interface IPC
methods".

2) The copying is still done by the former methods (usbhc_read and

usbhc_write) to ensure the page alignment, so this method just
moves the burden of copying from kernel to the caller (which is why
this is actually a performance regression).

But, the two sides can now resolve their issues separately. The caller
can prepare the memory area in advance, and HC can use the memory
directly if it can.

File:

• uspace/lib/usbhost/src/ddf_helpers.c (modified) (4 diffs)

uspace/lib/usbhost/src/ddf_helpers.c

@@ -254 +254 @@
 }
 
-/** Inbound communication interface function.
+/**
+ * Transfer issuing interface function.
+ *
  * @param fun DDF function.
  * @param target Communication target.
+ * @param dir Communication direction.
  * @param setup_data Data to use in setup stage (control transfers).
  * @param data Pointer to data buffer.
@@ -264 +267 @@
  * @return Error code.
  */
-static errno_t dev_read(ddf_fun_t *fun, usb_target_t target,
-    uint64_t setup_data, char *data, size_t size,
+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,
     usbhc_iface_transfer_callback_t callback, void *arg)
 {
@@ -283 +286 @@
                 return EBADMEM;
 
-        return bus_device_send_batch(dev, target, USB_DIRECTION_IN,
-            data, size, setup_data,
-            callback, arg, "READ");
-}
-
-/** Outbound communication interface function.
- * @param fun DDF function.
- * @param target Communication target.
- * @param setup_data Data to use in setup stage (control transfers).
- * @param data Pointer to data buffer.
- * @param size Size of the data buffer.
- * @param callback Function to call on communication end.
- * @param arg Argument passed to the callback function.
- * @return Error code.
- */
-static errno_t dev_write(ddf_fun_t *fun, usb_target_t target,
-    uint64_t setup_data, const char *data, size_t size,
-    usbhc_iface_transfer_callback_t callback, void *arg)
-{
-        assert(fun);
-        device_t *dev = ddf_fun_data_get(fun);
-        assert(dev);
-
-        target.address = dev->address;
-
-        if (!usb_target_is_valid(&target))
-                return EINVAL;
-
-        if (size > 0 && data == NULL)
-                return EBADMEM;
-
-        if (!callback && arg)
-                return EBADMEM;
-
-        return bus_device_send_batch(dev, target, USB_DIRECTION_OUT,
+        const char *name = (dir == USB_DIRECTION_IN) ? "READ" : "WRITE";
+
+        return bus_device_send_batch(dev, target, dir,
             (char *) data, size, setup_data,
-            callback, arg, "WRITE");
+            callback, arg, name);
 }
 
@@ -337 +308 @@
         .unregister_endpoint = unregister_endpoint,
 
-        .read = dev_read,
-        .write = dev_write,
+        .transfer = transfer,
 };