Changeset 9097c16a in mainline for uspace/drv/usbhub/main.c

Timestamp:

2011-02-04T13:14:14Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

9e7cdf8

Parents:

11797d5 (diff), ff244e6 (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:

Merged development

File:

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

uspace/drv/usbhub/main.c

@@ -27 +27 @@
  */
 
+/** @addtogroup drvusbhub
+ * @{
+ */
+
 #include <driver.h>
 #include <errno.h>
@@ -38 +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 = {
@@ -60 +64 @@
 int main(int argc, char *argv[])
 {
-        usb_dprintf_enable(NAME,1);
-        futex_initialize(&usb_hub_list_lock, 0);
+        usb_dprintf_enable(NAME, 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);
         if (fid == 0) {
-                dprintf(1, "failed to start fibril for HUB devices");
-                //printf("%s: failed to start fibril for HUB devices\n", NAME);
+                fprintf(stderr, NAME ": failed to start monitoring fibril," \
+                    " driver aborting.\n");
                 return ENOMEM;
         }
@@ -74 +81 @@
         return driver_main(&hub_driver);
 }
+
+/**
+ * @}
+ */
+