Changeset df6ded8 in mainline for uspace/drv/bus/usb/ohci/ohci_batch.h

Timestamp:

2018-02-28T16:37:50Z (7 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/ohci/ohci_batch.h (modified) (3 diffs)

uspace/drv/bus/usb/ohci/ohci_batch.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Jan Vesely
+ * Copyright (c) 2018 Ondrej Hlavaty
  * All rights reserved.
  *
@@ -38 +39 @@
 #include <assert.h>
 #include <stdbool.h>
+#include <usb/dma_buffer.h>
 #include <usb/host/usb_transfer_batch.h>
 
@@ -45 +47 @@
 /** OHCI specific data required for USB transfer */
 typedef struct ohci_transfer_batch {
-        /** Link */
-        link_t link;
-        /** Endpoint descriptor of the target endpoint. */
-        ed_t *ed;
-        /** List of TDs needed for the transfer */
-        td_t **tds;
+        usb_transfer_batch_t base;
+
         /** Number of TDs used by the transfer */
         size_t td_count;
-        /** Data buffer, must be accessible by the OHCI hw. */
-        char *device_buffer;
-        /** Generic USB transfer structure */
-        usb_transfer_batch_t *usb_batch;
+
+        /**
+         * List of TDs needed for the transfer - together with setup data
+         * backed by the dma buffer. Note that the TD pointers are pointing to
+         * the DMA buffer initially, but as the scheduling must use the first TD
+         * from EP, it is replaced.
+         */
+        td_t **tds;
+        char *setup_buffer;
+        char *data_buffer;
+
+        dma_buffer_t ohci_dma_buffer;
 } ohci_transfer_batch_t;
 
-ohci_transfer_batch_t * ohci_transfer_batch_get(usb_transfer_batch_t *batch);
-bool ohci_transfer_batch_is_complete(const ohci_transfer_batch_t *batch);
+ohci_transfer_batch_t *ohci_transfer_batch_create(endpoint_t *batch);
+int ohci_transfer_batch_prepare(ohci_transfer_batch_t *ohci_batch);
 void ohci_transfer_batch_commit(const ohci_transfer_batch_t *batch);
-void ohci_transfer_batch_finish_dispose(ohci_transfer_batch_t *batch);
+bool ohci_transfer_batch_check_completed(ohci_transfer_batch_t *batch);
+void ohci_transfer_batch_destroy(ohci_transfer_batch_t *ohci_batch);
 
-static inline ohci_transfer_batch_t *ohci_transfer_batch_from_link(link_t *l)
+static inline ohci_transfer_batch_t *ohci_transfer_batch_get(
+    usb_transfer_batch_t *usb_batch)
 {
-        assert(l);
-        return list_get_instance(l, ohci_transfer_batch_t, link);
+        assert(usb_batch);
+
+        return (ohci_transfer_batch_t *) usb_batch;
 }
+
 #endif
 /**