Changeset 361fcec in mainline for uspace/drv/usbhub

Timestamp:

2011-04-29T08:33:43Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

152ec79, a146aa33

Parents:

54d71e1

Message:

removing malloc, pre-creating root hub descriptor and interrupt buffer

Location:

uspace/drv/usbhub

Files:

• main.c (modified) (2 diffs)
• ports.c (modified) (2 diffs)
• usbhub.c (modified) (4 diffs)

uspace/drv/usbhub/main.c

@@ -55 +55 @@
 };
 
-
+/**
+ * usb hub driver operations
+ *
+ * The most important one is add_device, which is set to usb_hub_add_device.
+ */
 static usb_driver_ops_t usb_hub_driver_ops = {
         .add_device = usb_hub_add_device
 };
 
+/**
+ * hub endpoints, excluding control endpoint
+ */
 static usb_endpoint_description_t *usb_hub_endpoints[] = {
         &hub_status_change_endpoint_description,
@@ -65 +72 @@
 };
 
+/**
+ * static usb hub driver information
+ */
 static usb_driver_t usb_hub_driver = {
         .name = NAME,

uspace/drv/usbhub/ports.c

@@ -167 +167 @@
 
         //close address
-        //if (hub->attached_devs[port].address != 0) {
         if(hub->ports[port].attached_device.address >= 0){
                 /*uncomment this code to use it when DDF allows device removal
@@ -182 +181 @@
                  */
         } else {
-                // TODO: is this really reason to print a warning?
                 usb_log_warning("Device removed before being registered.\n");
 

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");
                 
+                if(!has_individual_port_powering){
+                        usb_log_debug("!has_individual_port_powering\n");
+                        opResult = usb_hub_set_feature(hub_info->control_pipe,
+                            USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
+                        if (opResult != EOK) {
+                                usb_log_error("cannot power hub: %s\n",
+                                    str_error(opResult));
+                        }
+                }
+
                 for (port = 1; port <= hub_info->port_count; ++port) {
                         usb_log_debug("Powering port %zu.\n",port);
@@ -264 +275 @@
                         }
                 }
-                if(!has_individual_port_powering){
-                        usb_log_debug("!has_individual_port_powering\n");
-                        opResult = usb_hub_set_feature(hub_info->control_pipe,
-                            USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
-                        if (opResult != EOK) {
-                                usb_log_error("cannot power hub: %s\n",
-                                    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");