Changeset 592369ae in mainline

Timestamp:

2011-04-13T13:09:18Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9a6fde4

Parents:

5a2c42b

Message:

Add proper locking to prevent use/remove race

Location:

uspace/drv/ohci

Files:

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

uspace/drv/ohci/hc.c

@@ -152 +152 @@
         hcd_endpoint_t *hcd_ep = hcd_endpoint_assign(ep);
         if (hcd_ep == NULL) {
-                free(ep);
+                endpoint_destroy(ep);
                 return ENOMEM;
         }
@@ -158 +158 @@
         ret = usb_endpoint_manager_register_ep(&instance->ep_manager, ep, size);
         if (ret != EOK) {
+                hcd_endpoint_clear(ep);
                 endpoint_destroy(ep);
                 return ret;
@@ -188 +189 @@
         }
 
-        return ret;
+        return EOK;
 }
 /*----------------------------------------------------------------------------*/
@@ -194 +195 @@
     usb_endpoint_t endpoint, usb_direction_t direction)
 {
+        assert(instance);
+        fibril_mutex_lock(&instance->guard);
         endpoint_t *ep = usb_endpoint_manager_get_ep(&instance->ep_manager,
             address, endpoint, direction, NULL);
         if (ep == NULL) {
-                usb_log_error("Endpoint unregister failed.\n");
+                usb_log_error("Endpoint unregister failed: No such EP.\n");
+                fibril_mutex_unlock(&instance->guard);
                 return ENOENT;
         }
@@ -232 +236 @@
                 usb_log_warning("Endpoint without hcd equivalent structure.\n");
         }
-        return usb_endpoint_manager_unregister_ep(&instance->ep_manager,
+        int ret = usb_endpoint_manager_unregister_ep(&instance->ep_manager,
             address, endpoint, direction);
+        fibril_mutex_unlock(&instance->guard);
+        return ret;
+}
+/*----------------------------------------------------------------------------*/
+endpoint_t * hc_get_endpoint(hc_t *instance, usb_address_t address,
+    usb_endpoint_t endpoint, usb_direction_t direction, size_t *bw)
+{
+        assert(instance);
+        fibril_mutex_lock(&instance->guard);
+        endpoint_t *ep = usb_endpoint_manager_get_ep(&instance->ep_manager,
+            address, endpoint, direction, bw);
+        fibril_mutex_unlock(&instance->guard);
+        return ep;
 }
 /*----------------------------------------------------------------------------*/

uspace/drv/ohci/hc.h

@@ -85 +85 @@
     usb_endpoint_t endpoint, usb_direction_t direction);
 
+endpoint_t * hc_get_endpoint(hc_t *instance, usb_address_t address,
+    usb_endpoint_t endpoint, usb_direction_t direction, size_t *bw);
+
 int hc_schedule(hc_t *instance, usb_transfer_batch_t *batch);
 

uspace/drv/ohci/iface.c

@@ -55 +55 @@
 
         size_t res_bw;
-        endpoint_t *ep = usb_endpoint_manager_get_ep(&(*hc)->ep_manager,
+        endpoint_t *ep = hc_get_endpoint(*hc,
             target.address, target.endpoint, direction, &res_bw);
         if (ep == NULL) {