Changeset 7a51d75 in mainline for uspace/drv/usbhub/usbhub.c

Timestamp:

2011-01-28T15:30:42Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

ea991e84

Parents:

c5c003c (diff), 2b96463 (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 development/ changes

File:

• uspace/drv/usbhub/usbhub.c (modified) (4 diffs)

uspace/drv/usbhub/usbhub.c

@@ -203 +203 @@
 
         //add the hub to list
-        futex_down(&usb_hub_list_lock);
+        fibril_mutex_lock(&usb_hub_list_lock);
         usb_lst_append(&usb_hub_list, hub_info);
-        futex_up(&usb_hub_list_lock);
+        fibril_mutex_unlock(&usb_hub_list_lock);
 
         dprintf(1, "hub info added to list");
@@ -445 +445 @@
          */
         usb_general_list_t * lst_item;
-        futex_down(&usb_hub_list_lock);
+        fibril_mutex_lock(&usb_hub_list_lock);
         for (lst_item = usb_hub_list.next;
                         lst_item != &usb_hub_list;
                         lst_item = lst_item->next) {
-                futex_up(&usb_hub_list_lock);
+                fibril_mutex_unlock(&usb_hub_list_lock);
                 usb_hub_info_t * hub_info = ((usb_hub_info_t*)lst_item->data);
                 /*
@@ -488 +488 @@
 
                 if (opResult != EOK) {
+                        free(change_bitmap);
                         dprintf(1, "something went wrong while getting status of hub");
                         continue;
@@ -503 +504 @@
 
                 ipc_hangup(hc);
-                futex_down(&usb_hub_list_lock);
-        }
-        futex_up(&usb_hub_list_lock);
+                fibril_mutex_lock(&usb_hub_list_lock);
+        }
+        fibril_mutex_unlock(&usb_hub_list_lock);
 }