Changeset 7eaeec1 in mainline for uspace/lib/usbdev/src/recognise.c

Timestamp:

2012-08-20T21:27:38Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

6a97f2e

Parents:

f3a37e28 (diff), dd13349 (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:

Merge mainline changes

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>
@@ -352 +355 @@
         
         if (dev_ops != NULL)
-                child->ops = dev_ops;
+                ddf_fun_set_ops(child, dev_ops);
         else
-                child->ops = &child_ops;
-        
-        child->driver_data = dev_data;
+                ddf_fun_set_ops(child, &child_ops);
+        
+        ddf_fun_data_implant(child, dev_data);
+        
         /*
          * Store the attached device in fun
@@ -373 +377 @@
         }
         
-        rc = usb_device_create_match_ids(ctrl_pipe, &child->match_ids);
+        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, 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);
@@ -386 +403 @@
 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);