Changeset f401312 in mainline for uspace/drv/usbhub/usbhub.c

Timestamp:

2011-01-14T12:34:42Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

45019865

Parents:

b2a6fcfe (diff), 6610565b (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 into lelian/hidd

File:

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

uspace/drv/usbhub/usbhub.c

@@ -75 +75 @@
         //get some hub info
         usb_address_t addr = usb_drv_get_my_address(hc, device);
-        dprintf(1,"[usb_hub] addres of newly created hub = %d", addr);
+        dprintf(1,"[usb_hub] address of newly created hub = %d", addr);
         /*if(addr<0){
                 //return result;
@@ -174 +174 @@
                 dprintf(1,"[usb_hub] THERE ARE NO CONFIGURATIONS AVAILABLE");
         }
+        /// \TODO check other configurations
         usb_standard_configuration_descriptor_t config_descriptor;
         opResult = usb_drv_req_get_bare_configuration_descriptor(hc,
@@ -194 +195 @@
         }
 
-
         for (port = 1; port < hub_info->port_count+1; ++port) {
                 usb_hub_set_power_port_request(&request, port);
@@ -205 +205 @@
         //ports powered, hub seems to be enabled
 
-
         ipc_hangup(hc);
 
         //add the hub to list
+        futex_down(&usb_hub_list_lock);
         usb_lst_append(&usb_hub_list, hub_info);
+        futex_up(&usb_hub_list_lock);
+
         dprintf(1,"[usb_hub] hub info added to list");
         //(void)hub_info;
@@ -233 +235 @@
 //
 //*********************************************
+
+/**
+ * convenience function for releasing default address and writing debug info
+ * (these few lines are used too often to be written again and again)
+ * @param hc
+ * @return
+ */
+inline static int usb_hub_release_default_address(int hc){
+        int opResult;
+        dprintf(1,"[usb_hub] releasing default address");
+        opResult = usb_drv_release_default_address(hc);
+        if (opResult != EOK) {
+                dprintf(1,"[usb_hub] failed to release default address");
+        }
+        return opResult;
+}
 
 /**
@@ -259 +277 @@
         if (opResult != EOK) {
                 dprintf(1,"[usb_hub] something went wrong when reseting a port");
-        }
-}
-
-/**
- * convenience function for releasing default address and writing debug info
- * (these few lines are used too often to be written again and again)
- * @param hc
- * @return
- */
-inline static int usb_hub_release_default_address(int hc){
-        int opResult;
-        dprintf(1,"[usb_hub] releasing default address");
-        opResult = usb_drv_release_default_address(hc);
-        if (opResult != EOK) {
-                dprintf(1,"[usb_hub] failed to release default address");
-        }
-        return opResult;
-}
-
+                usb_hub_release_default_address(hc);
+        }
+}
 
 /**
@@ -343 +345 @@
 
 /**
- * unregister device address in hc, close the port
+ * unregister device address in hc
  * @param hc
  * @param port
@@ -352 +354 @@
         //usb_device_request_setup_packet_t request;
         int opResult;
-        //disable port
-        /*usb_hub_set_disable_port_request(&request, port);
-        opResult = usb_drv_sync_control_write(
-                        hc, target,
-                        &request,
-                        NULL, 0
-                        );
-        if (opResult != EOK) {
-                //continue;
-                printf("[usb_hub] something went wrong when disabling a port\n");
-        }*/
+        
         /// \TODO remove device
 
@@ -457 +449 @@
          */
         usb_general_list_t * lst_item;
+        futex_down(&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);
                 usb_hub_info_t * hub_info = ((usb_hub_info_t*)lst_item->data);
                 /*
@@ -510 +504 @@
                         }
                 }
+                free(change_bitmap);
 
                 ipc_hangup(hc);
-        }
+                futex_down(&usb_hub_list_lock);
+        }
+        futex_up(&usb_hub_list_lock);
 }