Changeset beb9336 in mainline for uspace/drv/char/xtkbd/xtkbd.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/char/xtkbd/xtkbd.c (modified) (6 diffs)

uspace/drv/char/xtkbd/xtkbd.c

@@ -34 +34 @@
 
 #include <errno.h>
-#include <devman.h>
 #include <ddf/log.h>
 #include <io/keycode.h>
@@ -207 +206 @@
         assert(dev);
         kbd->client_sess = NULL;
-        kbd->parent_sess = devman_parent_device_connect(EXCHANGE_SERIALIZE,
-            dev->handle, IPC_FLAG_BLOCKING);
+        kbd->parent_sess = ddf_dev_parent_sess_create(dev, EXCHANGE_SERIALIZE);
         if (!kbd->parent_sess)
                 return ENOMEM;
@@ -214 +212 @@
         kbd->kbd_fun = ddf_fun_create(dev, fun_exposed, "kbd");
         if (!kbd->kbd_fun) {
-                async_hangup(kbd->parent_sess);
-                return ENOMEM;
-        }
-        kbd->kbd_fun->ops = &kbd_ops;
-        kbd->kbd_fun->driver_data = kbd;
+                return ENOMEM;
+        }
+        ddf_fun_set_ops(kbd->kbd_fun, &kbd_ops);
 
         int ret = ddf_fun_bind(kbd->kbd_fun);
         if (ret != EOK) {
-                async_hangup(kbd->parent_sess);
-                kbd->kbd_fun->driver_data = NULL;
                 ddf_fun_destroy(kbd->kbd_fun);
                 return ENOMEM;
@@ -230 +224 @@
         ret = ddf_fun_add_to_category(kbd->kbd_fun, "keyboard");
         if (ret != EOK) {
-                async_hangup(kbd->parent_sess);
                 ddf_fun_unbind(kbd->kbd_fun);
-                kbd->kbd_fun->driver_data = NULL;
                 ddf_fun_destroy(kbd->kbd_fun);
                 return ENOMEM;
@@ -239 +231 @@
         kbd->polling_fibril = fibril_create(polling, kbd);
         if (!kbd->polling_fibril) {
-                async_hangup(kbd->parent_sess);
                 ddf_fun_unbind(kbd->kbd_fun);
-                kbd->kbd_fun->driver_data = NULL;
                 ddf_fun_destroy(kbd->kbd_fun);
                 return ENOMEM;
@@ -319 +309 @@
     ipc_callid_t icallid, ipc_call_t *icall)
 {
-        if (fun == NULL || fun->driver_data == NULL) {
-                ddf_msg(LVL_ERROR, "%s: Missing parameter.", __FUNCTION__);
-                async_answer_0(icallid, EINVAL);
-                return;
-        }
-
         const sysarg_t method = IPC_GET_IMETHOD(*icall);
-        xt_kbd_t *kbd = fun->driver_data;
+        xt_kbd_t *kbd = ddf_dev_data_get(ddf_fun_get_dev(fun));
 
         switch (method) {