Changeset f9d0a86 in mainline for uspace/lib/usbhost

Timestamp:

2017-11-14T12:24:42Z (8 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.

Location:

uspace/lib/usbhost

Files:

• Makefile (modified) (1 diff)
• include/usb/host/hcd.h (modified) (2 diffs)
• include/usb/host/usb_transfer_batch.h (modified) (3 diffs)
• src/hcd.c (modified) (2 diffs)
• src/usb_transfer_batch.c (modified) (1 diff)

uspace/lib/usbhost/Makefile

@@ -30 +30 @@
 LIBRARY = libusbhost
 EXTRA_CFLAGS += \
-        -I$(LIBUSB_PREFIX)/include \
-        -I$(LIBDRV_PREFIX)/include \
-        -Iinclude/usb/host \
-        -Iinclude
+        -Iinclude/usb/host
+LIBS = usb drv
 
 SOURCES = \

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

@@ -46 +46 @@
 #include <stddef.h>
 #include <stdint.h>
+#include <usbhc_iface.h>
 
 typedef struct hcd hcd_t;
@@ -110 +111 @@
 extern int hcd_send_batch(hcd_t *, device_t *, usb_target_t,
     usb_direction_t direction, char *, size_t, uint64_t,
-    usb_transfer_batch_callback_t, void *, const char *);
+    usbhc_iface_transfer_callback_t, void *, const char *);
 
 extern ssize_t hcd_send_batch_sync(hcd_t *, device_t *, usb_target_t,

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;

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;

uspace/lib/usbhost/src/usb_transfer_batch.c

@@ -124 +124 @@
 
         if (batch->on_complete) {
-                const int err = batch->on_complete(batch);
+                const int err = batch->on_complete(batch->on_complete_data, batch->error, batch->transfered_size);
                 if (err)
                         usb_log_warning("batch %p failed to complete: %s",