Changeset 4c53333 in mainline for uspace/srv/hid/input/proto/mousedev.c

Timestamp:

2013-07-11T08:21:10Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

64e63ce1

Parents:

80445cf (diff), c8bb1633 (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 mainline changes

File:

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

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

@@ -43 +43 @@
 #include <errno.h>
 #include <ipc/mouseev.h>
-#include <input.h>
 #include <loc.h>
-#include <mouse.h>
-#include <mouse_port.h>
-#include <mouse_proto.h>
 #include <sys/typefmt.h>
+#include "../mouse.h"
+#include "../mouse_port.h"
+#include "../mouse_proto.h"
+#include "../input.h"
 
 /** Mousedev softstate */
@@ -96 +96 @@
                         retval = EOK;
                         break;
+                case MOUSEEV_ABS_MOVE_EVENT:
+                        mouse_push_event_abs_move(mousedev->mouse_dev,
+                                IPC_GET_ARG1(call), IPC_GET_ARG2(call),
+                                IPC_GET_ARG3(call), IPC_GET_ARG4(call));
+                        retval = EOK;
+                        break;
                 case MOUSEEV_BUTTON_EVENT:
                         mouse_push_event_button(mousedev->mouse_dev,
@@ -117 +123 @@
                 printf("%s: Failed starting session with '%s'\n", NAME,
                     mdev->svc_name);
-                return -1;
+                return ENOENT;
         }
         
@@ -125 +131 @@
                     NAME, mdev->svc_name);
                 async_hangup(sess);
-                return -1;
+                return ENOMEM;
         }
         
@@ -134 +140 @@
                 mousedev_destroy(mousedev);
                 async_hangup(sess);
-                return -1;
+                return ENOENT;
         }
         
@@ -145 +151 @@
                     NAME, mdev->svc_name);
                 mousedev_destroy(mousedev);
-                return -1;
+                return rc;
         }
         
-        return 0;
+        return EOK;
 }