Changeset b02308e in mainline

Timestamp:

2011-08-25T10:40:37Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

27873be

Parents:

32e093e

Message:

OHCI: Use destructor instead of manual clearing.

Location:

uspace/drv/bus/usb/ohci

Files:

• hc.c (modified) (5 diffs)
• hcd_endpoint.c (modified) (4 diffs)
• hcd_endpoint.h (modified) (1 diff)

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

@@ -238 +238 @@
                 return ENOMEM;
 
-        hcd_endpoint_t *hcd_ep = hcd_endpoint_assign(ep);
-        if (hcd_ep == NULL) {
+        int ret = hcd_endpoint_assign(ep);
+        if (ret != EOK) {
                 endpoint_destroy(ep);
-                return ENOMEM;
-        }
-
-        int ret =
-            usb_endpoint_manager_register_ep(&instance->ep_manager, ep, size);
+                return ret;
+        }
+
+        ret = usb_endpoint_manager_register_ep(&instance->ep_manager, ep, size);
         if (ret != EOK) {
-                hcd_endpoint_clear(ep);
                 endpoint_destroy(ep);
                 return ret;
@@ -257 +255 @@
                 instance->registers->control &= ~C_CLE;
                 endpoint_list_add_ep(
-                    &instance->lists[ep->transfer_type], hcd_ep);
+                    &instance->lists[ep->transfer_type], hcd_endpoint_get(ep));
                 instance->registers->control_current = 0;
                 instance->registers->control |= C_CLE;
@@ -264 +262 @@
                 instance->registers->control &= ~C_BLE;
                 endpoint_list_add_ep(
-                    &instance->lists[ep->transfer_type], hcd_ep);
+                    &instance->lists[ep->transfer_type], hcd_endpoint_get(ep));
                 instance->registers->control |= C_BLE;
                 break;
@@ -271 +269 @@
                 instance->registers->control &= (~C_PLE & ~C_IE);
                 endpoint_list_add_ep(
-                    &instance->lists[ep->transfer_type], hcd_ep);
+                    &instance->lists[ep->transfer_type], hcd_endpoint_get(ep));
                 instance->registers->control |= C_PLE | C_IE;
                 break;
@@ -327 +325 @@
                         break;
                 }
-                hcd_endpoint_clear(ep);
         } else {
                 usb_log_warning("Endpoint without hcd equivalent structure.\n");

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

@@ -61 +61 @@
 }
 /*----------------------------------------------------------------------------*/
+/** Disposes hcd endpoint structure
+ *
+ * @param[in] hcd_ep endpoint structure
+ */
+static void hcd_ep_destroy(void *hcd_ep)
+{
+        if (hcd_ep) {
+                hcd_endpoint_t *instance = hcd_ep;
+                free32(instance->ed);
+                free32(instance->td);
+                free(instance);
+        }
+}
+/*----------------------------------------------------------------------------*/
 /** Creates new hcd endpoint representation.
  *
@@ -66 +80 @@
  * @return pointer to a new hcd endpoint structure, NULL on failure.
  */
-hcd_endpoint_t * hcd_endpoint_assign(endpoint_t *ep)
+int hcd_endpoint_assign(endpoint_t *ep)
 {
         assert(ep);
         hcd_endpoint_t *hcd_ep = malloc(sizeof(hcd_endpoint_t));
         if (hcd_ep == NULL)
-                return NULL;
+                return ENOMEM;
 
         hcd_ep->ed = malloc32(sizeof(ed_t));
         if (hcd_ep->ed == NULL) {
                 free(hcd_ep);
-                return NULL;
+                return ENOMEM;
         }
 
@@ -83 +97 @@
                 free32(hcd_ep->ed);
                 free(hcd_ep);
-                return NULL;
+                return ENOMEM;
         }
 
@@ -89 +103 @@
         ed_set_td(hcd_ep->ed, hcd_ep->td);
         endpoint_set_hc_data(
-            ep, hcd_ep, NULL, hcd_ep_toggle_get, hcd_ep_toggle_set);
+            ep, hcd_ep, hcd_ep_destroy, 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);
+        return EOK;
 }
 /**

uspace/drv/bus/usb/ohci/hcd_endpoint.h

@@ -52 +52 @@
 } hcd_endpoint_t;
 
-hcd_endpoint_t * hcd_endpoint_assign(endpoint_t *ep);
-void hcd_endpoint_clear(endpoint_t *ep);
+int hcd_endpoint_assign(endpoint_t *ep);
 
 /** Get and convert assigned hcd_endpoint_t structure