Changes in uspace/srv/hid/input/proto/mousedev.c [3123d2a:cce8a83] in mainline

File:

• uspace/srv/hid/input/proto/mousedev.c (modified) (8 diffs)

uspace/srv/hid/input/proto/mousedev.c

@@ -54 +54 @@
         /** Link to generic mouse device */
         mouse_dev_t *mouse_dev;
+        
+        /** Session to mouse device */
+        async_sess_t *sess;
 } mousedev_t;
 
@@ -69 +72 @@
 static void mousedev_destroy(mousedev_t *mousedev)
 {
+        if (mousedev->sess != NULL)
+                async_hangup(mousedev->sess);
+        
         free(mousedev);
 }
@@ -83 +89 @@
                 
                 if (!IPC_GET_IMETHOD(call)) {
-                        mousedev_destroy(mousedev);
+                        /* XXX Handle hangup */
                         return;
                 }
@@ -91 +97 @@
                 switch (IPC_GET_IMETHOD(call)) {
                 case MOUSEEV_MOVE_EVENT:
-                        mouse_push_event_move(mousedev->mouse_dev,
-                            IPC_GET_ARG1(call), IPC_GET_ARG2(call),
-                            IPC_GET_ARG3(call));
+                        mouse_push_event_move(mousedev->mouse_dev, IPC_GET_ARG1(call),
+                            IPC_GET_ARG2(call));
                         retval = EOK;
                         break;
                 case MOUSEEV_BUTTON_EVENT:
-                        mouse_push_event_button(mousedev->mouse_dev,
-                            IPC_GET_ARG1(call), IPC_GET_ARG2(call));
+                        mouse_push_event_button(mousedev->mouse_dev, IPC_GET_ARG1(call),
+                            IPC_GET_ARG2(call));
                         retval = EOK;
                         break;
@@ -117 +122 @@
                 printf("%s: Failed starting session with '%s'\n", NAME,
                     mdev->svc_name);
-                return ENOENT;
+                return -1;
         }
         
@@ -124 +129 @@
                 printf("%s: Failed allocating device structure for '%s'.\n",
                     NAME, mdev->svc_name);
-                async_hangup(sess);
-                return ENOMEM;
+                return -1;
         }
+        
+        mousedev->sess = sess;
         
         async_exch_t *exch = async_exchange_begin(sess);
@@ -133 +139 @@
                     mdev->svc_name);
                 mousedev_destroy(mousedev);
-                async_hangup(sess);
-                return ENOENT;
+                return -1;
         }
         
         int rc = async_connect_to_me(exch, 0, 0, 0, mousedev_callback_conn, mousedev);
         async_exchange_end(exch);
-        async_hangup(sess);
         
         if (rc != EOK) {
@@ -145 +149 @@
                     NAME, mdev->svc_name);
                 mousedev_destroy(mousedev);
-                return rc;
+                return -1;
         }
         
-        return EOK;
+        return 0;
 }