Changeset 620c710 in mainline for uspace/drv/bus/usb/ohci/ohci_endpoint.c

Timestamp:

2011-08-25T14:21:57Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

961c29e8

Parents:

e20eaed

Message:

libushost: promote endpoint data dtor to destruction hook

ohci: use new usb c driver architecture

File:

• uspace/drv/bus/usb/ohci/ohci_endpoint.c (modified) (4 diffs)

uspace/drv/bus/usb/ohci/ohci_endpoint.c

@@ -34 +34 @@
 #include "utils/malloc32.h"
 #include "ohci_endpoint.h"
+#include "hc.h"
 
 /** Callback to set toggle on ED.
@@ -65 +66 @@
  * @param[in] hcd_ep endpoint structure
  */
-static void ohci_ep_destroy(void *ohci_ep)
+static void ohci_endpoint_fini(endpoint_t *ep)
 {
-        if (ohci_ep) {
-                ohci_endpoint_t *instance = ohci_ep;
+        ohci_endpoint_t *instance = ep->hc_data.data;
+        hc_dequeue_endpoint(instance->hcd->private_data, ep);
+        if (instance) {
                 free32(instance->ed);
                 free32(instance->td);
@@ -80 +82 @@
  * @return pointer to a new hcd endpoint structure, NULL on failure.
  */
-int ohci_endpoint_assign(hcd_t *hcd, endpoint_t *ep)
+int ohci_endpoint_init(hcd_t *hcd, endpoint_t *ep)
 {
         assert(ep);
@@ -103 +105 @@
         ed_set_td(ohci_ep->ed, ohci_ep->td);
         endpoint_set_hc_data(
-            ep, ohci_ep, ohci_ep_destroy, ohci_ep_toggle_get, ohci_ep_toggle_set);
-
+            ep, ohci_ep, ohci_endpoint_fini, ohci_ep_toggle_get, ohci_ep_toggle_set);
+        ohci_ep->hcd = hcd;
+        hc_enqueue_endpoint(hcd->private_data, ep);
         return EOK;
 }