Changeset 741bcdeb in mainline for uspace/drv/bus/usb/ehci/ehci_bus.h

Timestamp:

2017-10-13T09:21:22Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

c0e4b5b2

Parents:

e6b9182

Message:

WIP usbhost refactoring: ehci completed

vhc to go…

File:

• uspace/drv/bus/usb/ehci/ehci_bus.h (moved) (moved from uspace/drv/bus/usb/ehci/ehci_endpoint.h ) (5 diffs)

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Jan Vesely
+ * Copyright (c) 2017 Ondrej Hlavaty <aearsis@eideo.cz>
  * All rights reserved.
  *
@@ -32 +33 @@
  * @brief EHCI driver
  */
-#ifndef DRV_EHCI_HCD_ENDPOINT_H
-#define DRV_EHCI_HCD_ENDPOINT_H
+#ifndef DRV_EHCI_HCD_BUS_H
+#define DRV_EHCI_HCD_BUS_H
 
 #include <assert.h>
 #include <adt/list.h>
+#include <usb/host/usb2_bus.h>
 #include <usb/host/endpoint.h>
-#include <usb/host/hcd.h>
 
 #include "hw_struct/queue_head.h"
-#include "hw_struct/transfer_descriptor.h"
 
 /** Connector structure linking ED to to prepared TD. */
 typedef struct ehci_endpoint {
+        /* Inheritance */
+        endpoint_t base;
+
         /** EHCI endpoint descriptor */
         qh_t *qh;
@@ -51 +54 @@
 } ehci_endpoint_t;
 
-int ehci_endpoint_init(hcd_t *hcd, endpoint_t *ep);
-void ehci_endpoint_fini(hcd_t *hcd, endpoint_t *ep);
+typedef struct hc hc_t;
+
+typedef struct {
+        usb2_bus_t base;
+        hc_t *hc;
+
+        /* Stored original ops from base, they are called in our handlers */
+        bus_ops_t parent_ops;
+} ehci_bus_t;
+
+int ehci_bus_init(ehci_bus_t *, hc_t *);
 
 /** Get and convert assigned ehci_endpoint_t structure
@@ -61 +73 @@
 {
         assert(ep);
-        return ep->hc_data.data;
+        return (ehci_endpoint_t *) ep;
 }
 
@@ -73 +85 @@
  * @}
  */
-