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

File:

• uspace/lib/usbdev/src/recognise.c (modified) (4 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>
@@ -355 +352 @@
         
         if (dev_ops != NULL)
-                ddf_fun_set_ops(child, dev_ops);
+                child->ops = dev_ops;
         else
-                ddf_fun_set_ops(child, &child_ops);
-        
-        ddf_fun_data_implant(child, dev_data);
-        
+                child->ops = &child_ops;
+        
+        child->driver_data = dev_data;
         /*
          * Store the attached device in fun
@@ -377 +373 @@
         }
         
-        match_id_list_t match_ids;
-        init_match_ids(&match_ids);
-        rc = usb_device_create_match_ids(ctrl_pipe, &match_ids);
+        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);
@@ -403 +386 @@
 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);