Changeset f9d0a86 in mainline for uspace/lib/usbhost/src/hcd.c

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/src/hcd.c (modified) (2 diffs)

uspace/lib/usbhost/src/hcd.c

@@ -82 +82 @@
 int hcd_send_batch(hcd_t *hcd, device_t *device, usb_target_t target,
     usb_direction_t direction, char *data, size_t size, uint64_t setup_data,
-    usb_transfer_batch_callback_t on_complete, void *arg, const char *name)
+    usbhc_iface_transfer_callback_t on_complete, void *arg, const char *name)
 {
         assert(hcd);
@@ -153 +153 @@
 } sync_data_t;
 
-static int sync_transfer_complete(usb_transfer_batch_t *batch)
+static int sync_transfer_complete(void *arg, int error, size_t transfered_size)
 {
-        sync_data_t *d = batch->on_complete_data;
+        sync_data_t *d = arg;
         assert(d);
-        d->transfered_size = batch->transfered_size;
-        d->error = batch->error;
+        d->transfered_size = transfered_size;
+        d->error = error;
         fibril_mutex_lock(&d->done_mtx);
         d->done = 1;