Changeset f1fae414 in mainline for uspace/drv/bus/usb/usbmouse/mouse.c

Timestamp:

2011-06-22T01:34:53Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

8d7e82c1, cac458f

Parents:

72ec8cc (diff), bf172825 (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/drv/bus/usb/usbmouse/mouse.c (moved) (moved from uspace/drv/usbmouse/mouse.c ) (3 diffs)

uspace/drv/bus/usb/usbmouse/mouse.c

@@ -38 +38 @@
 #include <errno.h>
 #include <str_error.h>
-#include <ipc/mouse.h>
+#include <ipc/mouseev.h>
 #include <async.h>
 #include "mouse.h"
@@ -86 +86 @@
                         
                         async_exch_t *exch = async_exchange_begin(mouse->console_sess);
-                        async_req_2_0(exch, MEVENT_MOVE, -shift_x / 10, -shift_y / 10);
+                        async_req_2_0(exch, MOUSEEV_MOVE_EVENT, -shift_x / 10, -shift_y / 10);
                         async_exchange_end(exch);
                 }
@@ -93 +93 @@
                         
                         async_exch_t *exch = async_exchange_begin(mouse->console_sess);
-                        async_req_2_0(exch, MEVENT_BUTTON, 1, 1);
-                        async_req_2_0(exch, MEVENT_BUTTON, 1, 0);
+                        async_req_2_0(exch, MOUSEEV_BUTTON_EVENT, 1, 1);
+                        async_req_2_0(exch, MOUSEEV_BUTTON_EVENT, 1, 0);
                         async_exchange_end(exch);
                 }