Changeset 5f88293 in mainline for uspace/drv

Timestamp:

2011-06-12T15:44:38Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

60e5a856

Parents:

af897ff0

Message:

Rename 'kbd' server to 'input' server.

Location:

uspace/drv/usbhid

Files:

• kbd/kbddev.c (modified) (2 diffs)
• mouse/mousedev.c (modified) (2 diffs)
• multimedia/multimedia.c (modified) (2 diffs)

uspace/drv/usbhid/kbd/kbddev.c

@@ -41 +41 @@
 #include <io/keycode.h>
 #include <io/console.h>
-#include <ipc/kbd.h>
+#include <ipc/kbdev.h>
 #include <async.h>
 #include <async_obsolete.h>
@@ -303 +303 @@
         }
         
-        async_obsolete_msg_2(kbd_dev->console_phone, KBD_EVENT, type, key);
+        async_obsolete_msg_2(kbd_dev->console_phone, KBDEV_EVENT, type, key);
 }
 

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);
         }

uspace/drv/usbhid/multimedia/multimedia.c

@@ -50 +50 @@
 #include <str_error.h>
 
-#include <ipc/kbd.h>
+#include <ipc/kbdev.h>
 #include <io/console.h>
 
@@ -162 +162 @@
         }
         
-        async_obsolete_msg_4(multim_dev->console_phone, KBD_EVENT, ev.type, ev.key, 
+        async_obsolete_msg_4(multim_dev->console_phone, KBDEV_EVENT, ev.type, ev.key, 
             ev.mods, ev.c);
 }