WebSVN – HelenOS – Diff – /branches/dynload/uspace/srv/kbd/generic/kbd.c

 /*
  * Copyright (c) 2006 Josef Cejka
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * - Redistributions of source code must retain the above copyright
  *   notice, this list of conditions and the following disclaimer.
  * - Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
  * - The name of the author may not be used to endorse or promote products
  *   derived from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /**
  * @addtogroup kbdgen generic
  * @brief   HelenOS generic uspace keyboard handler.
  * @ingroup  kbd
  * @{
  */
 /** @file
  */
 #include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <ipc/ns.h>
+#include <async.h>
 #include <errno.h>
-#include <arch/kbd.h>
-#include <kbd.h>
 #include <libadt/fifo.h>
+#include <kbd/kbd.h>
+#include <kbd.h>
 #include <key_buffer.h>
+#include <kbd_port.h>
-#include <async.h>
+#include <kbd_ctl.h>
-#include <keys.h>
+#include <layout.h>
 #define NAME "kbd"
 int cons_connected = 0;
 int phone2cons = -1;
 keybuffer_t keybuffer;
-static void irq_handler(ipc_callid_t iid, ipc_call_t *call)
+void kbd_push_scancode(int scancode)
+{
-    int chr;
+    printf("scancode: 0x%x\n", scancode);
+    kbd_ctl_parse_scancode(scancode);
+}
-#ifdef MOUSE_ENABLED
+#include <kbd/keycode.h>
-    if (mouse_arch_process(phone2cons, call))
+void kbd_push_ev(int type, unsigned int key, unsigned int mods)
-        return;
-#endif
+{
-    kbd_arch_process(&keybuffer, call);
+    kbd_event_t ev;
-    if (cons_connected && phone2cons != -1) {
+    printf("type: %d\n", type);
-        /*
-         * recode to ASCII - one interrupt can produce more than one
-         * code so result is stored in fifo
+    printf("mods: 0x%x\n", mods);
-         */
-        while (!keybuffer_empty(&keybuffer)) {
+    printf("keycode: %u\n", key);
-            if (!keybuffer_pop(&keybuffer, (int *)&chr))
-                break;
+    ev.type = type;
+    ev.key = key;
-            async_msg_1(phone2cons, KBD_PUSHCHAR, chr);
+    ev.mods = mods;
-        }
+    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)
+{
     ipc_callid_t callid;
     ipc_call_t call;
     int retval;
     if (cons_connected) {
         ipc_answer_0(iid, ELIMIT);
         return;
+    }
     cons_connected = 1;
     ipc_answer_0(iid, EOK);
     while (1) {
         callid = async_get_call(&call);
         switch (IPC_GET_METHOD(call)) {
         case IPC_M_PHONE_HUNGUP:
             cons_connected = 0;
             ipc_hangup(phone2cons);
             phone2cons = -1;
             ipc_answer_0(callid, EOK);
             return;
         case IPC_M_CONNECT_TO_ME:
             if (phone2cons != -1) {
                 retval = ELIMIT;
                 break;
+            }
             phone2cons = IPC_GET_ARG5(call);
             retval = 0;
             break;
         default:
             retval = EINVAL;
+        }
         ipc_answer_0(callid, retval);
+    }
+}
 int main(int argc, char **argv)
+{
     printf(NAME ": HelenOS Keyboard service\n");
     ipcarg_t phonead;
-    /* Initialize arch dependent parts */
+    /* Initialize port driver. */
-    if (kbd_arch_init())
+    if (kbd_port_init())
         return -1;
     /* Initialize key buffer */
     keybuffer_init(&keybuffer);
     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;
     printf(NAME ": Accepting connections\n");
     async_manager();
-    /* Never reached */
+    /* Not reached. */
     return 0;
+}
 /**
  * @}
  */

Subversion Repositories HelenOS

(root)/branches/dynload/uspace/srv/kbd/generic/kbd.c – Rev 3150 → 4343