Changeset df6ded8 in mainline for uspace/drv/bus/usb/uhci/uhci_batch.h

Timestamp:

2018-02-28T16:37:50Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1b20da0

Parents:

f5e5f73 (diff), b2dca8de (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jakub Jermar <jakub@…> (2018-02-28 16:06:42)

git-committer:

Jakub Jermar <jakub@…> (2018-02-28 16:37:50)

Message:

Merge github.com:helenos-xhci-team/helenos

This commit merges support for USB 3 and generally refactors, fixes,
extends and cleans up the existing USB framework.

Notable additions and features:

• new host controller driver has been implemented to control various xHC models (among others, NEC Renesas uPD720200)
• isochronous data transfer mode
• support for explicit USB device removal
• USB tablet driver

File:

• uspace/drv/bus/usb/uhci/uhci_batch.h (modified) (7 diffs)

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Jan Vesely
+ * Copyright (c) 2018 Ondrej Hlavaty
  * All rights reserved.
  *
@@ -43 +44 @@
 #include <stddef.h>
 #include <usb/host/usb_transfer_batch.h>
+#include <usb/host/endpoint.h>
 
 #include "hw_struct/queue_head.h"
@@ -49 +51 @@
 /** 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
@@ -58 +62 @@
         /** Number of TDs used by the transfer */
         size_t td_count;
-        /** Data buffer, must be accessible by the UHCI hw */
-        void *device_buffer;
-        /** Generic transfer data */
-        usb_transfer_batch_t *usb_batch;
+        /* Setup data */
+        char *setup_buffer;
+        /** Backing TDs + setup_buffer */
+        dma_buffer_t uhci_dma_buffer;
         /** List element */
         link_t link;
 } 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 *);
+int uhci_transfer_batch_prepare(uhci_transfer_batch_t *);
+bool uhci_transfer_batch_check_completed(uhci_transfer_batch_t *);
+void uhci_transfer_batch_destroy(uhci_transfer_batch_t *);
 
 /** Get offset to setup buffer accessible to the HC hw.
@@ -74 +79 @@
  * @return Pointer to the setup buffer.
  */
-static inline void * uhci_transfer_batch_setup_buffer(
+static inline void *uhci_transfer_batch_setup_buffer(
     const uhci_transfer_batch_t *uhci_batch)
 {
         assert(uhci_batch);
-        assert(uhci_batch->device_buffer);
-        return uhci_batch->device_buffer + sizeof(qh_t) +
+        return uhci_batch->uhci_dma_buffer.virt + sizeof(qh_t) +
             uhci_batch->td_count * sizeof(td_t);
 }
@@ -87 +91 @@
  * @return Pointer to the data buffer.
  */
-static inline void * uhci_transfer_batch_data_buffer(
+static inline void *uhci_transfer_batch_data_buffer(
     const uhci_transfer_batch_t *uhci_batch)
 {
         assert(uhci_batch);
-        assert(uhci_batch->usb_batch);
-        return uhci_transfer_batch_setup_buffer(uhci_batch) +
-            uhci_batch->usb_batch->setup_size;
-}
-
-/** Aborts the batch.
- * Sets error to EINTR and size off transferd data to 0, before finishing the
- * batch.
- * @param uhci_batch Batch to abort.
- */
-static inline void uhci_transfer_batch_abort(uhci_transfer_batch_t *uhci_batch)
-{
-        assert(uhci_batch);
-        assert(uhci_batch->usb_batch);
-        uhci_batch->usb_batch->error = EINTR;
-        uhci_batch->usb_batch->transfered_size = 0;
-        uhci_transfer_batch_finish_dispose(uhci_batch);
+        return uhci_batch->base.dma_buffer.virt;
 }
 
@@ -120 +108 @@
 }
 
+static inline uhci_transfer_batch_t *uhci_transfer_batch_get(
+    usb_transfer_batch_t *b)
+{
+        assert(b);
+        return (uhci_transfer_batch_t *) b;
+}
+
 #endif