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

Timestamp:

2011-03-02T18:17:27Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a6567ed

Parents:

4723444

Message:

Allocating "get full config desc" put into action

Yes, all that removed code is now replaced with a single function.
And yes, it was the same in all drivers.

File:

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

uspace/drv/usbhub/usbhub.c

@@ -149 +149 @@
         }
 
-        //configuration descriptor
-        /// \TODO check other configurations?
-        usb_standard_configuration_descriptor_t config_descriptor;
-        opResult = usb_request_get_bare_configuration_descriptor(
+        /* Retrieve full configuration descriptor. */
+        uint8_t *descriptors = NULL;
+        size_t descriptors_size = 0;
+        opResult = usb_request_get_full_configuration_descriptor_alloc(
             &hub->endpoints.control, 0,
-        &config_descriptor);
-        if(opResult!=EOK){
-                dprintf(USB_LOG_LEVEL_ERROR, "could not get configuration descriptor, %d",opResult);
+            (void **) &descriptors, &descriptors_size);
+        if (opResult != EOK) {
+                usb_log_error("Could not get configuration descriptor: %s.\n",
+                    str_error(opResult));
                 return opResult;
         }
-        //set configuration
+        usb_standard_configuration_descriptor_t *config_descriptor
+            = (usb_standard_configuration_descriptor_t *) descriptors;
+
+        /* Set configuration. */
         opResult = usb_request_set_configuration(&hub->endpoints.control,
-                config_descriptor.configuration_number);
-
-        if (opResult != EOK) {
-                dprintf(USB_LOG_LEVEL_ERROR,
-                                "something went wrong when setting hub`s configuration, %d",
-                                opResult);
+            config_descriptor->configuration_number);
+
+        if (opResult != EOK) {
+                usb_log_error("Failed to set hub configuration: %s.\n",
+                    str_error(opResult));
                 return opResult;
         }
         dprintf(USB_LOG_LEVEL_DEBUG, "\tused configuration %d",
-                        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;
-        }
+                        config_descriptor->configuration_number);
 
         usb_endpoint_mapping_t endpoint_mapping[1] = {
@@ -204 +185 @@
         opResult = usb_endpoint_pipe_initialize_from_configuration(
             endpoint_mapping, 1,
-            descriptors, config_descriptor.total_length,
+            descriptors, descriptors_size,
             &hub->device_connection);
         if (opResult != EOK) {