Changes in uspace/lib/usbdev/src/recognise.c [56fd7cf:6e3c005] in mainline

File:

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

uspace/lib/usbdev/src/recognise.c

@@ -33 +33 @@
  * Functions for recognition of attached devices.
  */
-
-/** XXX Fix this */
-#define _DDF_DATA_IMPLANT
-
 #include <sys/types.h>
 #include <fibril_synch.h>
@@ -315 +311 @@
  *      will be written.
  * @return Error code.
- *
  */
 int usb_device_register_child_in_devman(usb_pipe_t *ctrl_pipe,
@@ -323 +318 @@
         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 */
+        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);
@@ -347 +342 @@
                 goto failure;
         }
-        
+
         child = ddf_fun_create(parent, fun_inner, child_name);
         if (child == NULL) {
@@ -353 +348 @@
                 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_ops != NULL) {
+                child->ops = dev_ops;
+        } else {
+                child->ops = &child_ops;
+        }
+
+        child->driver_data = 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(
@@ -372 +365 @@
                         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)
+
+
+        rc = usb_device_create_match_ids(ctrl_pipe, &child->match_ids);
+        if (rc != EOK) {
                 goto failure;
-        
-        list_foreach(match_ids.ids, id_link) {
-                match_id_t *match_id = list_get_instance(id_link, match_id_t, link);
-                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)
+        if (rc != EOK) {
                 goto failure;
-        
+        }
+
         *child_fun = child;
         return EOK;
-        
+
 failure:
         if (child != NULL) {
+                /* We know nothing about the data if it came from outside. */
+                if (dev_data) {
+                        child->driver_data = NULL;
+                }
                 /* This takes care of match_id deallocation as well. */
                 ddf_fun_destroy(child);
         }
-        
+
         return rc;
 }
 
+
 /**
  * @}