Changes in uspace/drv/usbhub/usbhub.c [4125b7d:361fcec] in mainline

File:

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

uspace/drv/usbhub/usbhub.c

@@ -73 +73 @@
 
 
-/// \TODO malloc checking
-
 //*********************************************
 //
@@ -105 +103 @@
         }
 
-        //usb_pipe_start_session(hub_info->control_pipe);
         //set hub configuration
         opResult = usb_hub_set_configuration(hub_info);
@@ -122 +119 @@
                 return opResult;
         }
-        //usb_pipe_end_session(hub_info->control_pipe);
-
 
         usb_log_debug("Creating 'hub' function in DDF.\n");
@@ -176 +171 @@
 leave:
         /* FIXME: proper interval. */
-        async_usleep(1000 * 1000 * 10);
+        async_usleep(1000 * 250);
 
         return true;
@@ -218 +213 @@
         // get hub descriptor
         usb_log_debug("creating serialized descriptor\n");
-        //void * serialized_descriptor = malloc(USB_HUB_MAX_DESCRIPTOR_SIZE);
         uint8_t serialized_descriptor[USB_HUB_MAX_DESCRIPTOR_SIZE];
         usb_hub_descriptor_t * descriptor;
@@ -252 +246 @@
         hub_info->ports = malloc(
             sizeof (usb_hub_port_t) * (hub_info->port_count + 1));
+        if(!hub_info->ports){
+                return ENOMEM;
+        }
         size_t port;
-        for (port = 0; port < hub_info->port_count + 1; port++) {
+        for (port = 0; port < hub_info->port_count + 1; ++port) {
                 usb_hub_port_init(&hub_info->ports[port]);
         }
         if(is_power_switched){
                 usb_log_debug("is_power_switched\n");
-                if(has_individual_port_powering){
-                        usb_log_debug("has_individual_port_powering\n");
-                        for (port = 0; port < hub_info->port_count; port++) {
-                                opResult = usb_hub_set_port_feature(hub_info->control_pipe,
-                                    port+1, USB_HUB_FEATURE_PORT_POWER);
-                                if (opResult != EOK) {
-                                        usb_log_error("cannot power on port %zu: %s.\n",
-                                            port+1, str_error(opResult));
-                                }
-                        }
-                }else{
+                
+                if(!has_individual_port_powering){
                         usb_log_debug("!has_individual_port_powering\n");
                         opResult = usb_hub_set_feature(hub_info->control_pipe,
@@ -277 +265 @@
                         }
                 }
+
+                for (port = 1; port <= hub_info->port_count; ++port) {
+                        usb_log_debug("Powering port %zu.\n",port);
+                        opResult = usb_hub_set_port_feature(hub_info->control_pipe,
+                            port, USB_HUB_FEATURE_PORT_POWER);
+                        if (opResult != EOK) {
+                                usb_log_error("cannot power on port %zu: %s.\n",
+                                    port, str_error(opResult));
+                        }
+                }
+                
         }else{
-                usb_log_debug("!is_power_switched\n");
+                usb_log_debug("!is_power_switched, not going to be powered\n");
         }
         usb_log_debug2("freeing data\n");
-        //free(serialized_descriptor);
-        //free(descriptor->devices_removable);
         free(descriptor);
         return EOK;
@@ -415 +412 @@
     usb_hub_status_t status) {
         int opResult;
-        if (usb_hub_is_status(status,USB_HUB_FEATURE_HUB_LOCAL_POWER)) {
+        if (!usb_hub_is_status(status,USB_HUB_FEATURE_HUB_LOCAL_POWER)) {
                 //restart power on hub
                 opResult = usb_hub_set_feature(hub_info->control_pipe,
@@ -425 +422 @@
         } else {//power reestablished on hub- restart ports
                 size_t port;
-                for (port = 0; port < hub_info->port_count; ++port) {
+                for (port = 1; port <= hub_info->port_count; ++port) {
                         opResult = usb_hub_set_port_feature(
                             hub_info->control_pipe,
@@ -434 +431 @@
                         }
                 }
+                opResult = usb_hub_clear_feature(hub_info->control_pipe,
+                    USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
+                if (opResult != EOK) {
+                        usb_log_error("cannnot clear hub power change flag: "
+                            "%d\n",
+                            opResult);
+                }
         }
         return opResult;