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

Timestamp:

2011-09-16T14:50:20Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

432a269, d1e18573

Parents:

47fecbb (diff), 82a31261 (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 USB changes from bzr://krabicka.net/orome/helenos/usb/

• Move common HC code from uhci/ohci drivers to libusbhost
• Rewrite USB HC interface to have common read/write functions for all transfer types.
• Restructure hc drivers to avoid some hooks and void* casts
• Cleanup the code and remove unnecessary mallocs.

File:

• uspace/drv/bus/usb/ohci/ohci_endpoint.c (moved) (moved from uspace/drv/bus/usb/ohci/hcd_endpoint.c ) (4 diffs)

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

@@ -33 +33 @@
  */
 #include "utils/malloc32.h"
-#include "hcd_endpoint.h"
+#include "ohci_endpoint.h"
+#include "hc.h"
 
 /** Callback to set toggle on ED.
@@ -40 +41 @@
  * @param[in] toggle new value of toggle bit
  */
-static void hcd_ep_toggle_set(void *hcd_ep, int toggle)
+static void ohci_ep_toggle_set(void *ohci_ep, int toggle)
 {
-        hcd_endpoint_t *instance = hcd_ep;
+        ohci_endpoint_t *instance = ohci_ep;
         assert(instance);
         assert(instance->ed);
@@ -53 +54 @@
  * @return Current value of toggle bit.
  */
-static int hcd_ep_toggle_get(void *hcd_ep)
+static int ohci_ep_toggle_get(void *ohci_ep)
 {
-        hcd_endpoint_t *instance = hcd_ep;
+        ohci_endpoint_t *instance = ohci_ep;
         assert(instance);
         assert(instance->ed);
         return ed_toggle_get(instance->ed);
+}
+/*----------------------------------------------------------------------------*/
+/** 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);
+        }
 }
 /*----------------------------------------------------------------------------*/
@@ -66 +82 @@
  * @return pointer to a new hcd endpoint structure, NULL on failure.
  */
-hcd_endpoint_t * hcd_endpoint_assign(endpoint_t *ep)
+int ohci_endpoint_init(hcd_t *hcd, endpoint_t *ep)
 {
         assert(ep);
-        hcd_endpoint_t *hcd_ep = malloc(sizeof(hcd_endpoint_t));
-        if (hcd_ep == NULL)
-                return NULL;
+        ohci_endpoint_t *ohci_ep = malloc(sizeof(ohci_endpoint_t));
+        if (ohci_ep == NULL)
+                return ENOMEM;
 
-        hcd_ep->ed = malloc32(sizeof(ed_t));
-        if (hcd_ep->ed == NULL) {
-                free(hcd_ep);
-                return NULL;
+        ohci_ep->ed = malloc32(sizeof(ed_t));
+        if (ohci_ep->ed == NULL) {
+                free(ohci_ep);
+                return ENOMEM;
         }
 
-        hcd_ep->td = malloc32(sizeof(td_t));
-        if (hcd_ep->td == NULL) {
-                free32(hcd_ep->ed);
-                free(hcd_ep);
-                return NULL;
+        ohci_ep->td = malloc32(sizeof(td_t));
+        if (ohci_ep->td == NULL) {
+                free32(ohci_ep->ed);
+                free(ohci_ep);
+                return ENOMEM;
         }
 
-        ed_init(hcd_ep->ed, ep);
-        ed_set_td(hcd_ep->ed, hcd_ep->td);
-        endpoint_set_hc_data(ep, hcd_ep, hcd_ep_toggle_get, hcd_ep_toggle_set);
-
-        return hcd_ep;
-}
-/*----------------------------------------------------------------------------*/
-/** Disposes assigned hcd endpoint structure
- *
- * @param[in] ep USBD endpoint structure
- */
-void hcd_endpoint_clear(endpoint_t *ep)
-{
-        assert(ep);
-        hcd_endpoint_t *hcd_ep = ep->hc_data.data;
-        assert(hcd_ep);
-        free32(hcd_ep->ed);
-        free32(hcd_ep->td);
-        free(hcd_ep);
+        ed_init(ohci_ep->ed, ep);
+        ed_set_td(ohci_ep->ed, 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;
+        hc_enqueue_endpoint(hcd->private_data, ep);
+        return EOK;
 }
 /**