Changeset 56fd7cf in mainline for uspace/drv/bus/usb/usbmid

Timestamp:

2012-08-17T11:37:03Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1d5a540

Parents:

be2a38ad

Message:

Make ddf_dev_t and ddf_fun_t opaque. This further tighthens the DDF interface.

Location:

uspace/drv/bus/usb/usbmid

Files:

• explore.c (modified) (1 diff)
• main.c (modified) (2 diffs)
• usbmid.c (modified) (4 diffs)

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

@@ -172 +172 @@
                 return false;
         }
-        usb_mid->ctl_fun->ops = &mid_device_ops;
+        ddf_fun_set_ops(usb_mid->ctl_fun, &mid_device_ops);
 
         /* Bind control function. */

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

@@ -51 +51 @@
 static int usbmid_device_add(usb_device_t *dev)
 {
-        usb_log_info("Taking care of new MID `%s'.\n", dev->ddf_dev->name);
+        usb_log_info("Taking care of new MID `%s'.\n", ddf_dev_get_name(dev->ddf_dev));
 
         const bool accept = usbmid_explore_device(dev);
@@ -127 +127 @@
         assert(usb_mid);
 
-        usb_log_info("USB MID gone: `%s'.\n", dev->ddf_dev->name);
+        usb_log_info("USB MID gone: `%s'.\n", ddf_dev_get_name(dev->ddf_dev));
 
         /* Remove ctl function */

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;