Changeset 9445aad in mainline for uspace/drv/usbmid/explore.c

Timestamp:

2011-03-03T23:25:34Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

3c775adb, 9a422574

Parents:

bdc8ab1 (diff), 8f74140c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Development branch changes

File:

• uspace/drv/usbmid/explore.c (modified) (4 diffs)

uspace/drv/usbmid/explore.c

@@ -42 +42 @@
 #include "usbmid.h"
 
-/** Allocate and retrieve full configuration descriptor.
- *
- * @param[in] dev USB device.
- * @param[in] config_index Configuration index.
- * @param[out] size Pointer where to store size of the allocated buffer.
- * @return Allocated full configuration descriptor.
- * @retval NULL Error occured.
- */
-static void *get_configuration_descriptor(usbmid_device_t *dev,
-    size_t config_index, size_t *size)
-{
-        usb_standard_configuration_descriptor_t config_descriptor;
-        int rc = usb_request_get_bare_configuration_descriptor(&dev->ctrl_pipe,
-            config_index, &config_descriptor);
-        if (rc != EOK) {
-                usb_log_error("Failed getting configuration descriptor: %s.\n",
-                    str_error(rc));
-                return NULL;
-        }
-
-        void *full_config_descriptor = malloc(config_descriptor.total_length);
-        if (full_config_descriptor == NULL) {
-                usb_log_fatal("Out of memory (wanted: %zuB).\n",
-                    (size_t) config_descriptor.total_length);
-                return NULL;
-        }
-
-        size_t full_config_descriptor_size;
-        rc = usb_request_get_full_configuration_descriptor(&dev->ctrl_pipe,
-            config_index,
-            full_config_descriptor, config_descriptor.total_length,
-            &full_config_descriptor_size);
-        if (rc != EOK) {
-                usb_log_error("Failed getting configuration descriptor: %s.\n",
-                    str_error(rc));
-                free(full_config_descriptor);
-                return NULL;
-        }
-
-        if (full_config_descriptor_size != config_descriptor.total_length) {
-                usb_log_error("Failed getting full configuration descriptor.\n");
-                free(full_config_descriptor);
-                return NULL;
-        }
-
-        if (size != NULL) {
-                *size = full_config_descriptor_size;
-        }
-
-        return full_config_descriptor;
-}
-
 /** Find starting indexes of all interface descriptors in a configuration.
  *
@@ -178 +126 @@
 
         size_t config_descriptor_size;
-        uint8_t *config_descriptor_raw = get_configuration_descriptor(dev, 0,
-            &config_descriptor_size);
-        if (config_descriptor_raw == NULL) {
+        uint8_t *config_descriptor_raw = NULL;
+        rc = usb_request_get_full_configuration_descriptor_alloc(
+            &dev->ctrl_pipe, 0,
+            (void **) &config_descriptor_raw, &config_descriptor_size);
+        if (rc != EOK) {
+                usb_log_error("Failed getting full config descriptor: %s.\n",
+                    str_error(rc));
                 return false;
         }
@@ -207 +159 @@
         }
 
+        /* Select the first configuration */
+        rc = usb_request_set_configuration(&dev->ctrl_pipe,
+            config_descriptor->configuration_number);
+        if (rc != EOK) {
+                usb_log_error("Failed to set device configuration: %s.\n",
+                    str_error(rc));
+                free(config_descriptor_raw);
+                free(interface_descriptors);
+                return false;
+        }
+
+
+        /* Create control function */
         ddf_fun_t *ctl_fun = ddf_fun_create(dev->dev, fun_exposed, "ctl");
         if (ctl_fun == NULL) {
@@ -223 +188 @@
         }
 
+        /* Spawn interface children */
         size_t i;
         for (i = 0; i < interface_descriptors_count; i++) {