Changeset d900699 in mainline for uspace/drv/usbhid/mouse/mousedev.c

Timestamp:

2011-06-17T16:48: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:

f3a605be

Parents:

df8110d3 (diff), 98caf49 (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/usbhid/mouse/mousedev.c (modified) (2 diffs)

uspace/drv/usbhid/mouse/mousedev.c

@@ -47 +47 @@
 #include <io/console.h>
 
-#include <ipc/kbd.h>
+#include <ipc/kbdev.h>
 #include <io/keycode.h>
 
@@ -219 +219 @@
         for (i = 0; i < count * 3; ++i) {
                 usb_log_debug2("Sending key %d to the console\n", ev.key);
-                async_obsolete_msg_4(mouse_dev->wheel_phone, KBD_EVENT, ev.type, 
+                async_obsolete_msg_4(mouse_dev->wheel_phone, KBDEV_EVENT, ev.type, 
                     ev.key, ev.mods, ev.c);
                 // send key release right away
-                async_obsolete_msg_4(mouse_dev->wheel_phone, KBD_EVENT, KEY_RELEASE, 
+                async_obsolete_msg_4(mouse_dev->wheel_phone, KBDEV_EVENT, KEY_RELEASE, 
                     ev.key, ev.mods, ev.c);
         }