Changeset 3d4aa055 in mainline for uspace/drv/usbhub/usbhub.c

Timestamp:

2011-05-06T13:08:10Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

075c1eb, 3da17644

Parents:

a58dd620 (diff), 310c4df (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:

Development branch changes

File:

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

uspace/drv/usbhub/usbhub.c

@@ -73 +73 @@
 
 
-/// \TODO malloc checking
-
 //*********************************************
 //
@@ -248 +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) {
@@ -255 +256 @@
                 usb_log_debug("is_power_switched\n");
                 
-                for (port = 1; port <= hub_info->port_count; ++port) {
-                        usb_log_debug("powering port %d\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));
-                        }
-                }
                 if(!has_individual_port_powering){
                         usb_log_debug("!has_individual_port_powering\n");
@@ -273 +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");
@@ -408 +411 @@
 static int usb_process_hub_power_change(usb_hub_info_t * hub_info,
     usb_hub_status_t status) {
-        int opResult;
+        int opResult = EOK;
         if (!usb_hub_is_status(status,USB_HUB_FEATURE_HUB_LOCAL_POWER)) {
                 //restart power on hub
@@ -428 +431 @@
                         }
                 }
-                opResult = usb_hub_clear_feature(hub_info->control_pipe,
-                    USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
+        }
+        if(opResult!=EOK){
+                return opResult;//no feature clearing
+        }
+        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);
-                }
+                usb_log_error("cannnot clear hub power change flag: "
+                    "%d\n",
+                    opResult);
         }
         return opResult;