Changeset 327f147 in mainline for uspace/lib/drv

Timestamp:

2017-10-23T19:03:37Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

b724494

Parents:

e160bfe8

Message:

usbhost: change parameters of methods

Pass (device_t, usb_target_t) to read and write, which finally allows to drop hash tables and access device right away. Then, all callbacks to complete transfer now uses usb_transfer_batch. This requires libdrv to include libusbhost, but it is not linked against it - it is there only to share definition of usb_transfer_batch_t.

Location:

uspace/lib/drv

Files:

• Makefile (modified) (1 diff)
• generic/remote_usb.c (modified) (4 diffs)
• include/usb_iface.h (modified) (2 diffs)

uspace/lib/drv/Makefile

@@ -33 +33 @@
         -Igeneric/private \
         -I$(LIBUSB_PREFIX)/include \
+        -I$(LIBUSBHOST_PREFIX)/include \
         -I$(LIBPCM_PREFIX)/include
 LIBRARY = libdrv

uspace/lib/drv/generic/remote_usb.c

@@ -38 +38 @@
 #include <errno.h>
 #include <devman.h>
+#include <usb/host/usb_transfer_batch.h>
 
 #include "usb_iface.h"
@@ -539 +540 @@
 }
 
-static void callback_out(int outcome, void *arg)
-{
-        async_transaction_t *trans = arg;
-
-        async_answer_0(trans->caller, outcome);
+static int callback_out(usb_transfer_batch_t *batch)
+{
+        async_transaction_t *trans = batch->on_complete_data;
+
+        const int err = async_answer_0(trans->caller, batch->error);
 
         async_transaction_destroy(trans);
-}
-
-static void callback_in(int outcome, size_t actual_size, void *arg)
-{
-        async_transaction_t *trans = (async_transaction_t *)arg;
-
-        if (outcome != EOK) {
-                async_answer_0(trans->caller, outcome);
-                if (trans->data_caller) {
+
+        return err;
+}
+
+static int callback_in(usb_transfer_batch_t *batch)
+{
+        async_transaction_t *trans = batch->on_complete_data;
+
+        if (trans->data_caller) {
+                if (batch->error == EOK) {
+                        batch->error = async_data_read_finalize(trans->data_caller,
+                            trans->buffer, batch->transfered_size);
+                } else {
                         async_answer_0(trans->data_caller, EINTR);
                 }
-                async_transaction_destroy(trans);
-                return;
-        }
-
-        if (trans->data_caller) {
-                async_data_read_finalize(trans->data_caller,
-                    trans->buffer, actual_size);
-        }
-
-        async_answer_0(trans->caller, EOK);
-
+        }
+
+        const int err = async_answer_0(trans->caller, batch->error);
         async_transaction_destroy(trans);
+        return err;
 }
 
@@ -611 +609 @@
         }
 
+        const usb_target_t target = {{
+                /* .address is initialized by read itself */
+                .endpoint = ep,
+        }};
+
         const int rc = usb_iface->read(
-            fun, ep, setup, trans->buffer, size, callback_in, trans);
+            fun, target, setup, trans->buffer, size, callback_in, trans);
 
         if (rc != EOK) {
@@ -659 +662 @@
         }
 
+        const usb_target_t target = {{
+                /* .address is initialized by write itself */
+                .endpoint = ep,
+        }};
+
         const int rc = usb_iface->write(
-            fun, ep, setup, trans->buffer, size, callback_out, trans);
+            fun, target, setup, trans->buffer, size, callback_out, trans);
 
         if (rc != EOK) {

uspace/lib/drv/include/usb_iface.h

@@ -64 +64 @@
     size_t);
 
-/** Callback for outgoing transfer. */
-typedef void (*usb_iface_transfer_out_callback_t)(int, void *);
+/** Defined in usb/host/usb_transfer_batch.h */
+typedef struct usb_transfer_batch usb_transfer_batch_t;
 
-/** Callback for incoming transfer. */
-typedef void (*usb_iface_transfer_in_callback_t)(int, size_t, void *);
+/** Callback for outgoing transfer - clone of usb_transfer_batch_callback_t */
+typedef int (*usb_iface_transfer_callback_t)(usb_transfer_batch_t *);
 
 /** USB device communication interface. */
@@ -84 +84 @@
         int (*unregister_endpoint)(ddf_fun_t *, usb_endpoint_desc_t *);
 
-        int (*read)(ddf_fun_t *, usb_endpoint_t, uint64_t, uint8_t *, size_t,
-            usb_iface_transfer_in_callback_t, void *);
-        int (*write)(ddf_fun_t *, usb_endpoint_t, uint64_t, const uint8_t *,
-            size_t, usb_iface_transfer_out_callback_t, void *);
+        int (*read)(ddf_fun_t *, usb_target_t,
+                uint64_t, char *, size_t,
+                usb_iface_transfer_callback_t, void *);
+        int (*write)(ddf_fun_t *, usb_target_t,
+                uint64_t, const char *, size_t,
+                usb_iface_transfer_callback_t, void *);
 } usb_iface_t;