Changes in / [89beb08:ea6a824] in mainline

Location:

uspace/drv/usbhub

Files:

• main.c (modified) (2 diffs)
• usbhub.c (modified) (4 diffs)
• usbhub_private.h (modified) (2 diffs)

uspace/drv/usbhub/main.c

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

uspace/drv/usbhub/usbhub.c

@@ -203 +203 @@
 
         //add the hub to list
-        fibril_mutex_lock(&usb_hub_list_lock);
+        futex_down(&usb_hub_list_lock);
         usb_lst_append(&usb_hub_list, hub_info);
-        fibril_mutex_unlock(&usb_hub_list_lock);
+        futex_up(&usb_hub_list_lock);
 
         dprintf(1, "hub info added to list");
@@ -445 +445 @@
          */
         usb_general_list_t * lst_item;
-        fibril_mutex_lock(&usb_hub_list_lock);
+        futex_down(&usb_hub_list_lock);
         for (lst_item = usb_hub_list.next;
                         lst_item != &usb_hub_list;
                         lst_item = lst_item->next) {
-                fibril_mutex_unlock(&usb_hub_list_lock);
+                futex_up(&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;
@@ -504 +503 @@
 
                 ipc_hangup(hc);
-                fibril_mutex_lock(&usb_hub_list_lock);
-        }
-        fibril_mutex_unlock(&usb_hub_list_lock);
+                futex_down(&usb_hub_list_lock);
+        }
+        futex_up(&usb_hub_list_lock);
 }
 

uspace/drv/usbhub/usbhub_private.h

@@ -43 +43 @@
 #include <bool.h>
 #include <driver.h>
-#include <fibril_synch.h>
+#include <futex.h>
 
 #include <usb/usb.h>
@@ -82 +82 @@
 
 /** Lock for hub list*/
-extern fibril_mutex_t usb_hub_list_lock;
+extern futex_t usb_hub_list_lock;