Changeset b4b534ac in mainline for uspace/lib/usbhost/src/usb_transfer_batch.c

Timestamp:

2016-07-22T08:24:47Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jan.vesely/helenos/usb

File:

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

uspace/lib/usbhost/src/usb_transfer_batch.c

@@ -32 +32 @@
  * USB transfer transaction structures (implementation).
  */
+
+#include <usb/host/usb_transfer_batch.h>
+#include <usb/debug.h>
+
+#include <assert.h>
 #include <errno.h>
 #include <macros.h>
-
-#include <usb/usb.h>
-#include <usb/debug.h>
-
-#include <usb/host/usb_transfer_batch.h>
-#include <usb/host/hcd.h>
+#include <mem.h>
+#include <stdlib.h>
+#include <usbhc_iface.h>
 
 /** Allocate and initialize usb_transfer_batch structure.
@@ -61 +63 @@
     usbhc_iface_transfer_in_callback_t func_in,
     usbhc_iface_transfer_out_callback_t func_out,
-    void *arg,
-    ddf_fun_t *fun,
-    void *private_data,
-    void (*private_data_dtor)(void *)
+    void *arg
     )
 {
@@ -81 +80 @@
                 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;
@@ -110 +106 @@
                 endpoint_release(instance->ep);
         }
-        if (instance->private_data) {
-                assert(instance->private_data_dtor);
-                instance->private_data_dtor(instance->private_data);
-        }
         free(instance);
 }
@@ -133 +125 @@
         /* NOTE: Only one of these pointers should be set. */
         if (instance->callback_out) {
-                /* 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);
+                instance->callback_out(error, instance->arg);
         }
 
@@ -150 +134 @@
                         memcpy(instance->buffer, data, safe_size);
                 }
-                instance->callback_in(instance->fun, error,
-                    safe_size, instance->arg);
+                instance->callback_in(error, safe_size, instance->arg);
         }
 }