Changeset 45bf63c in mainline for uspace/drv/bus/usb/ohci/ohci_endpoint.c

Timestamp:

2011-10-30T15:35:36Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

20a3465, 3ce78580

Parents:

1737bfb (diff), e978ada (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 USB branch.

Cleanup libusbhost interfaces.
Fix few possible memory corruption/crashes and memory leaks.
Add device_remove hooks for usbflbk, usbhid.

File:

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

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

@@ -62 +62 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Disposes hcd endpoint structure
- *
- * @param[in] hcd_ep endpoint structure
- */
-static void ohci_endpoint_fini(endpoint_t *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);
-                free(instance);
-        }
-}
-/*----------------------------------------------------------------------------*/
 /** Creates new hcd endpoint representation.
  *
  * @param[in] ep USBD endpoint structure
- * @return pointer to a new hcd endpoint structure, NULL on failure.
+ * @return Error code.
  */
 int ohci_endpoint_init(hcd_t *hcd, endpoint_t *ep)
@@ -104 +89 @@
         ed_init(ohci_ep->ed, ep, ohci_ep->td);
         endpoint_set_hc_data(
-            ep, ohci_ep, ohci_endpoint_fini, ohci_ep_toggle_get, ohci_ep_toggle_set);
-        ohci_ep->hcd = hcd;
+            ep, ohci_ep, ohci_ep_toggle_get, ohci_ep_toggle_set);
         hc_enqueue_endpoint(hcd->private_data, ep);
         return EOK;
+}
+/*----------------------------------------------------------------------------*/
+/** Disposes hcd endpoint structure
+ *
+ * @param[in] hcd driver using this instance.
+ * @param[in] ep endpoint structure.
+ */
+void ohci_endpoint_fini(hcd_t *hcd, endpoint_t *ep)
+{
+        assert(hcd);
+        assert(ep);
+        ohci_endpoint_t *instance = ohci_endpoint_get(ep);
+        hc_dequeue_endpoint(hcd->private_data, ep);
+        if (instance) {
+                free32(instance->ed);
+                free32(instance->td);
+                free(instance);
+        }
+        endpoint_clear_hc_data(ep);
 }
 /**