Changeset 5fd9c30 in mainline for uspace/drv/bus/usb/ehci/hc.c

Timestamp:

2017-10-21T20:52:56Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

766043c

Parents:

74b852b

Message:

usbhost refactoring: let transfer_batch be initialized by bus

Currently makes older HCs fail, work in progress.

File:

• uspace/drv/bus/usb/ehci/hc.c (modified) (2 diffs)

uspace/drv/bus/usb/ehci/hc.c

@@ -296 +296 @@
                 return ehci_rh_schedule(&instance->rh, batch);
         }
+
         ehci_transfer_batch_t *ehci_batch = ehci_transfer_batch_get(batch);
-        if (!ehci_batch)
-                return ENOMEM;
+
+        const int err = ehci_transfer_batch_prepare(ehci_batch);
+        if (err)
+                return err;
 
         fibril_mutex_lock(&instance->guard);
@@ -343 +346 @@
                             ehci_transfer_batch_from_link(current);
 
-                        if (ehci_transfer_batch_is_complete(batch)) {
+                        if (ehci_transfer_batch_check_completed(batch)) {
                                 list_remove(current);
-                                ehci_transfer_batch_finish_dispose(batch);
+                                usb_transfer_batch_finish(&batch->base);
                         }
                 }