Changes in uspace/drv/char/ps2mouse/ps2mouse.c [d87561c:68c60b0] in mainline

File:

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

uspace/drv/char/ps2mouse/ps2mouse.c

@@ -33 +33 @@
  */
 
-#include <stdbool.h>
+#include <bool.h>
 #include <errno.h>
+#include <devman.h>
 #include <ddf/log.h>
 #include <io/keycode.h>
@@ -70 +71 @@
 #define PS2_BUTTON_MASK(button) (1 << button)
 
-#define MOUSE_READ_BYTE_TEST(sess, value_) \
+#define MOUSE_READ_BYTE_TEST(sess, value) \
 do { \
-        uint8_t value = (value_); \
         uint8_t data = 0; \
         const ssize_t size = chardev_read(sess, &data, 1); \
         if (size != 1) { \
-                ddf_msg(LVL_ERROR, "Failed reading byte: %zd)", size);\
+                ddf_msg(LVL_ERROR, "Failed reading byte: %d)", size);\
                 return size < 0 ? size : EIO; \
         } \
-        if (data != value) { \
+        if (data != (value)) { \
                 ddf_msg(LVL_DEBUG, "Failed testing byte: got %hhx vs. %hhx)", \
-                    data, value); \
+                    data, (value)); \
                 return EIO; \
         } \
 } while (0)
 
-#define MOUSE_WRITE_BYTE(sess, value_) \
+#define MOUSE_WRITE_BYTE(sess, value) \
 do { \
-        uint8_t value = (value_); \
         uint8_t data = (value); \
         const ssize_t size = chardev_write(sess, &data, 1); \
@@ -115 +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;
@@ -122 +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;
@@ -134 +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;
@@ -153 +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;
@@ -163 +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;
@@ -170 +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;
@@ -354 +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) {