Changeset cd5b878 in mainline for uspace/drv/usbhub/usbhub.c

Timestamp:

2011-04-15T11:49:36Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

c1693dae

Parents:

3a85a2b

Message:

removed pipe start/end functions; small changes in usb_hub_descriptor_type (less malloc)

File:

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

uspace/drv/usbhub/usbhub.c

@@ -105 +105 @@
         }
 
-        usb_pipe_start_session(hub_info->control_pipe);
+        //usb_pipe_start_session(hub_info->control_pipe);
         //set hub configuration
         opResult = usb_hub_set_configuration(hub_info);
@@ -122 +122 @@
                 return opResult;
         }
-        usb_pipe_end_session(hub_info->control_pipe);
+        //usb_pipe_end_session(hub_info->control_pipe);
 
         /// \TODO what is this?
@@ -235 +235 @@
         }
         usb_log_debug2("deserializing descriptor\n");
-        descriptor = usb_deserialize_hub_desriptor(serialized_descriptor);
+        descriptor = usb_create_deserialized_hub_desriptor(
+            serialized_descriptor);
         if (descriptor == NULL) {
                 usb_log_warning("could not deserialize descriptor \n");
@@ -259 +260 @@
         usb_log_debug2("freeing data\n");
         free(serialized_descriptor);
-        free(descriptor->devices_removable);
+        //free(descriptor->devices_removable);
         free(descriptor);
         return EOK;
@@ -321 +322 @@
          * auto destruction, this could work better.
          */
-        int rc = usb_pipe_start_session(hub_info->control_pipe);
+        int rc = usb_hc_connection_open(&hub_info->connection);
         if (rc != EOK) {
-                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_pipe_end_session(hub_info->control_pipe);
                 usb_log_error("Failed to open connection to HC: %s.\n",
                     str_error(rc));