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

Timestamp:

2017-10-13T09:21:22Z (8 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.c (moved) (moved from uspace/drv/bus/usb/ehci/ehci_endpoint.c ) (7 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2014 Jan Vesely
+ * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
  *
@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup drvusbehci
  * @{
@@ -35 +36 @@
 #include <assert.h>
 #include <stdlib.h>
+#include <usb/host/utils/malloc32.h>
+#include <usb/host/bandwidth.h>
 #include <usb/debug.h>
-#include <usb/host/utils/malloc32.h>
 
-#include "ehci_endpoint.h"
+#include "ehci_bus.h"
 #include "hc.h"
 
@@ -46 +48 @@
  * @param[in] toggle new value of toggle bit
  */
-static void ehci_ep_toggle_set(void *ehci_ep, int toggle)
+static void ehci_ep_toggle_set(endpoint_t *ep, bool toggle)
 {
-        ehci_endpoint_t *instance = ehci_ep;
+        ehci_endpoint_t *instance = ehci_endpoint_get(ep);
         assert(instance);
         assert(instance->qh);
+        ep->toggle = toggle;
         if (qh_toggle_from_td(instance->qh))
                 usb_log_warning("EP(%p): Setting toggle bit for transfer "
@@ -62 +65 @@
  * @return Current value of toggle bit.
  */
-static int ehci_ep_toggle_get(void *ehci_ep)
+static bool ehci_ep_toggle_get(endpoint_t *ep)
 {
-        ehci_endpoint_t *instance = ehci_ep;
+        ehci_endpoint_t *instance = ehci_endpoint_get(ep);
         assert(instance);
         assert(instance->qh);
+
         if (qh_toggle_from_td(instance->qh))
                 usb_log_warning("EP(%p): Reading useless toggle bit", instance);
@@ -73 +77 @@
 
 /** Creates new hcd endpoint representation.
- *
- * @param[in] ep USBD endpoint structure
- * @return Error code.
  */
-int ehci_endpoint_init(hcd_t *hcd, endpoint_t *ep)
+static endpoint_t *ehci_endpoint_create(bus_t *bus)
 {
-        assert(ep);
-        hc_t *hc = hcd_get_driver_data(hcd);
+        assert(bus);
 
         ehci_endpoint_t *ehci_ep = malloc(sizeof(ehci_endpoint_t));
         if (ehci_ep == NULL)
-                return ENOMEM;
+                return NULL;
+
+        endpoint_init(&ehci_ep->base, bus);
 
         ehci_ep->qh = malloc32(sizeof(qh_t));
         if (ehci_ep->qh == NULL) {
                 free(ehci_ep);
-                return ENOMEM;
+                return NULL;
         }
 
-        usb_log_debug2("EP(%p): Creating for %p", ehci_ep, ep);
         link_initialize(&ehci_ep->link);
-        qh_init(ehci_ep->qh, ep);
-        endpoint_set_hc_data(
-            ep, ehci_ep, ehci_ep_toggle_get, ehci_ep_toggle_set);
-        hc_enqueue_endpoint(hc, ep);
         return EOK;
 }
@@ -106 +103 @@
  * @param[in] ep endpoint structure.
  */
-void ehci_endpoint_fini(hcd_t *hcd, endpoint_t *ep)
+static void ehci_endpoint_destroy(endpoint_t *ep)
 {
-        assert(hcd);
         assert(ep);
-        hc_t *hc = hcd_get_driver_data(hcd);
+        ehci_endpoint_t *instance = ehci_endpoint_get(ep);
 
-        ehci_endpoint_t *instance = ehci_endpoint_get(ep);
-        hc_dequeue_endpoint(hc, ep);
-        endpoint_clear_hc_data(ep);
-        usb_log_debug2("EP(%p): Destroying for %p", instance, ep);
-        if (instance) {
-                free32(instance->qh);
-                free(instance);
-        }
+        free32(instance->qh);
+        free(instance);
 }
+
+
+static int ehci_register_ep(bus_t *bus_base, endpoint_t *ep)
+{
+        ehci_bus_t *bus = (ehci_bus_t *) bus_base;
+        ehci_endpoint_t *ehci_ep = ehci_endpoint_get(ep);
+
+        const int err = bus->parent_ops.register_endpoint(bus_base, ep);
+        if (err)
+                return err;
+
+        qh_init(ehci_ep->qh, ep);
+        hc_enqueue_endpoint(bus->hc, ep);
+
+        return EOK;
+}
+
+static int ehci_release_ep(bus_t *bus_base, endpoint_t *ep)
+{
+        ehci_bus_t *bus = (ehci_bus_t *) bus_base;
+        assert(bus);
+        assert(ep);
+
+        const int err = bus->parent_ops.release_endpoint(bus_base, ep);
+        if (err)
+                return err;
+
+        hc_dequeue_endpoint(bus->hc, ep);
+        return EOK;
+
+}
+
+int ehci_bus_init(ehci_bus_t *bus, hc_t *hc)
+{
+        assert(hc);
+        assert(bus);
+
+        // FIXME: Implement the USB2 bw counting.
+        usb2_bus_init(&bus->base, BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
+
+        bus_ops_t *ops = &bus->base.base.ops;
+        bus->parent_ops = *ops;
+        ops->create_endpoint = ehci_endpoint_create;
+        ops->destroy_endpoint = ehci_endpoint_destroy;
+        ops->endpoint_set_toggle = ehci_ep_toggle_set;
+        ops->endpoint_get_toggle = ehci_ep_toggle_get;
+
+        ops->register_endpoint = ehci_register_ep;
+        ops->release_endpoint = ehci_release_ep;
+
+        return EOK;
+}
+
 /**
  * @}
  */
-