Changeset df6ded8 in mainline for uspace/drv/bus/usb/ehci/ehci_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/ehci/ehci_batch.h (modified) (3 diffs)

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2014 Jan Vesely
+ * Copyright (c) 2018 Ondrej Hlavaty
  * All rights reserved.
  *
@@ -39 +40 @@
 #include <stdbool.h>
 #include <usb/host/usb_transfer_batch.h>
+#include <usb/dma_buffer.h>
 
 #include "hw_struct/queue_head.h"
@@ -45 +47 @@
 /** EHCI specific data required for USB transfer */
 typedef struct ehci_transfer_batch {
-        /** Link */
-        link_t link;
+        usb_transfer_batch_t base;
+        /** Number of TDs used by the transfer */
+        size_t td_count;
         /** Endpoint descriptor of the target endpoint. */
         qh_t *qh;
-        /** List of TDs needed for the transfer */
-        td_t **tds;
-        /** Number of TDs used by the transfer */
-        size_t td_count;
-        /** Data buffer, must be accessible by the EHCI hw. */
-        char *device_buffer;
+        /** Backend for TDs and setup data. */
+        dma_buffer_t ehci_dma_buffer;
+        /** List of TDs needed for the transfer - backed by dma_buffer */
+        td_t *tds;
+        /** Data buffers - backed by dma_buffer */
+        void *setup_buffer;
+        void *data_buffer;
         /** Generic USB transfer structure */
         usb_transfer_batch_t *usb_batch;
 } 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)
+static inline ehci_transfer_batch_t *ehci_transfer_batch_get(
+    usb_transfer_batch_t *usb_batch)
 {
-        assert(l);
-        return list_get_instance(l, ehci_transfer_batch_t, link);
+        assert(usb_batch);
+
+        return (ehci_transfer_batch_t *) usb_batch;
 }
+
 #endif
 /**