Changes in uspace/drv/usbhub/usbhub.c [5097bed4:71ed4849] in mainline

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] address of newly created hub = %d", addr);
+        dprintf(1,"[usb_hub] addres 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,
@@ -195 +194 @@
         }
 
+
         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;
@@ -235 +233 @@
 //
 //*********************************************
-
-/**
- * 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;
-}
 
 /**
@@ -277 +259 @@
         if (opResult != EOK) {
                 dprintf(1,"[usb_hub] something went wrong when reseting a port");
-                usb_hub_release_default_address(hc);
-        }
-}
+        }
+}
+
+/**
+ * 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;
+}
+
 
 /**
@@ -345 +343 @@
 
 /**
- * unregister device address in hc
+ * unregister device address in hc, close the port
  * @param hc
  * @param port
@@ -354 +352 @@
         //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
 
@@ -449 +457 @@
          */
         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);
                 /*
@@ -504 +510 @@
                         }
                 }
-                free(change_bitmap);
 
                 ipc_hangup(hc);
-                futex_down(&usb_hub_list_lock);
-        }
-        futex_up(&usb_hub_list_lock);
+        }
 }