Changes in uspace/drv/usbhub/usbhub.c [4e900c1:ad4562c2] in mainline

File:

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

uspace/drv/usbhub/usbhub.c

@@ -149 +149 @@
         }
 
-        /* Retrieve full configuration descriptor. */
-        uint8_t *descriptors = NULL;
-        size_t descriptors_size = 0;
-        opResult = usb_request_get_full_configuration_descriptor_alloc(
+        //configuration descriptor
+        /// \TODO check other configurations?
+        usb_standard_configuration_descriptor_t config_descriptor;
+        opResult = usb_request_get_bare_configuration_descriptor(
             &hub->endpoints.control, 0,
-            (void **) &descriptors, &descriptors_size);
-        if (opResult != EOK) {
-                usb_log_error("Could not get configuration descriptor: %s.\n",
-                    str_error(opResult));
+        &config_descriptor);
+        if(opResult!=EOK){
+                dprintf(USB_LOG_LEVEL_ERROR, "could not get configuration descriptor, %d",opResult);
                 return opResult;
         }
-        usb_standard_configuration_descriptor_t *config_descriptor
-            = (usb_standard_configuration_descriptor_t *) descriptors;
-
-        /* Set configuration. */
+        //set configuration
         opResult = usb_request_set_configuration(&hub->endpoints.control,
-            config_descriptor->configuration_number);
-
-        if (opResult != EOK) {
-                usb_log_error("Failed to set hub configuration: %s.\n",
-                    str_error(opResult));
+                config_descriptor.configuration_number);
+
+        if (opResult != EOK) {
+                dprintf(USB_LOG_LEVEL_ERROR,
+                                "something went wrong when setting hub`s configuration, %d",
+                                opResult);
                 return opResult;
         }
         dprintf(USB_LOG_LEVEL_DEBUG, "\tused configuration %d",
-                        config_descriptor->configuration_number);
+                        config_descriptor.configuration_number);
+
+        //full configuration descriptor
+        size_t transferred = 0;
+        uint8_t * descriptors = (uint8_t *)malloc(config_descriptor.total_length);
+        if (descriptors == NULL) {
+                dprintf(USB_LOG_LEVEL_ERROR, "insufficient memory");
+                return ENOMEM;
+        }
+        opResult = usb_request_get_full_configuration_descriptor(&hub->endpoints.control,
+            0, descriptors,
+            config_descriptor.total_length, &transferred);
+        if(opResult!=EOK){
+                free(descriptors);
+                dprintf(USB_LOG_LEVEL_ERROR,
+                                "could not get full configuration descriptor, %d",opResult);
+                return opResult;
+        }
+        if (transferred != config_descriptor.total_length) {
+                dprintf(USB_LOG_LEVEL_ERROR,
+                                "received incorrect full configuration descriptor");
+                return ELIMIT;
+        }
 
         usb_endpoint_mapping_t endpoint_mapping[1] = {
@@ -185 +204 @@
         opResult = usb_endpoint_pipe_initialize_from_configuration(
             endpoint_mapping, 1,
-            descriptors, descriptors_size,
+            descriptors, config_descriptor.total_length,
             &hub->device_connection);
         if (opResult != EOK) {
@@ -233 +252 @@
         dprintf(USB_LOG_LEVEL_DEBUG, "starting control transaction");
         usb_endpoint_pipe_start_session(&result->endpoints.control);
-        opResult = usb_request_set_configuration(&result->endpoints.control, 1);
-        assert(opResult == EOK);
-
         opResult = usb_request_get_descriptor(&result->endpoints.control,
                         USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_DEVICE,
@@ -246 +262 @@
                 dprintf(USB_LOG_LEVEL_ERROR, "failed when receiving hub descriptor, badcode = %d",opResult);
                 free(serialized_descriptor);
-                free(result);
-                return NULL;
+                return result;
         }
         dprintf(USB_LOG_LEVEL_DEBUG2, "deserializing descriptor");
@@ -253 +268 @@
         if(descriptor==NULL){
                 dprintf(USB_LOG_LEVEL_WARNING, "could not deserialize descriptor ");
-                free(result);
-                return NULL;
+                result->port_count = 1;///\TODO this code is only for debug!!!
+                return result;
         }
 
@@ -290 +305 @@
 
         usb_hub_info_t * hub_info = usb_create_hub_info(dev);
-        if(!hub_info){
-                return EINTR;
-        }
 
         int opResult;
@@ -301 +313 @@
         opResult = usb_hub_process_configuration_descriptors(hub_info);
         if(opResult != EOK){
-                dprintf(USB_LOG_LEVEL_ERROR,"could not get configuration descriptors, %d",
+                dprintf(USB_LOG_LEVEL_ERROR,"could not get condiguration descriptors, %d",
                                 opResult);
                 return opResult;