Changeset beb9336 in mainline for uspace/drv/bus/usb/usbhid/kbd/kbddev.c

Timestamp:

2012-08-24T14:07:52Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

041ab64

Parents:

bd29f9c9 (diff), db81577 (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 mainline

File:

• uspace/drv/bus/usb/usbhid/kbd/kbddev.c (modified) (7 diffs)

uspace/drv/bus/usb/usbhid/kbd/kbddev.c

@@ -34 +34 @@
  * USB HID keyboard device structure and API.
  */
+
+/* XXX Fix this */
+#define _DDF_DATA_IMPLANT
 
 #include <errno.h>
@@ -162 +165 @@
     ipc_callid_t icallid, ipc_call_t *icall)
 {
-        if (fun == NULL || fun->driver_data == NULL) {
-                usb_log_error("%s: Missing parameter.\n", __FUNCTION__);
-                async_answer_0(icallid, EINVAL);
-                return;
-        }
-
         const sysarg_t method = IPC_GET_IMETHOD(*icall);
-        usb_kbd_t *kbd_dev = fun->driver_data;
+        usb_kbd_t *kbd_dev = ddf_fun_data_get(fun);
 
         switch (method) {
@@ -501 +498 @@
         /* Store the initialized HID device and HID ops
          * to the DDF function. */
-        fun->ops = &kbdops;
-        fun->driver_data = kbd_dev;
+        ddf_fun_set_ops(fun, &kbdops);
+        ddf_fun_data_implant(fun, kbd_dev);
 
         int rc = ddf_fun_bind(fun);
@@ -508 +505 @@
                 usb_log_error("Could not bind DDF function: %s.\n",
                     str_error(rc));
-                fun->driver_data = NULL; /* We did not allocate this. */
                 ddf_fun_destroy(fun);
                 return rc;
@@ -514 +510 @@
 
         usb_log_debug("%s function created. Handle: %" PRIun "\n",
-            HID_KBD_FUN_NAME, fun->handle);
+            HID_KBD_FUN_NAME, ddf_fun_get_handle(fun));
 
         usb_log_debug("Adding DDF function to category %s...\n",
@@ -524 +520 @@
                     HID_KBD_CLASS_NAME, str_error(rc));
                 if (ddf_fun_unbind(fun) == EOK) {
-                        fun->driver_data = NULL; /* We did not allocate this. */
                         ddf_fun_destroy(fun);
                 } else {
                         usb_log_error(
                             "Failed to unbind `%s', will not destroy.\n",
-                            fun->name);
+                            ddf_fun_get_name(fun));
                 }
                 return rc;
@@ -757 +752 @@
                 if (ddf_fun_unbind(kbd_dev->fun) != EOK) {
                         usb_log_warning("Failed to unbind %s.\n",
-                            kbd_dev->fun->name);
+                            ddf_fun_get_name(kbd_dev->fun));
                 } else {
-                        usb_log_debug2("%s unbound.\n", kbd_dev->fun->name);
-                        kbd_dev->fun->driver_data = NULL;
+                        usb_log_debug2("%s unbound.\n",
+                            ddf_fun_get_name(kbd_dev->fun));
                         ddf_fun_destroy(kbd_dev->fun);
                 }
         }
-        free(kbd_dev);
 }