Changeset 215abc1 in mainline for uspace/srv/kbd/ctl

Timestamp:

2009-06-03T18:49:33Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

05b9912

Parents:

bbdbf86

Message:

keyboard server rewrite: rename "kbd events" to more generic "console events" and similar changes
rename key_buffer.* to keybuffer.*
coding style changes

Location:

uspace/srv/kbd/ctl

Files:

• gxe_fb.c (modified) (1 diff)
• pc.c (modified) (3 diffs)
• stty.c (modified) (1 diff)
• sun.c (modified) (3 diffs)

uspace/srv/kbd/ctl/gxe_fb.c

@@ -37 +37 @@
 
 #include <kbd.h>
-#include <kbd/kbd.h>
-#include <kbd/keycode.h>
+#include <io/console.h>
+#include <io/keycode.h>
 #include <kbd_ctl.h>
 #include <gsp.h>

uspace/srv/kbd/ctl/pc.c

@@ -33 +33 @@
 /**
  * @file
- * @brief       PC keyboard controller driver.
+ * @brief PC keyboard controller driver.
  */
 
 #include <kbd.h>
-#include <kbd/kbd.h>
-#include <kbd/keycode.h>
+#include <io/console.h>
+#include <io/keycode.h>
 #include <kbd_ctl.h>
 #include <gsp.h>
@@ -189 +189 @@
 void kbd_ctl_parse_scancode(int scancode)
 {
-        kbd_ev_type_t type;
+        console_ev_type_t type;
         unsigned int key;
         int *map;
@@ -214 +214 @@
         if (scancode & 0x80) {
                 scancode &= ~0x80;
-                type = KE_RELEASE;
+                type = KEY_RELEASE;
         } else {
-                type = KE_PRESS;
+                type = KEY_PRESS;
         }
 

uspace/srv/kbd/ctl/stty.c

@@ -37 +37 @@
 
 #include <kbd.h>
-#include <kbd/kbd.h>
-#include <kbd/keycode.h>
+#include <io/keycode.h>
 #include <kbd_ctl.h>
 #include <gsp.h>

uspace/srv/kbd/ctl/sun.c

@@ -37 +37 @@
 
 #include <kbd.h>
-#include <kbd/kbd.h>
-#include <kbd/keycode.h>
+#include <io/console.h>
+#include <io/keycode.h>
 #include <kbd_ctl.h>
 
@@ -53 +53 @@
 void kbd_ctl_parse_scancode(int scancode)
 {
-        kbd_ev_type_t type;
+        console_ev_type_t type;
         unsigned int key;
 
@@ -64 +64 @@
         if (scancode & KBD_KEY_RELEASE) {
                 scancode &= ~KBD_KEY_RELEASE;
-                type = KE_RELEASE;
+                type = KEY_RELEASE;
         } else {
-                type = KE_PRESS;
+                type = KEY_PRESS;
         }