Changeset 2b61945 in mainline for uspace/lib/usbhost/src

Timestamp:

2017-10-22T03:47:41Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

2e5aea1

Parents:

766043c

Message:

xhci: use device_t for bookkeeping

This started as a little refactoring to move active transfer batch to endpoint. Finding the EP in handler needs devices indexed by slot id. Then I found out we do not use the device_t extendable mechanism. Then there were a lot of errors found while doing all this…

Location:

uspace/lib/usbhost/src

Files:

• hcd.c (modified) (2 diffs)
• usb_transfer_batch.c (modified) (5 diffs)

uspace/lib/usbhost/src/hcd.c

@@ -41 +41 @@
 #include <errno.h>
 #include <usb_iface.h>
+#include <str_error.h>
 
 #include "hcd.h"
@@ -128 +129 @@
 
         const int ret = hcd->ops.schedule(hcd, batch);
-        if (ret != EOK)
+        if (ret != EOK) {
+                usb_log_warning("Batch %p failed to schedule: %s", batch, str_error(ret));
                 usb_transfer_batch_destroy(batch);
+        }
 
         /* Drop our own reference to ep. */

uspace/lib/usbhost/src/usb_transfer_batch.c

@@ -40 +40 @@
 #include <assert.h>
 #include <errno.h>
+#include <str_error.h>
 
 
@@ -62 +63 @@
 void usb_transfer_batch_init(usb_transfer_batch_t *batch, endpoint_t *ep)
 {
+        endpoint_use(ep);
+
         memset(batch, 0, sizeof(*batch));
-
         batch->ep = ep;
-
-        endpoint_use(ep);
 }
 
@@ -103 +103 @@
         assert(batch->ep->bus);
 
-        usb_log_debug2("batch %p " USB_TRANSFER_BATCH_FMT " disposing.\n",
-            batch, USB_TRANSFER_BATCH_ARGS(*batch));
-
         bus_t *bus = batch->ep->bus;
-        if (bus->ops.destroy_batch)
+        if (bus->ops.destroy_batch) {
+                usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " destroying.\n",
+                    batch, USB_TRANSFER_BATCH_ARGS(*batch));
                 bus->ops.destroy_batch(batch);
-        else
+        }
+        else {
+                usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " disposing.\n",
+                    batch, USB_TRANSFER_BATCH_ARGS(*batch));
                 free(batch);
+        }
 
         endpoint_release(batch->ep);
@@ -123 +126 @@
 void usb_transfer_batch_finish(usb_transfer_batch_t *batch)
 {
-        if (!batch_complete(batch))
-                usb_log_warning("failed to complete batch %p!", batch);
+        const int err = batch_complete(batch);
+        if (err)
+                usb_log_warning("batch %p failed to complete: %s", batch, str_error(err));
 
         usb_transfer_batch_destroy(batch);
@@ -159 +163 @@
         struct old_handler_wrapper_data *data = malloc(sizeof(*data));
 
+        assert((!in_callback) != (!out_callback));
+
         data->in_callback = in_callback;
         data->out_callback = out_callback;