Changeset 5e718d9 in mainline for uspace/drv/bus/usb/usbhid/mouse/mousedev.c

Timestamp:

2012-08-21T10:04:16Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

67edca6

Parents:

0da6c04 (diff), 6a97f2e (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 with upstream (lp:~wtachi/helenos/bithenge)

File:

• uspace/drv/bus/usb/usbhid/mouse/mousedev.c (modified) (8 diffs)

uspace/drv/bus/usb/usbhid/mouse/mousedev.c

@@ -34 +34 @@
  * USB Mouse driver API.
  */
+
+/* XXX Fix this */
+#define _DDF_DATA_IMPLANT
 
 #include <usb/debug.h>
@@ -115 +118 @@
     ipc_callid_t icallid, ipc_call_t *icall)
 {
-        usb_mouse_t *mouse_dev = fun->driver_data;
+        usb_mouse_t *mouse_dev = ddf_fun_data_get(fun);
 
         if (mouse_dev == NULL) {
@@ -123 +126 @@
         }
 
-        usb_log_debug("%s: fun->name: %s\n", __FUNCTION__, fun->name);
+        usb_log_debug("%s: fun->name: %s\n", __FUNCTION__, ddf_fun_get_name(fun));
         usb_log_debug("%s: mouse_sess: %p\n",
             __FUNCTION__, mouse_dev->mouse_sess);
@@ -133 +136 @@
                         mouse_dev->mouse_sess = sess;
                         usb_log_debug("Console session to %s set ok (%p).\n",
-                            fun->name, sess);
+                            ddf_fun_get_name(fun), sess);
                         async_answer_0(icallid, EOK);
                 } else {
                         usb_log_error("Console session to %s already set.\n",
-                            fun->name);
+                            ddf_fun_get_name(fun));
                         async_answer_0(icallid, ELIMIT);
                         async_hangup(sess);
@@ -249 +252 @@
 if (fun) { \
         if (ddf_fun_unbind((fun)) == EOK) { \
-                (fun)->driver_data = NULL; \
                 ddf_fun_destroy((fun)); \
         } else { \
                 usb_log_error("Could not unbind function `%s', it " \
-                    "will not be destroyed.\n", (fun)->name); \
+                    "will not be destroyed.\n", ddf_fun_get_name(fun)); \
         } \
 } else (void)0
@@ -272 +274 @@
         }
 
-        fun->ops = &ops;
-        fun->driver_data = mouse;
+        ddf_fun_set_ops(fun, &ops);
+        ddf_fun_data_implant(fun, mouse);
 
         int rc = ddf_fun_bind(fun);
         if (rc != EOK) {
                 usb_log_error("Could not bind DDF function `%s': %s.\n",
-                    fun->name, str_error(rc));
-                fun->driver_data = NULL;
+                    ddf_fun_get_name(fun), str_error(rc));
                 ddf_fun_destroy(fun);
                 return rc;
@@ -285 +286 @@
 
         usb_log_debug("Adding DDF function `%s' to category %s...\n",
-            fun->name, HID_MOUSE_CATEGORY);
+            ddf_fun_get_name(fun), HID_MOUSE_CATEGORY);
         rc = ddf_fun_add_to_category(fun, HID_MOUSE_CATEGORY);
         if (rc != EOK) {
@@ -419 +420 @@
 
         free(mouse_dev->buttons);
-        free(mouse_dev);
 }