Changes in uspace/lib/usbdev/src/recognise.c [c01987c:feeac0d] in mainline

File:

• uspace/lib/usbdev/src/recognise.c (modified) (4 diffs)

uspace/lib/usbdev/src/recognise.c

@@ -34 +34 @@
  */
 
+/** XXX Fix this */
+#define _DDF_DATA_IMPLANT
+
+#include <sys/types.h>
+#include <fibril_synch.h>
+#include <usb/debug.h>
+#include <usb/dev/hub.h>
 #include <usb/dev/pipes.h>
 #include <usb/dev/recognise.h>
+#include <usb/ddfiface.h>
 #include <usb/dev/request.h>
 #include <usb/classes/classes.h>
-
+#include <stdio.h>
+#include <errno.h>
 #include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <sys/types.h>
+
+/** DDF operations of child devices. */
+static ddf_dev_ops_t child_ops = {
+        .interfaces[USB_DEV_IFACE] = &usb_iface_hub_child_impl
+};
 
 /** Get integer part from BCD coded number. */
@@ -234 +245 @@
                     (int) device_descriptor->product_id,
                     BCD_ARGS(device_descriptor->device_version));
-
+                
                 /* Next, without release number. */
                 ADD_MATCHID_OR_RETURN(matches, 90,
@@ -240 +251 @@
                     (int) device_descriptor->vendor_id,
                     (int) device_descriptor->product_id);
-        }
-
-        /* Class match id */
-        ADD_MATCHID_OR_RETURN(matches, 50, "usb&class=%s",
-            usb_str_class(device_descriptor->device_class));
-
+        }       
+
+        /*
+         * If the device class points to interface we skip adding
+         * class directly but we add a multi interface device.
+         */
+        if (device_descriptor->device_class != USB_CLASS_USE_INTERFACE) {
+                ADD_MATCHID_OR_RETURN(matches, 50, "usb&class=%s",
+                    usb_str_class(device_descriptor->device_class));
+        } else {
+                ADD_MATCHID_OR_RETURN(matches, 50, "usb&mid");
+        }
+        
         /* As a last resort, try fallback driver. */
         ADD_MATCHID_OR_RETURN(matches, 10, "usb&fallback");
@@ -287 +305 @@
 }
 
+/** Probe for device kind and register it in devman.
+ *
+ * @param[in] ctrl_pipe Control pipe to the device.
+ * @param[in] parent Parent device.
+ * @param[in] dev_ops Child device ops. Default child_ops will be used if NULL.
+ * @param[in] dev_data Arbitrary pointer to be stored in the child
+ *      as @c driver_data.
+ * @param[out] child_fun Storage where pointer to allocated child function
+ *      will be written.
+ * @return Error code.
+ *
+ */
+int usb_device_register_child_in_devman(usb_pipe_t *ctrl_pipe,
+    ddf_dev_t *parent, ddf_dev_ops_t *dev_ops, void *dev_data,
+    ddf_fun_t **child_fun)
+{
+        if (child_fun == NULL || ctrl_pipe == NULL)
+                return EINVAL;
+        
+        if (!dev_ops && dev_data) {
+                usb_log_warning("Using standard fun ops with arbitrary "
+                    "driver data. This does not have to work.\n");
+        }
+        
+        /** Index to append after device name for uniqueness. */
+        static atomic_t device_name_index = {0};
+        const size_t this_device_name_index =
+            (size_t) atomic_preinc(&device_name_index);
+        
+        ddf_fun_t *child = NULL;
+        int rc;
+        
+        /*
+         * TODO: Once the device driver framework support persistent
+         * naming etc., something more descriptive could be created.
+         */
+        char child_name[12];  /* The format is: "usbAB_aXYZ", length 11 */
+        rc = snprintf(child_name, sizeof(child_name),
+            "usb%02zu_a%d", this_device_name_index, ctrl_pipe->wire->address);
+        if (rc < 0) {
+                goto failure;
+        }
+        
+        child = ddf_fun_create(parent, fun_inner, child_name);
+        if (child == NULL) {
+                rc = ENOMEM;
+                goto failure;
+        }
+        
+        if (dev_ops != NULL)
+                ddf_fun_set_ops(child, dev_ops);
+        else
+                ddf_fun_set_ops(child, &child_ops);
+        
+        ddf_fun_data_implant(child, dev_data);
+        
+        /*
+         * Store the attached device in fun
+         * driver data if there is no other data
+         */
+        if (!dev_data) {
+                usb_hub_attached_device_t *new_device = ddf_fun_data_alloc(
+                    child, sizeof(usb_hub_attached_device_t));
+                if (!new_device) {
+                        rc = ENOMEM;
+                        goto failure;
+                }
+                
+                new_device->address = ctrl_pipe->wire->address;
+                new_device->fun = child;
+        }
+        
+        match_id_list_t match_ids;
+        init_match_ids(&match_ids);
+        rc = usb_device_create_match_ids(ctrl_pipe, &match_ids);
+        if (rc != EOK)
+                goto failure;
+        
+        list_foreach(match_ids.ids, link, match_id_t, match_id) {
+                rc = ddf_fun_add_match_id(child, match_id->id, match_id->score);
+                if (rc != EOK) {
+                        clean_match_ids(&match_ids);
+                        goto failure;
+                }
+        }
+        
+        clean_match_ids(&match_ids);
+        
+        rc = ddf_fun_bind(child);
+        if (rc != EOK)
+                goto failure;
+        
+        *child_fun = child;
+        return EOK;
+        
+failure:
+        if (child != NULL) {
+                /* This takes care of match_id deallocation as well. */
+                ddf_fun_destroy(child);
+        }
+        
+        return rc;
+}
+
 /**
  * @}