Changes in uspace/lib/usbhost/src/usb_transfer_batch.c [8d2e251:9d58539] in mainline

File:

• uspace/lib/usbhost/src/usb_transfer_batch.c (modified) (7 diffs)

uspace/lib/usbhost/src/usb_transfer_batch.c

@@ -32 +32 @@
  * USB transfer transaction structures (implementation).
  */
+#include <errno.h>
+#include <macros.h>
+
+#include <usb/usb.h>
+#include <usb/debug.h>
 
 #include <usb/host/usb_transfer_batch.h>
-#include <usb/debug.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <macros.h>
-#include <mem.h>
-#include <stdlib.h>
-#include <usbhc_iface.h>
+#include <usb/host/hcd.h>
 
 /** Allocate and initialize usb_transfer_batch structure.
@@ -63 +61 @@
     usbhc_iface_transfer_in_callback_t func_in,
     usbhc_iface_transfer_out_callback_t func_out,
-    void *arg
+    void *arg,
+    ddf_fun_t *fun,
+    void *private_data,
+    void (*private_data_dtor)(void *)
     )
 {
@@ -80 +81 @@
                 instance->buffer_size = buffer_size;
                 instance->setup_size = 0;
+                instance->fun = fun;
+                instance->private_data = private_data;
+                instance->private_data_dtor = private_data_dtor;
                 instance->transfered_size = 0;
                 instance->error = EOK;
@@ -92 +96 @@
         return instance;
 }
-
+/*----------------------------------------------------------------------------*/
 /** Correctly dispose all used data structures.
  *
@@ -106 +110 @@
                 endpoint_release(instance->ep);
         }
+        if (instance->private_data) {
+                assert(instance->private_data_dtor);
+                instance->private_data_dtor(instance->private_data);
+        }
         free(instance);
 }
-
+/*----------------------------------------------------------------------------*/
 /** Prepare data and call the right callback.
  *
@@ -125 +133 @@
         /* NOTE: Only one of these pointers should be set. */
         if (instance->callback_out) {
-                instance->callback_out(error, instance->arg);
+                /* Check for commands that reset toggle bit */
+                if (instance->ep->transfer_type == USB_TRANSFER_CONTROL
+                    && error == EOK) {
+                        const usb_target_t target =
+                            {{ instance->ep->address, instance->ep->endpoint }};
+                        reset_ep_if_need(fun_to_hcd(instance->fun), target,
+                            instance->setup_buffer);
+                }
+                instance->callback_out(instance->fun, error, instance->arg);
         }
 
@@ -134 +150 @@
                         memcpy(instance->buffer, data, safe_size);
                 }
-                instance->callback_in(error, safe_size, instance->arg);
+                instance->callback_in(instance->fun, error,
+                    safe_size, instance->arg);
         }
 }