Changeset 5fd9c30 in mainline for uspace/drv/bus/usb/ehci/ehci_batch.h

Timestamp:

2017-10-21T20:52:56Z (8 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/ehci_batch.h (modified) (3 diffs)

uspace/drv/bus/usb/ehci/ehci_batch.h

@@ -45 +45 @@
 /** EHCI specific data required for USB transfer */
 typedef struct ehci_transfer_batch {
+        usb_transfer_batch_t base;
         /** Link */
         link_t link;
@@ -59 +60 @@
 } ehci_transfer_batch_t;
 
-ehci_transfer_batch_t * ehci_transfer_batch_get(usb_transfer_batch_t *batch);
-bool ehci_transfer_batch_is_complete(const ehci_transfer_batch_t *batch);
+ehci_transfer_batch_t * ehci_transfer_batch_create(endpoint_t *ep);
+int ehci_transfer_batch_prepare(ehci_transfer_batch_t *batch);
 void ehci_transfer_batch_commit(const ehci_transfer_batch_t *batch);
-void ehci_transfer_batch_finish_dispose(ehci_transfer_batch_t *batch);
+bool ehci_transfer_batch_check_completed(ehci_transfer_batch_t *batch);
+void ehci_transfer_batch_destroy(ehci_transfer_batch_t *batch);
 
 static inline ehci_transfer_batch_t *ehci_transfer_batch_from_link(link_t *l)
@@ -69 +71 @@
         return list_get_instance(l, ehci_transfer_batch_t, link);
 }
+
+static inline ehci_transfer_batch_t * ehci_transfer_batch_get(usb_transfer_batch_t *usb_batch)
+{
+        assert(usb_batch);
+
+        return (ehci_transfer_batch_t *) usb_batch;
+}
+
 #endif
 /**