Changeset b4b534ac in mainline for uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h

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/include/usb/host/usb_transfer_batch.h (modified) (4 diffs)

uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h

@@ -37 +37 @@
 #define LIBUSBHOST_HOST_USB_TRANSFER_BATCH_H
 
-#include <adt/list.h>
+#include <usb/host/endpoint.h>
+#include <usb/usb.h>
 
+#include <assert.h>
+#include <stdbool.h>
+#include <sys/types.h>
 #include <usbhc_iface.h>
-#include <usb/usb.h>
-#include <usb/host/endpoint.h>
 
 #define USB_SETUP_PACKET_SIZE 8
@@ -67 +69 @@
          */
         size_t setup_size;
-        /** Host controller function, passed to callback function */
-        ddf_fun_t *fun;
 
         /** Actually used portion of the buffer
@@ -80 +80 @@
          */
         int error;
-
-        /** Driver specific data */
-        void *private_data;
-        /** Callback to properly remove driver data during destruction */
-        void (*private_data_dtor)(void *p_data);
 } usb_transfer_batch_t;
 
@@ -108 +103 @@
     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 *p_data)
+    void *arg
 );
 void usb_transfer_batch_destroy(const usb_transfer_batch_t *instance);