Changeset 5fd9c30 in mainline for uspace/drv/bus/usb/uhci/uhci_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/uhci/uhci_batch.h (modified) (6 diffs)

uspace/drv/bus/usb/uhci/uhci_batch.h

@@ -43 +43 @@
 #include <stddef.h>
 #include <usb/host/usb_transfer_batch.h>
+#include <usb/host/endpoint.h>
 
 #include "hw_struct/queue_head.h"
@@ -49 +50 @@
 /** UHCI specific data required for USB transfer */
 typedef struct uhci_transfer_batch {
+        usb_transfer_batch_t base;
+
         /** Queue head
          * This QH is used to maintain UHCI schedule structure and the element
@@ -66 +69 @@
 } uhci_transfer_batch_t;
 
-uhci_transfer_batch_t * uhci_transfer_batch_get(usb_transfer_batch_t *batch);
-void uhci_transfer_batch_finish_dispose(uhci_transfer_batch_t *uhci_batch);
-bool uhci_transfer_batch_is_complete(const uhci_transfer_batch_t *uhci_batch);
+uhci_transfer_batch_t * uhci_transfer_batch_create(endpoint_t *ep);
+int uhci_transfer_batch_prepare(uhci_transfer_batch_t *uhci_batch);
+bool uhci_transfer_batch_check_completed(uhci_transfer_batch_t *uhci_batch);
+void uhci_transfer_batch_destroy(uhci_transfer_batch_t *uhci_batch);
 
 /** Get offset to setup buffer accessible to the HC hw.
@@ -93 +97 @@
         assert(uhci_batch->usb_batch);
         return uhci_transfer_batch_setup_buffer(uhci_batch) +
-            uhci_batch->usb_batch->setup_size;
+            (uhci_batch->base.ep->transfer_type == USB_TRANSFER_CONTROL ? USB_SETUP_PACKET_SIZE : 0);
 }
 
@@ -107 +111 @@
         uhci_batch->usb_batch->error = EINTR;
         uhci_batch->usb_batch->transfered_size = 0;
-        uhci_transfer_batch_finish_dispose(uhci_batch);
+        usb_transfer_batch_finish(&uhci_batch->base);
 }
 
@@ -120 +124 @@
 }
 
+static inline uhci_transfer_batch_t *uhci_transfer_batch_get(usb_transfer_batch_t *b)
+{
+        assert(b);
+        return (uhci_transfer_batch_t *) b;
+}
+
 #endif