Changeset 7cfe5c0 in mainline for uspace/drv/bus/usb/usbmid/usbmid.c

Timestamp:

2012-08-20T19:16:24Z (12 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

6b99156

Parents:

b9cb911 (diff), 01e397ac (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:

Merged with mainline 0.5.0 changes.

File:

• uspace/drv/bus/usb/usbmid/usbmid.c (modified) (4 diffs)

uspace/drv/bus/usb/usbmid/usbmid.c

@@ -30 +30 @@
  * @{
  */
+
+/* XXX Fix this */
+#define _DDF_DATA_IMPLANT
+
 /**
  * @file
@@ -47 +51 @@
 static int usb_iface_get_interface_impl(ddf_fun_t *fun, int *iface_no)
 {
-        assert(fun);
-
-        usbmid_interface_t *iface = fun->driver_data;
+        usbmid_interface_t *iface = ddf_fun_data_get(fun);
         assert(iface);
 
@@ -123 +125 @@
         }
 
+        match_id_list_t match_ids;
+        init_match_ids(&match_ids);
+
         rc = usb_device_create_match_ids_from_interface(device_descriptor,
-            interface_descriptor, &child->match_ids);
+            interface_descriptor, &match_ids);
         if (rc != EOK) {
                 ddf_fun_destroy(child);
                 return rc;
         }
+
+        list_foreach(match_ids.ids, link) {
+                match_id_t *match_id = list_get_instance(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);
+                        ddf_fun_destroy(child);
+                        return rc;
+                }
+        }
+        clean_match_ids(&match_ids);
 
         rc = ddf_fun_bind(child);
@@ -138 +154 @@
 
         iface->fun = child;
-        child->driver_data = iface;
-        child->ops = &child_device_ops;
+        ddf_fun_data_implant(child, iface);
+        ddf_fun_set_ops(child, &child_device_ops);
 
         return EOK;