Changeset f89979b in mainline for uspace/srv/kbd/generic/kbd.c

Timestamp:

2009-02-17T23:05:15Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

24ff4df

Parents:

96e0748d

Message:

Keyboard driver overhaul — organize by hardware structure. This is w.i.p. Modifier keys, as well as ppc32, ia64 and sparc64 will not work yet.

File:

• uspace/srv/kbd/generic/kbd.c (modified) (6 diffs)

uspace/srv/kbd/generic/kbd.c

@@ -48 +48 @@
 #include <kbd/kbd.h>
 
-#include <arch/kbd.h>
 #include <kbd.h>
 #include <key_buffer.h>
-#include <keys.h>
+#include <kbd_port.h>
+#include <kbd_ctl.h>
+#include <layout.h>
 
 #define NAME "kbd"
@@ -59 +60 @@
 keybuffer_t keybuffer;  
 
-static void irq_handler(ipc_callid_t iid, ipc_call_t *call)
+void kbd_push_scancode(int scancode)
+{
+        printf("scancode: 0x%x\n", scancode);
+        kbd_ctl_parse_scancode(scancode);
+}
+
+#include <kbd/keycode.h>
+void kbd_push_ev(int type, unsigned int key, unsigned int mods)
 {
         kbd_event_t ev;
 
-#ifdef MOUSE_ENABLED
-        if (mouse_arch_process(phone2cons, call))
-                return;
-#endif
-        
-        kbd_arch_process(&keybuffer, call);
+        printf("type: %d\n", type);
+        printf("mods: 0x%x\n", mods);
+        printf("keycode: %u\n", key);
 
-        if (cons_connected && phone2cons != -1) {
-                /*
-                 * One interrupt can produce more than one event so the result
-                 * is stored in a FIFO.
-                 */
-                while (!keybuffer_empty(&keybuffer)) {
-                        if (!keybuffer_pop(&keybuffer, &ev))
-                                break;
+        ev.type = type;
+        ev.key = key;
+        ev.mods = mods;
 
-                        async_msg_4(phone2cons, KBD_EVENT, ev.type, ev.key,
-                            ev.mods, ev.c);
-                }
-        }
+        ev.c = layout_parse_ev(&ev);
+
+        async_msg_4(phone2cons, KBD_EVENT, ev.type, ev.key, ev.mods, ev.c);
 }
+
+//static void irq_handler(ipc_callid_t iid, ipc_call_t *call)
+//{
+//      kbd_event_t ev;
+//
+//      kbd_arch_process(&keybuffer, call);
+//
+//      if (cons_connected && phone2cons != -1) {
+//              /*
+//               * One interrupt can produce more than one event so the result
+//               * is stored in a FIFO.
+//               */
+//              while (!keybuffer_empty(&keybuffer)) {
+//                      if (!keybuffer_pop(&keybuffer, &ev))
+//                              break;
+//
+//                      async_msg_4(phone2cons, KBD_EVENT, ev.type, ev.key,
+//                          ev.mods, ev.c);
+//              }
+//      }
+//}
 
 static void console_connection(ipc_callid_t iid, ipc_call_t *icall)
@@ -123 +143 @@
 
 
+
 int main(int argc, char **argv)
 {
@@ -129 +150 @@
         ipcarg_t phonead;
         
-        /* Initialize arch dependent parts */
-        if (kbd_arch_init())
+        /* Initialize port driver. */
+        if (kbd_port_init())
                 return -1;
         
@@ -137 +158 @@
         
         async_set_client_connection(console_connection);
-        async_set_interrupt_received(irq_handler);
-        /* Register service at nameserver */
+
+        /* Register service at nameserver. */
         if (ipc_connect_to_me(PHONE_NS, SERVICE_KEYBOARD, 0, 0, &phonead) != 0)
                 return -1;
@@ -145 +166 @@
         async_manager();
 
-        /* Never reached */
+        /* Not reached. */
         return 0;
 }