Changeset 7a51d75 in mainline for uspace/drv

Timestamp:

2011-01-28T15:30:42Z (15 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

Location:

uspace/drv

Files:

• usbhub/main.c (modified) (2 diffs)
• usbhub/usbhub.c (modified) (4 diffs)
• usbhub/usbhub_private.h (modified) (2 diffs)
• vhc/hub.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);

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

uspace/drv/usbhub/usbhub_private.h

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

uspace/drv/vhc/hub.c

@@ -63 +63 @@
             = fibril_create(hub_register_in_devman_fibril, hc_dev);
         if (root_hub_registration == 0) {
-                printf(NAME ": failed to register root hub\n");
+                printf(NAME ": failed to create hub registration fibril\n");
                 return;
         }
@@ -79 +79 @@
         device_t *hc_dev = (device_t *) arg;
 
-        int hc = usb_drv_hc_connect(hc_dev, hc_dev->handle, IPC_FLAG_BLOCKING);
-        if (hc < 0) {
-                printf(NAME ": failed to register root hub\n");
-                return hc;
-        }
+        int hc;
+        do {
+                hc = usb_drv_hc_connect(hc_dev, hc_dev->handle,
+                    IPC_FLAG_BLOCKING);
+        } while (hc < 0);
 
         usb_drv_reserve_default_address(hc);