Changes in uspace/drv/char/ps2mouse/ps2mouse.c [56fd7cf:9d58539] in mainline

File:

• uspace/drv/char/ps2mouse/ps2mouse.c (modified) (8 diffs)

uspace/drv/char/ps2mouse/ps2mouse.c

@@ -35 +35 @@
 #include <bool.h>
 #include <errno.h>
+#include <devman.h>
 #include <ddf/log.h>
 #include <io/keycode.h>
@@ -113 +114 @@
 int ps2_mouse_init(ps2_mouse_t *mouse, ddf_dev_t *dev)
 {
+        assert(mouse);
+        assert(dev);
         mouse->client_sess = NULL;
-        mouse->parent_sess = ddf_dev_parent_sess_create(dev, EXCHANGE_SERIALIZE);
+        mouse->parent_sess = devman_parent_device_connect(EXCHANGE_SERIALIZE,
+            dev->handle, IPC_FLAG_BLOCKING);
         if (!mouse->parent_sess)
                 return ENOMEM;
@@ -120 +124 @@
         mouse->mouse_fun = ddf_fun_create(dev, fun_exposed, "mouse");
         if (!mouse->mouse_fun) {
+                async_hangup(mouse->parent_sess);
                 return ENOMEM;
         }
-        ddf_fun_set_ops(mouse->mouse_fun, &mouse_ops);
+        mouse->mouse_fun->ops = &mouse_ops;
+        mouse->mouse_fun->driver_data = mouse;
 
         int ret = ddf_fun_bind(mouse->mouse_fun);
         if (ret != EOK) {
+                async_hangup(mouse->parent_sess);
+                mouse->mouse_fun->driver_data = NULL;
                 ddf_fun_destroy(mouse->mouse_fun);
                 return ENOMEM;
@@ -132 +140 @@
         ret = ddf_fun_add_to_category(mouse->mouse_fun, "mouse");
         if (ret != EOK) {
+                async_hangup(mouse->parent_sess);
                 ddf_fun_unbind(mouse->mouse_fun);
+                mouse->mouse_fun->driver_data = NULL;
                 ddf_fun_destroy(mouse->mouse_fun);
                 return ENOMEM;
@@ -151 +161 @@
                 ddf_msg(LVL_ERROR, "Failed to enable data reporting.");
                 async_exchange_end(exch);
+                async_hangup(mouse->parent_sess);
                 ddf_fun_unbind(mouse->mouse_fun);
+                mouse->mouse_fun->driver_data = NULL;
                 ddf_fun_destroy(mouse->mouse_fun);
                 return EIO;
@@ -161 +173 @@
                 ddf_msg(LVL_ERROR, "Failed to confirm data reporting: %hhx.",
                     report);
+                async_hangup(mouse->parent_sess);
                 ddf_fun_unbind(mouse->mouse_fun);
+                mouse->mouse_fun->driver_data = NULL;
                 ddf_fun_destroy(mouse->mouse_fun);
                 return EIO;
@@ -168 +182 @@
         mouse->polling_fibril = fibril_create(polling_f, mouse);
         if (!mouse->polling_fibril) {
+                async_hangup(mouse->parent_sess);
                 ddf_fun_unbind(mouse->mouse_fun);
+                mouse->mouse_fun->driver_data = NULL;
                 ddf_fun_destroy(mouse->mouse_fun);
                 return ENOMEM;
@@ -352 +368 @@
     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);
-        ps2_mouse_t *mouse = ddf_dev_data_get(ddf_fun_get_dev(fun));
+        ps2_mouse_t *mouse = fun->driver_data;
 
         switch (method) {