Changeset 5595841 in mainline for uspace/lib/drv/include/usbhc_iface.h

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/drv/include/usbhc_iface.h (modified) (2 diffs)

uspace/lib/drv/include/usbhc_iface.h

@@ -148 +148 @@
 extern errno_t usbhc_unregister_endpoint(async_exch_t *, const usb_pipe_desc_t *);
 
+extern errno_t usbhc_transfer(async_exch_t *, usb_endpoint_t, usb_direction_t,
+    uint64_t, void *, size_t, size_t *);
 extern errno_t usbhc_read(async_exch_t *, usb_endpoint_t, uint64_t, void *, size_t,
     size_t *);
@@ -166 +168 @@
         int (*unregister_endpoint)(ddf_fun_t *, const usb_pipe_desc_t *);
 
-        errno_t (*read)(ddf_fun_t *, usb_target_t,
-                uint64_t, char *, size_t,
-                usbhc_iface_transfer_callback_t, void *);
-        errno_t (*write)(ddf_fun_t *, usb_target_t,
-                uint64_t, const char *, size_t,
+        errno_t (*transfer)(ddf_fun_t *, usb_target_t,
+                usb_direction_t, uint64_t, char *, size_t,
                 usbhc_iface_transfer_callback_t, void *);
 } usbhc_iface_t;