Changeset 5e718d9 in mainline for uspace/srv/hid/input/proto/mousedev.c

Timestamp:

2012-08-21T10:04:16Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

67edca6

Parents:

0da6c04 (diff), 6a97f2e (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 upstream (lp:~wtachi/helenos/bithenge)

File:

• uspace/srv/hid/input/proto/mousedev.c (modified) (2 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 */
@@ -94 +94 @@
                             IPC_GET_ARG1(call), IPC_GET_ARG2(call),
                             IPC_GET_ARG3(call));
+                        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;