Changeset 79e1abd in mainline for uspace/drv/usbmid/explore.c

Timestamp:

2011-03-29T12:09:15Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

d012590

Parents:

841e6e5 (diff), 51e5608 (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 merge - mainline changes

File:

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

uspace/drv/usbmid/explore.c

@@ -40 +40 @@
 #include <usb/request.h>
 #include <usb/dp.h>
+#include <usb/ddfiface.h>
 #include "usbmid.h"
+
+/** Operations of the device itself. */
+static ddf_dev_ops_t mid_device_ops = {
+        .interfaces[USB_DEV_IFACE] = &usb_iface_hub_impl
+};
 
 /** Find starting indexes of all interface descriptors in a configuration.
@@ -105 +111 @@
  * @return Whether to accept this device from devman.
  */
-bool usbmid_explore_device(usbmid_device_t *dev)
+bool usbmid_explore_device(usb_device_t *dev)
 {
-        usb_standard_device_descriptor_t device_descriptor;
-        int rc = usb_request_get_device_descriptor(&dev->ctrl_pipe,
-            &device_descriptor);
-        if (rc != EOK) {
-                usb_log_error("Getting device descriptor failed: %s.\n",
-                    str_error(rc));
-                return false;
-        }
-
-        if (device_descriptor.device_class != USB_CLASS_USE_INTERFACE) {
+        int rc;
+
+        int dev_class = dev->descriptors.device.device_class;
+        if (dev_class != USB_CLASS_USE_INTERFACE) {
                 usb_log_warning(
                     "Device class: %d (%s), but expected class 0.\n",
-                    device_descriptor.device_class,
-                    usb_str_class(device_descriptor.device_class));
+                    dev_class, usb_str_class(dev_class));
                 usb_log_error("Not multi interface device, refusing.\n");
                 return false;
         }
 
-        size_t config_descriptor_size;
-        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;
-        }
-
-        usb_standard_configuration_descriptor_t *config_descriptor
-            = (usb_standard_configuration_descriptor_t *) config_descriptor_raw;
+        /* Short cuts to save on typing ;-). */
+        uint8_t *config_descriptor_raw = dev->descriptors.configuration;
+        size_t config_descriptor_size = dev->descriptors.configuration_size;
+        usb_standard_configuration_descriptor_t *config_descriptor =
+            (usb_standard_configuration_descriptor_t *) config_descriptor_raw;
 
         size_t *interface_descriptors
@@ -154 +145 @@
         if (interface_descriptors_count == (size_t) -1) {
                 usb_log_error("Problem parsing configuration descriptor.\n");
-                free(config_descriptor_raw);
                 free(interface_descriptors);
                 return false;
@@ -165 +155 @@
                 usb_log_error("Failed to set device configuration: %s.\n",
                     str_error(rc));
-                free(config_descriptor_raw);
                 free(interface_descriptors);
                 return false;
@@ -172 +161 @@
 
         /* Create control function */
-        ddf_fun_t *ctl_fun = ddf_fun_create(dev->dev, fun_exposed, "ctl");
+        ddf_fun_t *ctl_fun = ddf_fun_create(dev->ddf_dev, fun_exposed, "ctl");
         if (ctl_fun == NULL) {
                 usb_log_error("Failed to create control function.\n");
-                free(config_descriptor_raw);
-                free(interface_descriptors);
-                return false;
-        }
+                free(interface_descriptors);
+                return false;
+        }
+
+        ctl_fun->ops = &mid_device_ops;
+
         rc = ddf_fun_bind(ctl_fun);
         if (rc != EOK) {
                 usb_log_error("Failed to bind control function: %s.\n",
                     str_error(rc));
-                free(config_descriptor_raw);
                 free(interface_descriptors);
                 return false;
@@ -199 +189 @@
                     (int) interface->interface_number,
                     usb_str_class(interface->interface_class));
-                rc = usbmid_spawn_interface_child(dev, &device_descriptor,
+                rc = usbmid_spawn_interface_child(dev, &dev->descriptors.device,
                     interface);
                 if (rc != EOK) {
@@ -207 +197 @@
         }
 
-        free(config_descriptor_raw);
-
         return true;
 }