Changes in uspace/drv/usbhub/usbhub.c [361fcec:46e078a] in mainline

File:

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

uspace/drv/usbhub/usbhub.c

@@ -45 +45 @@
 #include <usb/request.h>
 #include <usb/classes/hub.h>
-#include <usb/devpoll.h>
 #include <stdio.h>
 
@@ -72 +71 @@
 static void usb_hub_process_global_interrupt(usb_hub_info_t * hub_info);
 
+
+/// \TODO malloc checking
 
 //*********************************************
@@ -103 +104 @@
         }
 
+        usb_pipe_start_session(hub_info->control_pipe);
         //set hub configuration
         opResult = usb_hub_set_configuration(hub_info);
@@ -119 +121 @@
                 return opResult;
         }
-
-        usb_log_debug("Creating 'hub' function in DDF.\n");
+        usb_pipe_end_session(hub_info->control_pipe);
+
+        /// \TODO what is this?
+        usb_log_debug("Creating `hub' function.\n");
         ddf_fun_t *hub_fun = ddf_fun_create(hub_info->usb_device->ddf_dev,
             fun_exposed, "hub");
@@ -148 +152 @@
 bool hub_port_changes_callback(usb_device_t *dev,
     uint8_t *change_bitmap, size_t change_bitmap_size, void *arg) {
-        usb_log_debug("hub_port_changes_callback\n");
         usb_hub_info_t *hub = (usb_hub_info_t *) arg;
 
@@ -171 +174 @@
 leave:
         /* FIXME: proper interval. */
-        async_usleep(1000 * 250);
+        async_usleep(1000 * 1000 * 10);
 
         return true;
@@ -213 +216 @@
         // get hub descriptor
         usb_log_debug("creating serialized descriptor\n");
-        uint8_t serialized_descriptor[USB_HUB_MAX_DESCRIPTOR_SIZE];
+        void * serialized_descriptor = malloc(USB_HUB_MAX_DESCRIPTOR_SIZE);
         usb_hub_descriptor_t * descriptor;
         int opResult;
@@ -231 +234 @@
         }
         usb_log_debug2("deserializing descriptor\n");
-        descriptor = usb_create_deserialized_hub_desriptor(
-            serialized_descriptor);
+        descriptor = usb_deserialize_hub_desriptor(serialized_descriptor);
         if (descriptor == NULL) {
                 usb_log_warning("could not deserialize descriptor \n");
-                return ENOMEM;
+                return opResult;
         }
         usb_log_debug("setting port count to %d\n", descriptor->ports_count);
         hub_info->port_count = descriptor->ports_count;
         /// \TODO this is not semantically correct
-        bool is_power_switched =
-            ((descriptor->hub_characteristics & 1) ==0);
-        bool has_individual_port_powering =
-            ((descriptor->hub_characteristics & 1) !=0);
         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");
-                        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);
-                        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, not going to be powered\n");
-        }
         usb_log_debug2("freeing data\n");
+        free(serialized_descriptor);
+        free(descriptor->devices_removable);
         free(descriptor);
         return EOK;
@@ -341 +312 @@
          * auto destruction, this could work better.
          */
-        int rc = usb_hc_connection_open(&hub_info->connection);
+        int rc = usb_pipe_start_session(hub_info->control_pipe);
         if (rc != EOK) {
-                //usb_pipe_end_session(hub_info->control_pipe);
+                usb_log_error("Failed to start session on control pipe: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
+        rc = usb_hc_connection_open(&hub_info->connection);
+        if (rc != EOK) {
+                usb_pipe_end_session(hub_info->control_pipe);
                 usb_log_error("Failed to open connection to HC: %s.\n",
                     str_error(rc));
@@ -359 +336 @@
         }
 
-        usb_log_info("Controlling hub `%s' (%zu ports).\n",
+        usb_log_info("Controlling hub `%s' (%d ports).\n",
             hub_info->usb_device->ddf_dev->name, hub_info->port_count);
         return EOK;
@@ -412 +389 @@
     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,
@@ -422 +399 @@
         } else {//power reestablished on hub- restart ports
                 size_t port;
-                for (port = 1; port <= hub_info->port_count; ++port) {
+                for (port = 0; port < hub_info->port_count; ++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));
+                                usb_log_error("cannot power on port %d;  %d\n",
+                                    port, opResult);
                         }
-                }
-                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);
                 }
         }