Changeset b02308e in mainline for uspace/drv/bus/usb/ohci/hc.c

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.

File:

• uspace/drv/bus/usb/ohci/hc.c (modified) (5 diffs)

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");