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

Timestamp:

2017-10-21T20:52:56Z (6 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/ohci/hc.c (modified) (2 diffs)

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

@@ -295 +295 @@
                 return ENOMEM;
 
+        const int err = ohci_transfer_batch_prepare(ohci_batch);
+        if (err)
+                return err;
+
         fibril_mutex_lock(&instance->guard);
         list_append(&ohci_batch->link, &instance->pending_batches);
@@ -346 +350 @@
                             ohci_transfer_batch_from_link(current);
 
-                        if (ohci_transfer_batch_is_complete(batch)) {
+                        if (ohci_transfer_batch_check_completed(batch)) {
                                 list_remove(current);
-                                ohci_transfer_batch_finish_dispose(batch);
+                                usb_transfer_batch_finish(&batch->base);
                         }