Changeset df6ded8 in mainline for uspace/drv/bus/usb/ohci/ohci_bus.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/ohci/ohci_bus.h (moved) (moved from uspace/drv/bus/usb/ohci/ohci_endpoint.h ) (3 diffs)

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Jan Vesely
+ * Copyright (c) 2018 Ondrej Hlavaty
  * All rights reserved.
  *
@@ -32 +33 @@
  * @brief OHCI driver
  */
-#ifndef DRV_OHCI_HCD_ENDPOINT_H
-#define DRV_OHCI_HCD_ENDPOINT_H
+#ifndef DRV_OHCI_HCD_BUS_H
+#define DRV_OHCI_HCD_BUS_H
 
 #include <assert.h>
 #include <adt/list.h>
-#include <usb/host/endpoint.h>
-#include <usb/host/hcd.h>
+#include <usb/dma_buffer.h>
+#include <usb/host/usb2_bus.h>
 
 #include "hw_struct/endpoint_descriptor.h"
 #include "hw_struct/transfer_descriptor.h"
 
-/** Connector structure linking ED to to prepared TD. */
+/**
+ * Connector structure linking ED to to prepared TD.
+ *
+ * OHCI requires new transfers to be appended at the end of a queue. But it has
+ * a weird semantics of a leftover TD, which serves as a placeholder. This left
+ * TD is overwritten with first TD of a new transfer, and the spare one is used
+ * as the next placeholder. Then the two are swapped for the next transaction.
+ */
 typedef struct ohci_endpoint {
+        endpoint_t base;
+
         /** OHCI endpoint descriptor */
         ed_t *ed;
-        /** Currently enqueued transfer descriptor */
-        td_t *td;
-        /** Linked list used by driver software */
-        link_t link;
+        /** TDs to be used at the beginning and end of transaction */
+        td_t *tds [2];
+
+        /** Buffer to back ED + 2 TD */
+        dma_buffer_t dma_buffer;
+
+        /** Link in endpoint_list*/
+        link_t eplist_link;
+        /** Link in pending_endpoints */
+        link_t pending_link;
 } ohci_endpoint_t;
 
-errno_t ohci_endpoint_init(hcd_t *hcd, endpoint_t *ep);
-void ohci_endpoint_fini(hcd_t *hcd, endpoint_t *ep);
+typedef struct hc hc_t;
+
+typedef struct {
+        bus_t base;
+        usb2_bus_helper_t helper;
+        hc_t *hc;
+} ohci_bus_t;
+
+errno_t ohci_bus_init(ohci_bus_t *, hc_t *);
+void ohci_ep_toggle_reset(endpoint_t *);
 
 /** Get and convert assigned ohci_endpoint_t structure
@@ -63 +87 @@
 {
         assert(ep);
-        return ep->hc_data.data;
+        return (ohci_endpoint_t *) ep;
 }