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

Timestamp:

2011-01-28T15:30:42Z (14 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/main.c (modified) (2 diffs)

uspace/drv/usbhub/main.c

@@ -42 +42 @@
 
 usb_general_list_t usb_hub_list;
-futex_t usb_hub_list_lock;
+fibril_mutex_t usb_hub_list_lock;
 
 static driver_ops_t hub_driver_ops = {
@@ -65 +65 @@
 {
         usb_dprintf_enable(NAME, 0);
-
-        futex_initialize(&usb_hub_list_lock, 0);
+        
+        fibril_mutex_initialize(&usb_hub_list_lock);
+        fibril_mutex_lock(&usb_hub_list_lock);
         usb_lst_init(&usb_hub_list);
-        futex_up(&usb_hub_list_lock);
+        fibril_mutex_unlock(&usb_hub_list_lock);
 
         fid_t fid = fibril_create(usb_hub_control_loop, NULL);