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

Timestamp:

2017-11-14T12:24:42Z (6 years ago)

Author:

Aearsis <Hlavaty.Ondrej@…>

Branches:

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

Children:

6cad776

Parents:

887c9de (diff), d2d142a (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.

git-author:

Aearsis <Hlavaty.Ondrej@…> (2017-11-14 01:04:19)

git-committer:

Aearsis <Hlavaty.Ondrej@…> (2017-11-14 12:24:42)

Message:

Merge tag '0.7.1'

The merge wasn't clean, because of changes in build system. The most
significant change was partial revert of usbhc callback refactoring,
which now does not take usb transfer batch, but few named fields again.

File:

• uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h (modified) (3 diffs)

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

@@ -39 +39 @@
 #include <usb/usb.h>
 #include <usb/request.h>
+#include <usbhc_iface.h>
 
 #include <atomic.h>
@@ -49 +50 @@
 typedef struct endpoint endpoint_t;
 typedef struct bus bus_t;
-typedef struct usb_transfer_batch usb_transfer_batch_t;
-
-/** Callback to be called on transfer. */
-typedef int (*usb_transfer_batch_callback_t)(usb_transfer_batch_t *);
 
 /** Structure stores additional data needed for communication with EP */
@@ -69 +66 @@
 
         /** Function called on completion */
-        usb_transfer_batch_callback_t on_complete;
+        usbhc_iface_transfer_callback_t on_complete;
         /** Arbitrary data for the handler */
         void *on_complete_data;