Changeset b4b534ac in mainline for uspace/drv/bus/usb/ehci/ehci_endpoint.h

Timestamp:

2016-07-22T08:24:47Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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.

Message:

Merge from lp:~jan.vesely/helenos/usb

File:

• uspace/drv/bus/usb/ehci/ehci_endpoint.h (moved) (moved from uspace/drv/bus/usb/uhcirh/root_hub.h ) (1 diff)

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

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup drvusbuhcirh
+/** @addtogroup drvusbehci
  * @{
  */
 /** @file
- * @brief UHCI driver
+ * @brief EHCI driver
  */
-#ifndef DRV_UHCI_ROOT_HUB_H
-#define DRV_UHCI_ROOT_HUB_H
+#ifndef DRV_EHCI_HCD_ENDPOINT_H
+#define DRV_EHCI_HCD_ENDPOINT_H
 
-#include <ddf/driver.h>
-#include <device/hw_res_parsed.h>
+#include <assert.h>
+#include <adt/list.h>
+#include <usb/host/endpoint.h>
+#include <usb/host/hcd.h>
 
-#include "port.h"
+#include "hw_struct/queue_head.h"
+#include "hw_struct/transfer_descriptor.h"
 
-#define UHCI_ROOT_HUB_PORT_COUNT 2
-#define ROOT_HUB_WAIT_USEC 250000 /* 250 miliseconds */
+/** Connector structure linking ED to to prepared TD. */
+typedef struct ehci_endpoint {
+        /** EHCI endpoint descriptor */
+        qh_t *qh;
+        /** Linked list used by driver software */
+        link_t link;
+} ehci_endpoint_t;
 
-/** UHCI root hub drvier structure */
-typedef struct root_hub {
-        /** Ports provided by the hub */
-        uhci_port_t ports[UHCI_ROOT_HUB_PORT_COUNT];
-} uhci_root_hub_t;
+int ehci_endpoint_init(hcd_t *hcd, endpoint_t *ep);
+void ehci_endpoint_fini(hcd_t *hcd, endpoint_t *ep);
 
-int uhci_root_hub_init(uhci_root_hub_t *instance, addr_range_t *regs,
-    ddf_dev_t *rh);
+/** Get and convert assigned ehci_endpoint_t structure
+ * @param[in] ep USBD endpoint structure.
+ * @return Pointer to assigned hcd endpoint structure
+ */
+static inline ehci_endpoint_t * ehci_endpoint_get(const endpoint_t *ep)
+{
+        assert(ep);
+        return ep->hc_data.data;
+}
 
-void uhci_root_hub_fini(uhci_root_hub_t *instance);
+static inline ehci_endpoint_t * ehci_endpoint_list_instance(link_t *l)
+{
+        return list_get_instance(l, ehci_endpoint_t, link);
+}
+
 #endif
 /**
  * @}
  */
+