WebSVN – HelenOS – Path Comparison – / – /branches/dynload/uspace/ Rev 4342 and /branches/dynload/uspace/ Rev 4343

Ignore whitespace Rev 4342 → Rev 4343

 /branches/dynload/uspace/app/tetris/input.c
 ,7 → 114,7
         if (!getchar_inprog) {
             cons_phone = get_cons_phone();
             getchar_inprog = async_send_2(cons_phone,
-                CONSOLE_GETCHAR, 0, 0, &charcall);
+                CONSOLE_GETKEY, 0, 0, &charcall);
         }
         if (!s)
             async_wait_for(getchar_inprog, &rc);
 ,7 → 127,7
         if (rc) {
             stop("end of file, help");
         }
-        lastchar = IPC_GET_ARG1(charcall);
+        lastchar = IPC_GET_ARG4(charcall);
     }
     if (tvp) {
         /* since there is input, we may not have timed out */

 /branches/dynload/uspace/app/trace/trace.c
 ,7 → 519,7
     int rc;
     /* Spawn a program loader */
-    ldr = loader_spawn(path);
+    ldr = loader_connect();
     if (ldr == NULL)
         return 0;
 ,7 → 623,7
         V_INTEGER,
         V_INTEGER,
         V_INTEGER,
-        V_INTEGER
+        V_INTEGER
     };
     next_thread_id = 1;
 ,9 → 658,10
     proto_register(SERVICE_VFS, p);
     p = proto_new("console");
-    resp_def[0] = V_CHAR;
-    o = oper_new("getchar", 0, arg_def, V_INTEGER, 2, resp_def);
-    proto_add_oper(p, CONSOLE_GETCHAR, o);
+    resp_def[0] = V_INTEGER; resp_def[1] = V_INTEGER;
+    resp_def[2] = V_INTEGER; resp_def[3] = V_CHAR;
+    o = oper_new("getkey", 0, arg_def, V_ERRNO, 4, resp_def);
+    proto_add_oper(p, CONSOLE_GETKEY, o);
     arg_def[0] = V_CHAR;
     o = oper_new("putchar", 1, arg_def, V_VOID, 0, resp_def);

 /branches/dynload/uspace/lib/libc/include/kbd/keycode.h
 ,0 → 1,210
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * 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 libc
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_KBD_KEYCODE_H_
+#define LIBC_KBD_KEYCODE_H_
+/** Keycode definitions.
+ *
+ * A keycode identifies a key by its position on the keyboard, rather
+ * than by its label. For human readability, key positions are noted
+ * with the key label on a keyboard with US layout. This label has
+ * nothing to do with the character, that the key produces
+ * -- this is determined by the keymap.
+ *
+ * The keyboard model reflects a standard PC keyboard layout.
+ * Non-standard keyboards need to be mapped to this model in some
+ * logical way. Scancodes are mapped to keycodes with a scanmap.
+ *
+ * For easier mapping to the model and to emphasize the nature of keycodes,
+ * they really are organized here by position, rather than by label.
+ */
+enum keycode {
+    /* Main block row 1 */
+    KC_BACKTICK = 1,
+    KC_1,
+    KC_2,
+    KC_3,
+    KC_4,
+    KC_5,
+    KC_6,
+    KC_7,
+    KC_8,
+    KC_9,
+    KC_0,
+    KC_MINUS,
+    KC_EQUALS,
+    KC_BACKSPACE,
+    /* Main block row 2 */
+    KC_TAB,
+    KC_Q,
+    KC_W,
+    KC_E,
+    KC_R,
+    KC_T,
+    KC_Y,
+    KC_U,
+    KC_I,
+    KC_O,
+    KC_P,
+    KC_LBRACKET,
+    KC_RBRACKET,
+    /* Main block row 3 */
+    KC_CAPS_LOCK,
+    KC_A,
+    KC_S,
+    KC_D,
+    KC_F,
+    KC_G,
+    KC_H,
+    KC_J,
+    KC_K,
+    KC_L,
+    KC_SEMICOLON,
+    KC_QUOTE,
+    KC_BACKSLASH,
+    KC_ENTER,
+    /* Main block row 4 */
+    KC_LSHIFT,
+    KC_Z,
+    KC_X,
+    KC_C,
+    KC_V,
+    KC_B,
+    KC_N,
+    KC_M,
+    KC_COMMA,
+    KC_PERIOD,
+    KC_SLASH,
+    KC_RSHIFT,
+    /* Main block row 5 */
+    KC_LCTRL,
+    KC_LALT,
+    KC_SPACE,
+    KC_RALT,
+    KC_RCTRL,
+    /* Function keys block */
+    KC_ESCAPE,
+    KC_F1,
+    KC_F2,
+    KC_F3,
+    KC_F4,
+    KC_F5,
+    KC_F6,
+    KC_F7,
+    KC_F8,
+    KC_F9,
+    KC_F10,
+    KC_F11,
+    KC_F12,
+    KC_PRTSCR,
+    KC_SCROLL_LOCK,
+    KC_PAUSE,
+    /* Cursor keys block */
+    KC_INSERT,
+    KC_HOME,
+    KC_PAGE_UP,
+    KC_DELETE,
+    KC_END,
+    KC_PAGE_DOWN,
+    KC_UP,
+    KC_LEFT,
+    KC_DOWN,
+    KC_RIGHT,
+    /* Numeric block */
+    KC_NUM_LOCK,
+    KC_NSLASH,
+    KC_NTIMES,
+    KC_NMINUS,
+    KC_NPLUS,
+    KC_NENTER,
+    KC_N7,
+    KC_N8,
+    KC_N9,
+    KC_N4,
+    KC_N5,
+    KC_N6,
+    KC_N1,
+    KC_N2,
+    KC_N3,
+    KC_N0,
+    KC_NPERIOD
+} keycode_t;
+enum keymod {
+    KM_SHIFT    = 0x01,
+    KM_CTRL     = 0x02,
+    KM_ALT      = 0x04
+} keymod_t;
+#endif
+/** @}
+ */

 /branches/dynload/uspace/lib/libc/include/kbd/kbd.h
 ,0 → 1,63
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * 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 libc
+ * @{
+ */
+/** @file
+ */
+#ifndef LIBC_KBD_H_
+#define LIBC_KBD_H_
+typedef enum kbd_ev_type {
+    KE_PRESS,
+    KE_RELEASE
+} kbd_ev_type_t;
+/** Keyboard event structure. */
+typedef struct {
+    /** Press or release event. */
+    kbd_ev_type_t type;
+    /** Keycode of the key that was pressed or released. */
+    unsigned int key;
+    /** Bitmask of modifiers held. */
+    unsigned int mods;
+    /** The character that was generated or '\0' for none. */
+    char c;
+} kbd_event_t;
+extern int kbd_get_event(kbd_event_t *);
+#endif
+/** @}
+ */

 /branches/dynload/uspace/lib/libc/include/loader/loader.h
 ,7 → 44,8
     int phone_id;
 } loader_t;
-extern loader_t *loader_spawn(const char *name);
+extern int loader_spawn(const char *);
+extern loader_t *loader_connect(void);
 extern int loader_get_task_id(loader_t *, task_id_t *);
 extern int loader_set_pathname(loader_t *, const char *);
 extern int loader_set_args(loader_t *, char *const []);

 /branches/dynload/uspace/lib/libc/include/ipc/console.h
 ,7 → 38,7
 #include <ipc/ipc.h>
 typedef enum {
-    CONSOLE_GETCHAR = IPC_FIRST_USER_METHOD,
+    CONSOLE_GETKEY = IPC_FIRST_USER_METHOD,
     CONSOLE_PUTCHAR,
     CONSOLE_CLEAR,
     CONSOLE_GOTO,

 /branches/dynload/uspace/lib/libc/include/ipc/services.h
 ,7 → 38,8
 #define LIBIPC_SERVICES_H_
 typedef enum {
-    SERVICE_PCI = 1,
+    SERVICE_LOAD = 1,
+    SERVICE_PCI,
     SERVICE_KEYBOARD,
     SERVICE_VIDEO,
     SERVICE_CONSOLE,

 /branches/dynload/uspace/lib/libc/generic/kbd.c
 ,0 → 1,61
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * 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 libc
+ * @{
+ */
+/** @file
+ */
+#include <stdio.h>
+#include <io/stream.h>
+#include <kbd/kbd.h>
+#include <ipc/ipc.h>
+#include <ipc/console.h>
+#include <async.h>
+int kbd_get_event(kbd_event_t *ev)
+{
+    int console_phone = get_cons_phone();
+    ipcarg_t r0, r1, r2, r3;
+    int rc;
+    rc = async_req_0_4(console_phone, CONSOLE_GETKEY, &r0, &r1, &r2, &r3);
+    if (rc < 0)
+        return -1;
+    ev->type = r0;
+    ev->key = r1;
+    ev->mods = r2;
+    ev->c = r3;
+    return 0;
+}
+/** @}
+ */

 /branches/dynload/uspace/lib/libc/generic/task.c
 ,8 → 63,8
     task_id_t task_id;
     int rc;
-    /* Spawn a program loader. */
-    ldr = loader_spawn(path);
+    /* Connect to a program loader. */
+    ldr = loader_connect();
     if (ldr == NULL)
         return 0;
 ,7 → 89,6
         goto error;
     /* Run it. */
-    /* Load the program. */
     rc = loader_run(ldr);
     if (rc != EOK)
         goto error;

 /branches/dynload/uspace/lib/libc/generic/loader.c
 ,6 → 34,7
 #include <ipc/ipc.h>
 #include <ipc/loader.h>
+#include <ipc/services.h>
 #include <libc.h>
 #include <task.h>
 #include <string.h>
 ,33 → 51,27
  * @return  Pointer to the loader connection structure (should be
  *      de-allocated using free() after use).
  */
-loader_t *loader_spawn(const char *name)
+int loader_spawn(const char *name)
 {
-    int phone_id, rc;
+    return __SYSCALL2(SYS_PROGRAM_SPAWN_LOADER,
+        (sysarg_t) name, strlen(name));
+}
+loader_t *loader_connect(void)
+{
     loader_t *ldr;
+    int phone_id;
-    /*
-     * Ask kernel to spawn a new loader task.
-     */
-    rc = __SYSCALL3(SYS_PROGRAM_SPAWN_LOADER, (sysarg_t) &phone_id,
-        (sysarg_t) name, strlen(name));
-    if (rc != 0)
+    phone_id = ipc_connect_me_to(PHONE_NS, SERVICE_LOAD, 0, 0);
+    if (phone_id < 0)
         return NULL;
-    /*
-     * Say hello so that the loader knows the incoming connection's
-     * phone hash.
-     */
-    rc = async_req_0_0(phone_id, LOADER_HELLO);
-    if (rc != EOK)
-        return NULL;
     ldr = malloc(sizeof(loader_t));
     if (ldr == NULL)
         return NULL;
     ldr->phone_id = phone_id;
-    return ldr;
+    return ldr;
 }
 /** Get ID of the new task.

 /branches/dynload/uspace/lib/libc/generic/io/stream.c
 ,6 → 43,7
 #include <ipc/fb.h>
 #include <ipc/services.h>
 #include <ipc/console.h>
+#include <kbd/kbd.h>
 #include <unistd.h>
 #include <async.h>
 #include <sys/types.h>
 ,13 → 59,17
 {
     open_console();
     if (console_phone >= 0) {
-        ipcarg_t r0, r1;
+        kbd_event_t ev;
+        int rc;
         size_t i = 0;
         while (i < count) {
-            if (async_req_0_2(console_phone, CONSOLE_GETCHAR, &r0, &r1) < 0)
-                return -1;
-            ((char *) buf)[i++] = r0;
+            do {
+                rc = kbd_get_event(&ev);
+                if (rc < 0) return -1;
+            } while (ev.c == 0 || ev.type == KE_RELEASE);
+            ((char *) buf)[i++] = ev.c;
         }
         return i;
     } else {

/branches/dynload/uspace/lib/libc/Makefile
84,6 → 84,7
generic/time.c \
generic/err.c \
generic/stdlib.c \
generic/kbd.c \
generic/mman.c \
generic/udebug.c \
generic/vfs/vfs.c \

/branches/dynload/uspace/srv/kbd/arch/mips32eb
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/branches/dynload/uspace/srv/kbd/arch/amd64
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

 /branches/dynload/uspace/srv/kbd/ctl/pc.c
 ,0 → 1,164
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * 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 kbd_ctl
+ * @ingroup kbd
+ * @{
+ */
+/**
+ * @file
+ * @brief   PC keyboard controller driver.
+ */
+#include <kbd.h>
+#include <kbd/kbd.h>
+#include <kbd/keycode.h>
+#include <kbd_ctl.h>
+static int scanmap_simple[];
+void kbd_ctl_parse_scancode(int scancode)
+{
+    kbd_ev_type_t type;
+    unsigned int key;
+    if (scancode < 0 || scancode >= 0x100)
+        return;
+    if (scancode & 0x80) {
+        scancode &= ~0x80;
+        type = KE_RELEASE;
+    } else {
+        type = KE_PRESS;
+    }
+    key = scanmap_simple[scancode];
+    if (key != 0)
+        kbd_push_ev(type, key, 0);
+}
+static int scanmap_simple[128] = {
+    [0x29] = KC_BACKTICK,
+    [0x02] = KC_1,
+    [0x03] = KC_2,
+    [0x04] = KC_3,
+    [0x05] = KC_4,
+    [0x06] = KC_5,
+    [0x07] = KC_6,
+    [0x08] = KC_7,
+    [0x09] = KC_8,
+    [0x0a] = KC_9,
+    [0x0b] = KC_0,
+    [0x0c] = KC_MINUS,
+    [0x0d] = KC_EQUALS,
+    [0x0e] = KC_BACKSPACE,
+    [0x0f] = KC_TAB,
+    [0x10] = KC_Q,
+    [0x11] = KC_W,
+    [0x12] = KC_E,
+    [0x13] = KC_R,
+    [0x14] = KC_T,
+    [0x15] = KC_Y,
+    [0x16] = KC_U,
+    [0x17] = KC_I,
+    [0x18] = KC_O,
+    [0x19] = KC_P,
+    [0x1a] = KC_LBRACKET,
+    [0x1b] = KC_RBRACKET,
+    [0x3a] = KC_CAPS_LOCK,
+    [0x1e] = KC_A,
+    [0x1f] = KC_S,
+    [0x20] = KC_D,
+    [0x21] = KC_F,
+    [0x22] = KC_G,
+    [0x23] = KC_H,
+    [0x24] = KC_J,
+    [0x25] = KC_K,
+    [0x26] = KC_L,
+    [0x27] = KC_SEMICOLON,
+    [0x28] = KC_QUOTE,
+    [0x2b] = KC_BACKSLASH,
+    [0x2a] = KC_LSHIFT,
+    [0x2c] = KC_Z,
+    [0x2d] = KC_X,
+    [0x2e] = KC_C,
+    [0x2f] = KC_V,
+    [0x30] = KC_B,
+    [0x31] = KC_N,
+    [0x32] = KC_M,
+    [0x33] = KC_COMMA,
+    [0x34] = KC_PERIOD,
+    [0x35] = KC_SLASH,
+    [0x36] = KC_RSHIFT,
+    [0x1d] = KC_LCTRL,
+    [0x38] = KC_LALT,
+    [0x39] = KC_SPACE,
+    [0x01] = KC_ESCAPE,
+    [0x3b] = KC_F1,
+    [0x3c] = KC_F2,
+    [0x3d] = KC_F3,
+    [0x3e] = KC_F4,
+    [0x3f] = KC_F5,
+    [0x40] = KC_F6,
+    [0x41] = KC_F7,
+    [0x42] = KC_F8,
+    [0x43] = KC_F9,
+    [0x44] = KC_F10,
+    [0x57] = KC_F11,
+    [0x58] = KC_F12,
+    [0x1c] = KC_ENTER
+/*
+    [0x1] = KC_PRNSCR,
+    [0x1] = KC_SCROLL_LOCK,
+    [0x1] = KC_PAUSE,
+*/
+};
+/**
+ * @}
+ */

 /branches/dynload/uspace/srv/kbd/ctl/stty.c
 ,0 → 1,261
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * 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 kbd_ctl
+ * @ingroup kbd
+ * @{
+ */
+/**
+ * @file
+ * @brief   Serial TTY-like keyboard controller driver.
+ */
+#include <kbd.h>
+#include <kbd/kbd.h>
+#include <kbd/keycode.h>
+#include <kbd_ctl.h>
+static void parse_ds_start(int scancode);
+static void parse_ds_e(int scancode);
+static void parse_ds_e1(int scancode);
+static void parse_ds_e2(int scancode);
+static void parse_ds_e2a(int scancode);
+static void parse_ds_e2b(int scancode);
+static void parse_leaf(int scancode, int *map, size_t map_length);
+enum dec_state {
+    ds_start,
+    ds_e,
+    ds_e1,
+    ds_e2,
+    ds_e2a,
+    ds_e2b
+};
+static int map_start[] = {
+    [0x60] = KC_BACKTICK,
+    [0x31] = KC_1,
+    [0x32] = KC_2,
+    [0x33] = KC_3,
+    [0x34] = KC_4,
+    [0x35] = KC_5,
+    [0x36] = KC_6,
+    [0x37] = KC_7,
+    [0x38] = KC_8,
+    [0x39] = KC_9,
+    [0x30] = KC_0,
+    [0x2d] = KC_MINUS,
+    [0x3d] = KC_EQUALS,
+    [0x08] = KC_BACKSPACE,
+    [0x0f] = KC_TAB,
+    [0x71] = KC_Q,
+    [0x77] = KC_W,
+    [0x65] = KC_E,
+    [0x72] = KC_R,
+    [0x74] = KC_T,
+    [0x79] = KC_Y,
+    [0x75] = KC_U,
+    [0x69] = KC_I,
+    [0x6f] = KC_O,
+    [0x70] = KC_P,
+    [0x5b] = KC_LBRACKET,
+    [0x5d] = KC_RBRACKET,
+//  [0x3a] = KC_CAPS_LOCK,
+    [0x61] = KC_A,
+    [0x73] = KC_S,
+    [0x64] = KC_D,
+    [0x66] = KC_F,
+    [0x67] = KC_G,
+    [0x68] = KC_H,
+    [0x6a] = KC_J,
+    [0x6b] = KC_K,
+    [0x6c] = KC_L,
+    [0x3b] = KC_SEMICOLON,
+    [0x27] = KC_QUOTE,
+    [0x5c] = KC_BACKSLASH,
+//  [0x2a] = KC_LSHIFT,
+    [0x7a] = KC_Z,
+    [0x78] = KC_X,
+    [0x63] = KC_C,
+    [0x76] = KC_V,
+    [0x62] = KC_B,
+    [0x6e] = KC_N,
+    [0x6d] = KC_M,
+    [0x2c] = KC_COMMA,
+    [0x2e] = KC_PERIOD,
+    [0x2f] = KC_SLASH,
+//  [0x36] = KC_RSHIFT,
+//  [0x1d] = KC_LCTRL,
+//  [0x38] = KC_LALT,
+    [0x20] = KC_SPACE,
+    [0x1b] = KC_ESCAPE,
+    [0x0a] = KC_ENTER,
+    [0x0d] = KC_ENTER
+/*
+    [0x1] = KC_PRNSCR,
+    [0x1] = KC_SCROLL_LOCK,
+    [0x1] = KC_PAUSE,
+*/
+};
+static int map_e1[] =
+{
+    [0x50] = KC_F1,
+    [0x51] = KC_F2,
+    [0x52] = KC_F3,
+    [0x53] = KC_F4,
+};
+static int map_e2[] =
+{
+    [0x41] = KC_UP,
+    [0x42] = KC_DOWN,
+    [0x44] = KC_LEFT,
+    [0x43] = KC_RIGHT,
+};
+static int map_e2a[] =
+{
+    [0x35] = KC_F5,
+    [0x37] = KC_F6,
+    [0x38] = KC_F7,
+    [0x39] = KC_F8,
+};
+static int map_e2b[] =
+{
+    [0x30] = KC_F9,
+    [0x31] = KC_F10,
+    [0x32] = KC_F11,
+    [0x33] = KC_F12,
+};
+static enum dec_state ds;
+void kbd_ctl_parse_scancode(int scancode)
+{
+    switch (ds) {
+    case ds_start:  parse_ds_start(scancode); break;
+    case ds_e:  parse_ds_e(scancode); break;
+    case ds_e1: parse_ds_e1(scancode); break;
+    case ds_e2: parse_ds_e2(scancode); break;
+    case ds_e2a:    parse_ds_e2a(scancode); break;
+    case ds_e2b:    parse_ds_e2b(scancode); break;
+    }
+}
+static void parse_ds_start(int scancode)
+{
+    if (scancode < 0 || scancode >= sizeof(map_start) / sizeof(int))
+        return;
+    if (scancode == 0x1b) {
+        ds = ds_e;
+        return;
+    }
+    parse_leaf(scancode, map_start, sizeof(map_start) / sizeof(int));
+}
+static void parse_ds_e(int scancode)
+{
+    if (scancode < 0 || scancode >= 0x80) return;
+    switch (scancode) {
+    case 0x4f: ds = ds_e1; return;
+    case 0x5b: ds = ds_e2; return;
+    case 0x1b: ds = ds_start; break;
+    default: ds = ds_start; return;
+    }
+    kbd_push_ev(KE_PRESS, KC_ESCAPE, 0);
+}
+static void parse_ds_e1(int scancode)
+{
+    parse_leaf(scancode, map_e1, sizeof(map_e1) / sizeof(int));
+}
+static void parse_ds_e2(int scancode)
+{
+    switch (scancode) {
+    case 0x31: ds = ds_e2a; break;
+    case 0x32: ds = ds_e2b; break;
+    default: ds = ds_start; break;
+    }
+    parse_leaf(scancode, map_e2, sizeof(map_e2) / sizeof(int));
+}
+static void parse_ds_e2a(int scancode)
+{
+    parse_leaf(scancode, map_e2a, sizeof(map_e2a) / sizeof(int));
+}
+static void parse_ds_e2b(int scancode)
+{
+    parse_leaf(scancode, map_e2b, sizeof(map_e2b) / sizeof(int));
+}
+static void parse_leaf(int scancode, int *map, size_t map_length)
+{
+    unsigned int key;
+    ds = ds_start;
+    if (scancode < 0 || scancode >= map_length)
+        return;
+    key = map[scancode];
+    if (key != 0)
+        kbd_push_ev(KE_PRESS, key, 0);
+}
+/**
+ * @}
+ */

 /branches/dynload/uspace/srv/kbd/ctl/sun.c
 ,0 → 1,204
+/*
+ * Copyright (c) 2006 Jakub Jermar
+ * 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 kbd_ctl
+ * @ingroup kbd
+ * @{
+ */
+/**
+ * @file
+ * @brief   Sun keyboard controller driver.
+ */
+#include <kbd.h>
+#include <kbd/kbd.h>
+#include <kbd/keycode.h>
+#include <kbd_ctl.h>
+#define KBD_KEY_RELEASE     0x80
+#define KBD_ALL_KEYS_UP     0x7f
+static int scanmap_simple[];
+void kbd_ctl_parse_scancode(int scancode)
+{
+    kbd_ev_type_t type;
+    unsigned int key;
+    if (scancode < 0 || scancode >= 0x100)
+        return;
+    if (scancode == KBD_ALL_KEYS_UP)
+        return;
+    if (scancode & KBD_KEY_RELEASE) {
+        scancode &= ~KBD_KEY_RELEASE;
+        type = KE_RELEASE;
+    } else {
+        type = KE_PRESS;
+    }
+    key = scanmap_simple[scancode];
+    if (key != 0)
+        kbd_push_ev(type, key, 0);
+}
+/** Primary meaning of scancodes. */
+static int scanmap_simple[] = {
+    [0x00] = 0,
+    [0x01] = 0,
+    [0x02] = 0,
+    [0x03] = 0,
+    [0x04] = 0,
+    [0x05] = KC_F1,
+    [0x06] = KC_F2,
+    [0x07] = KC_F10,
+    [0x08] = KC_F3,
+    [0x09] = KC_F11,
+    [0x0a] = KC_F4,
+    [0x0b] = KC_F12,
+    [0x0c] = KC_F5,
+    [0x0d] = KC_RALT,
+    [0x0e] = KC_F6,
+    [0x0f] = 0,
+    [0x10] = KC_F7,
+    [0x11] = KC_F8,
+    [0x12] = KC_F9,
+    [0x13] = KC_LALT,
+    [0x14] = KC_UP,
+    [0x15] = KC_PAUSE,
+    [0x16] = 0,
+    [0x17] = KC_SCROLL_LOCK,
+    [0x18] = KC_LEFT,
+    [0x19] = 0,
+    [0x1a] = 0,
+    [0x1b] = KC_DOWN,
+    [0x1c] = KC_RIGHT,
+    [0x1d] = KC_ESCAPE,
+    [0x1e] = KC_1,
+    [0x1f] = KC_2,
+    [0x20] = KC_3,
+    [0x21] = KC_4,
+    [0x22] = KC_5,
+    [0x23] = KC_6,
+    [0x24] = KC_7,
+    [0x25] = KC_8,
+    [0x26] = KC_9,
+    [0x27] = KC_0,
+    [0x28] = KC_MINUS,
+    [0x29] = KC_EQUALS,
+    [0x2a] = KC_BACKTICK,
+    [0x2b] = KC_BACKSPACE,
+    [0x2c] = KC_INSERT,
+    [0x2d] = 0,
+    [0x2e] = KC_NSLASH,
+    [0x2f] = KC_NTIMES,
+    [0x30] = 0,
+    [0x31] = 0,
+    [0x32] = KC_NPERIOD,
+    [0x33] = 0,
+    [0x34] = KC_HOME,
+    [0x35] = KC_TAB,
+    [0x36] = KC_Q,
+    [0x37] = KC_W,
+    [0x38] = KC_E,
+    [0x39] = KC_R,
+    [0x3a] = KC_T,
+    [0x3b] = KC_Y,
+    [0x3c] = KC_U,
+    [0x3d] = KC_I,
+    [0x3e] = KC_O,
+    [0x3f] = KC_P,
+    [0x40] = KC_LBRACKET,
+    [0x41] = KC_RBRACKET,
+    [0x42] = KC_DELETE,
+    [0x43] = 0,
+    [0x44] = KC_N7,
+    [0x45] = KC_N8,
+    [0x46] = KC_N9,
+    [0x47] = KC_NMINUS,
+    [0x48] = 0,
+    [0x49] = 0,
+    [0x4a] = KC_END,
+    [0x4b] = 0,
+    [0x4c] = KC_LCTRL,
+    [0x4d] = KC_A,
+    [0x4e] = KC_S,
+    [0x4f] = KC_D,
+    [0x50] = KC_F,
+    [0x51] = KC_G,
+    [0x52] = KC_H,
+    [0x53] = KC_J,
+    [0x54] = KC_K,
+    [0x55] = KC_L,
+    [0x56] = KC_SEMICOLON,
+    [0x57] = KC_QUOTE,
+    [0x58] = KC_BACKSLASH,
+    [0x59] = KC_ENTER,
+    [0x5a] = KC_NENTER,
+    [0x5b] = KC_N4,
+    [0x5c] = KC_N5,
+    [0x5d] = KC_N6,
+    [0x5e] = KC_N0,
+    [0x5f] = 0,
+    [0x60] = KC_PAGE_UP,
+    [0x61] = 0,
+    [0x62] = KC_NUM_LOCK,
+    [0x63] = KC_LSHIFT,
+    [0x64] = KC_Z,
+    [0x65] = KC_X,
+    [0x66] = KC_C,
+    [0x67] = KC_V,
+    [0x68] = KC_B,
+    [0x69] = KC_N,
+    [0x6a] = KC_M,
+    [0x6b] = KC_COMMA,
+    [0x6c] = KC_PERIOD,
+    [0x6d] = KC_SLASH,
+    [0x6e] = KC_RSHIFT,
+    [0x6f] = 0,
+    [0x70] = KC_N1,
+    [0x71] = KC_N2,
+    [0x72] = KC_N3,
+    [0x73] = 0,
+    [0x74] = 0,
+    [0x75] = 0,
+    [0x76] = 0,
+    [0x77] = KC_CAPS_LOCK,
+    [0x78] = 0,
+    [0x79] = KC_SPACE,
+    [0x7a] = 0,
+    [0x7b] = KC_PAGE_DOWN,
+    [0x7c] = 0,
+    [0x7d] = KC_NPLUS,
+    [0x7e] = 0,
+    [0x7f] = 0
+};
+/** @}
+ */

 /branches/dynload/uspace/srv/kbd/ctl/gxe_fb.c
 ,0 → 1,252
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * 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 kbd_ctl
+ * @ingroup kbd
+ * @{
+ */
+/**
+ * @file
+ * @brief   GXEmul framebuffer-mode keyboard controller driver.
+ */
+#include <kbd.h>
+#include <kbd/kbd.h>
+#include <kbd/keycode.h>
+#include <kbd_ctl.h>
+static void parse_ds_start(int scancode);
+static void parse_ds_e(int scancode);
+static void parse_ds_e1(int scancode);
+static void parse_ds_e1a(int scancode);
+static void parse_ds_e1b(int scancode);
+static void parse_ds_e1c(int scancode);
+static void parse_leaf(int scancode, int *map, size_t map_length);
+enum dec_state {
+    ds_start,
+    ds_e,
+    ds_e1,
+    ds_e1a,
+    ds_e1b,
+    ds_e1c
+};
+static int map_start[] = {
+    [0x60] = KC_BACKTICK,
+    [0x31] = KC_1,
+    [0x32] = KC_2,
+    [0x33] = KC_3,
+    [0x34] = KC_4,
+    [0x35] = KC_5,
+    [0x36] = KC_6,
+    [0x37] = KC_7,
+    [0x38] = KC_8,
+    [0x39] = KC_9,
+    [0x30] = KC_0,
+    [0x2d] = KC_MINUS,
+    [0x3d] = KC_EQUALS,
+    [0x08] = KC_BACKSPACE,
+    [0x0f] = KC_TAB,
+    [0x71] = KC_Q,
+    [0x77] = KC_W,
+    [0x65] = KC_E,
+    [0x72] = KC_R,
+    [0x74] = KC_T,
+    [0x79] = KC_Y,
+    [0x75] = KC_U,
+    [0x69] = KC_I,
+    [0x6f] = KC_O,
+    [0x70] = KC_P,
+    [0x5b] = KC_LBRACKET,
+    [0x5d] = KC_RBRACKET,
+//  [0x3a] = KC_CAPS_LOCK,
+    [0x61] = KC_A,
+    [0x73] = KC_S,
+    [0x64] = KC_D,
+    [0x66] = KC_F,
+    [0x67] = KC_G,
+    [0x68] = KC_H,
+    [0x6a] = KC_J,
+    [0x6b] = KC_K,
+    [0x6c] = KC_L,
+    [0x3b] = KC_SEMICOLON,
+    [0x27] = KC_QUOTE,
+    [0x5c] = KC_BACKSLASH,
+//  [0x2a] = KC_LSHIFT,
+    [0x7a] = KC_Z,
+    [0x78] = KC_X,
+    [0x63] = KC_C,
+    [0x76] = KC_V,
+    [0x62] = KC_B,
+    [0x6e] = KC_N,
+    [0x6d] = KC_M,
+    [0x2c] = KC_COMMA,
+    [0x2e] = KC_PERIOD,
+    [0x2f] = KC_SLASH,
+//  [0x36] = KC_RSHIFT,
+//  [0x1d] = KC_LCTRL,
+//  [0x38] = KC_LALT,
+    [0x20] = KC_SPACE,
+    [0x1b] = KC_ESCAPE,
+    [0x0a] = KC_ENTER,
+    [0x0d] = KC_ENTER
+/*
+    [0x1] = KC_PRNSCR,
+    [0x1] = KC_SCROLL_LOCK,
+    [0x1] = KC_PAUSE,
+*/
+};
+static int map_e1[] =
+{
+};
+static int map_e1a[] =
+{
+    [0x50] = KC_F1,
+    [0x51] = KC_F2,
+    [0x52] = KC_F3,
+    [0x53] = KC_F4,
+};
+static int map_e1b[] =
+{
+    [0x33] = KC_F5,
+    [0x37] = KC_F6,
+    [0x38] = KC_F7,
+    [0x39] = KC_F8,
+};
+static int map_e1c[] =
+{
+    [0x38] = KC_F9,
+    [0x39] = KC_F10,
+    [0x33] = KC_F11,
+    [0x34] = KC_F12,
+};
+static enum dec_state ds = ds_start;
+void kbd_ctl_parse_scancode(int scancode)
+{
+    switch (ds) {
+    case ds_start:  parse_ds_start(scancode); break;
+    case ds_e:  parse_ds_e(scancode); break;
+    case ds_e1: parse_ds_e1(scancode); break;
+    case ds_e1a:    parse_ds_e1a(scancode); break;
+    case ds_e1b:    parse_ds_e1b(scancode); break;
+    case ds_e1c:    parse_ds_e1c(scancode); break;
+    }
+}
+static void parse_ds_start(int scancode)
+{
+    if (scancode == 0x1b) {
+        ds = ds_e;
+        return;
+    }
+    parse_leaf(scancode, map_start, sizeof(map_start) / sizeof(int));
+}
+static void parse_ds_e(int scancode)
+{
+    switch (scancode) {
+    case 0x5b: ds = ds_e1; return;
+    case 0x1b: ds = ds_start; break;
+    default: ds = ds_start; return;
+    }
+    kbd_push_ev(KE_PRESS, KC_ESCAPE, 0);
+}
+static void parse_ds_e1(int scancode)
+{
+    switch (scancode) {
+    case 0x4f: ds = ds_e1a; return;
+    case 0x31: ds = ds_e1b; return;
+    case 0x32: ds = ds_e1c; return;
+    default: ds = ds_start; break;
+    }
+    parse_leaf(scancode, map_e1, sizeof(map_e1) / sizeof(int));
+}
+static void parse_ds_e1a(int scancode)
+{
+    parse_leaf(scancode, map_e1a, sizeof(map_e1a) / sizeof(int));
+}
+static void parse_ds_e1b(int scancode)
+{
+    parse_leaf(scancode, map_e1b, sizeof(map_e1b) / sizeof(int));
+}
+static void parse_ds_e1c(int scancode)
+{
+    parse_leaf(scancode, map_e1c, sizeof(map_e1c) / sizeof(int));
+}
+static void parse_leaf(int scancode, int *map, size_t map_length)
+{
+    unsigned int key;
+    ds = ds_start;
+    if (scancode < 0 || scancode >= map_length)
+        return;
+    key = map[scancode];
+    if (key != 0)
+        kbd_push_ev(KE_PRESS, key, 0);
+}
+/**
+ * @}
+ */

 /branches/dynload/uspace/srv/kbd/include/layout.h
 ,0 → 1,49
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * 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
+ */
+#ifndef KBD_LAYOUT_H_
+#define KBD_LAYOUT_H_
+#include <kbd/kbd.h>
+extern char layout_parse_ev(kbd_event_t *);
+#endif
+/**
+ * @}
+ */

 /branches/dynload/uspace/srv/kbd/include/kbd.h
 ,10 → 39,15
 #include <key_buffer.h>
-extern int kbd_arch_init(void);
-extern int kbd_arch_process(keybuffer_t *keybuffer, ipc_call_t *call);
-extern int mouse_arch_process(int phoneid, ipc_call_t *call);
+#define KBD_EVENT   1024
+#define KBD_MS_LEFT 1025
+#define KBD_MS_RIGHT    1026
+#define KBD_MS_MIDDLE   1027
+#define KBD_MS_MOVE 1028
+extern void kbd_push_scancode(int);
+extern void kbd_push_ev(int, unsigned int, unsigned int);
 #endif
 /**

 /branches/dynload/uspace/srv/kbd/include/key_buffer.h
 ,23 → 38,25
 #define __KEY_BUFFER_H__
 #include <sys/types.h>
+#include <kbd/kbd.h>
 /** Size of buffer for pressed keys */
 #define KEYBUFFER_SIZE 128
 typedef struct {
-    int fifo[KEYBUFFER_SIZE];
+    kbd_event_t fifo[KEYBUFFER_SIZE];
     unsigned long head;
     unsigned long tail;
     unsigned long items;
 } keybuffer_t;
-void keybuffer_free(keybuffer_t *keybuffer);
-void keybuffer_init(keybuffer_t *keybuffer);
-int keybuffer_available(keybuffer_t *keybuffer);
-int keybuffer_empty(keybuffer_t *keybuffer);
-void keybuffer_push(keybuffer_t *keybuffer, int key);
-int keybuffer_pop(keybuffer_t *keybuffer, int *c);
+extern void keybuffer_free(keybuffer_t *);
+extern void keybuffer_init(keybuffer_t *);
+extern int keybuffer_available(keybuffer_t *);
+extern int keybuffer_empty(keybuffer_t *);
+extern void keybuffer_push(keybuffer_t *, const kbd_event_t *);
+extern void keybuffer_push0(keybuffer_t *, int c);
+extern int keybuffer_pop(keybuffer_t *, kbd_event_t *);
 #endif

 /branches/dynload/uspace/srv/kbd/include/kbd_ctl.h
 ,0 → 1,47
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * 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
+ */
+#ifndef KBD_CTL_H_
+#define KBD_CTL_H_
+extern void kbd_ctl_parse_scancode(int);
+#endif
+/**
+ * @}
+ */

 /branches/dynload/uspace/srv/kbd/include/kbd_port.h
 ,0 → 1,47
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * 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
+ */
+#ifndef KBD_PORT_H_
+#define KBD_PORT_H_
+extern int kbd_port_init(void);
+#endif
+/**
+ * @}
+ */

 /branches/dynload/uspace/srv/kbd/port/z8530.c
 ,0 → 1,78
+/*
+ * Copyright (c) 2006 Martin Decky
+ * 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 kbd_port
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ * @brief   Z8530 keyboard port driver.
+ */
+#include <ipc/ipc.h>
+#include <async.h>
+#include <sysinfo.h>
+#include <kbd.h>
+#include <kbd_port.h>
+#include <sys/types.h>
+/** Top-half pseudocode for z8530. */
+irq_cmd_t z8530_cmds[] = {
+    {
+        CMD_MEM_READ_1,
+,      /**< Address. Will be patched in run-time. */
+,      /**< Value. Not used. */
+/**< Arg 1 will contain the result. */
+    }
+};
+irq_code_t z8530_kbd = {
+,
+    z8530_cmds
+};
+static void z8530_irq_handler(ipc_callid_t iid, ipc_call_t *call);
+int kbd_port_init(void)
+{
+    async_set_interrupt_received(z8530_irq_handler);
+    z8530_cmds[0].addr = (void *) sysinfo_value("kbd.address.virtual") + 6;
+    ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"),
+, &z8530_kbd);
+    return 0;
+}
+static void z8530_irq_handler(ipc_callid_t iid, ipc_call_t *call)
+{
+    int scan_code = IPC_GET_ARG1(*call);
+    kbd_push_scancode(scan_code);
+}
+/** @}
+ */

 /branches/dynload/uspace/srv/kbd/port/sgcn.c
 ,0 → 1,141
+/*
+ * Copyright (c) 2008 Pavel Rimsky
+ * 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 kbd_port
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ * @brief   SGCN (Serengeti Console) keyboard port driver.
+ */
+#include <as.h>
+#include <ddi.h>
+#include <ipc/ipc.h>
+#include <async.h>
+#include <kbd.h>
+#include <kbd_port.h>
+#include <sysinfo.h>
+#include <stdio.h>
+/**
+ * SGCN buffer header. It is placed at the very beginning of the SGCN
+ * buffer.
+ */
+typedef struct {
+    /** hard-wired to "CON" */
+    char magic[4];
+    /** we don't need this */
+    char unused[8];
+    /** offset within the SGCN buffer of the input buffer start */
+    uint32_t in_begin;
+    /** offset within the SGCN buffer of the input buffer end */
+    uint32_t in_end;
+    /** offset within the SGCN buffer of the input buffer read pointer */
+    uint32_t in_rdptr;
+    /** offset within the SGCN buffer of the input buffer write pointer */
+    uint32_t in_wrptr;
+} __attribute__ ((packed)) sgcn_buffer_header_t;
+/*
+ * Returns a pointer to the object of a given type which is placed at the given
+ * offset from the console buffer beginning.
+ */
+#define SGCN_BUFFER(type, offset) \
+        ((type *) (sram_virt_addr + sram_buffer_offset + (offset)))
+/** Returns a pointer to the console buffer header. */
+#define SGCN_BUFFER_HEADER  (SGCN_BUFFER(sgcn_buffer_header_t, 0))
+/**
+ * Virtual address mapped to SRAM.
+ */
+static uintptr_t sram_virt_addr;
+/**
+ * SGCN buffer offset within SGCN.
+ */
+static uintptr_t sram_buffer_offset;
+static void sgcn_irq_handler(ipc_callid_t iid, ipc_call_t *call);
+/**
+ * Initializes the SGCN driver.
+ * Maps the physical memory (SRAM) and registers the interrupt.
+ */
+int kbd_port_init(void)
+{
+    async_set_interrupt_received(sgcn_irq_handler);
+    sram_virt_addr = (uintptr_t) as_get_mappable_page(sysinfo_value("sram.area.size"));
+    if (physmem_map((void *) sysinfo_value("sram.address.physical"),
+        (void *) sram_virt_addr, sysinfo_value("sram.area.size") / PAGE_SIZE,
+        AS_AREA_READ | AS_AREA_WRITE) != 0) {
+        printf("SGCN: uspace driver could not map physical memory.");
+        return -1;
+    }
+    sram_buffer_offset = sysinfo_value("sram.buffer.offset");
+    ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"),
+, (void *) 0);
+    return 0;
+}
+/**
+ * Handler of the "key pressed" event. Reads codes of all the pressed keys from
+ * the buffer.
+ */
+static void sgcn_irq_handler(ipc_callid_t iid, ipc_call_t *call)
+{
+    char c;
+    uint32_t begin = SGCN_BUFFER_HEADER->in_begin;
+    uint32_t end = SGCN_BUFFER_HEADER->in_end;
+    uint32_t size = end - begin;
+    volatile char *buf_ptr = (volatile char *)
+        SGCN_BUFFER(char, SGCN_BUFFER_HEADER->in_rdptr);
+    volatile uint32_t *in_wrptr_ptr = &(SGCN_BUFFER_HEADER->in_wrptr);
+    volatile uint32_t *in_rdptr_ptr = &(SGCN_BUFFER_HEADER->in_rdptr);
+    while (*in_rdptr_ptr != *in_wrptr_ptr) {
+        c = *buf_ptr;
+        *in_rdptr_ptr = (((*in_rdptr_ptr) - begin + 1) % size) + begin;
+        buf_ptr = (volatile char *)
+            SGCN_BUFFER(char, SGCN_BUFFER_HEADER->in_rdptr);
+        kbd_push_scancode(c);
+    }
+}
+/** @}
+ */

 /branches/dynload/uspace/srv/kbd/port/gxemul.c
 ,0 → 1,84
+/*
+ * Copyright (c) 2007 Michal Kebrt
+ * 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 kbd_port
+ * @{
+ * @ingroup  kbd
+ */
+/** @file
+ * @brief   GXEmul keyboard port driver.
+ */
+#include <ipc/ipc.h>
+#include <async.h>
+#include <sysinfo.h>
+#include <kbd_port.h>
+#include <kbd.h>
+static irq_cmd_t gxemul_cmds[] = {
+    {
+        CMD_MEM_READ_1,
+        (void *) 0,
+,
+    }
+};
+static irq_code_t gxemul_kbd = {
+,
+    gxemul_cmds
+};
+static void gxemul_irq_handler(ipc_callid_t iid, ipc_call_t *call);
+/** Initializes keyboard handler. */
+int kbd_port_init(void)
+{
+    async_set_interrupt_received(gxemul_irq_handler);
+    gxemul_cmds[0].addr = (void *) sysinfo_value("kbd.address.virtual");
+    ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"),
+, &gxemul_kbd);
+    return 0;
+}
+/** Process data sent when a key is pressed.
+ *
+ *  @param keybuffer Buffer of pressed keys.
+ *  @param call      IPC call.
+ *
+ *  @return Always 1.
+ */
+static void gxemul_irq_handler(ipc_callid_t iid, ipc_call_t *call)
+{
+    int scan_code = IPC_GET_ARG2(*call);
+    kbd_push_scancode(scan_code);
+}
+/** @}
+ */

 /branches/dynload/uspace/srv/kbd/port/ns16550.c
 ,0 → 1,89
+/*
+ * 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 kbd_port
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ * @brief   NS16550 port driver.
+ */
+#include <ipc/ipc.h>
+#include <async.h>
+#include <sysinfo.h>
+#include <kbd.h>
+#include <kbd_port.h>
+#include <ddi.h>
+/* NS16550 registers */
+#define RBR_REG     0    /** Receiver Buffer Register. */
+#define IER_REG     1   /** Interrupt Enable Register. */
+#define IIR_REG     2   /** Interrupt Ident Register (read). */
+#define FCR_REG     2   /** FIFO control register (write). */
+#define LCR_REG     3   /** Line Control register. */
+#define MCR_REG     4   /** Modem Control Register. */
+#define LSR_REG     5   /** Line Status Register. */
+irq_cmd_t ns16550_cmds[1] = {
+    { CMD_PORT_READ_1, 0, 0, 2 },
+};
+irq_code_t ns16550_kbd = {
+,
+    ns16550_cmds
+};
+static void ns16550_irq_handler(ipc_callid_t iid, ipc_call_t *call);
+uint16_t ns16550_port;
+int kbd_port_init(void)
+{
+    async_set_interrupt_received(ns16550_irq_handler);
+    ns16550_port = sysinfo_value("kbd.port");
+    ns16550_kbd.cmds[0].addr = (void *) (ns16550_port + RBR_REG);
+    ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"),
+, &ns16550_kbd);
+    iospace_enable(task_get_id(), ns16550_port, 8);
+    return 0;
+}
+#define LSR_DATA_READY  0x01
+static void ns16550_irq_handler(ipc_callid_t iid, ipc_call_t *call)
+{
+    int scan_code = IPC_GET_ARG2(*call);
+    kbd_push_scancode(scan_code);
+}
+/**
+ * @}
+ */

 /branches/dynload/uspace/srv/kbd/port/msim.c
 ,0 → 1,83
+/*
+ * 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 kbd_port
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ * @brief   Msim keyboard port driver.
+ */
+#include <ipc/ipc.h>
+#include <async.h>
+#include <sysinfo.h>
+#include <kbd_port.h>
+#include <kbd.h>
+irq_cmd_t msim_cmds[1] = {
+    { CMD_MEM_READ_1, (void *) 0, 0, 2 }
+};
+irq_code_t msim_kbd = {
+,
+    msim_cmds
+};
+static void msim_irq_handler(ipc_callid_t iid, ipc_call_t *call);
+int kbd_port_init(void)
+{
+    async_set_interrupt_received(msim_irq_handler);
+    msim_cmds[0].addr = sysinfo_value("kbd.address.virtual");
+    ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"),
+, &msim_kbd);
+    return 0;
+}
+static void msim_irq_handler(ipc_callid_t iid, ipc_call_t *call)
+{
+    int scan_code = IPC_GET_ARG2(*call);
+//  static int esc_count=0;
+//  if (scan_code == 0x1b) {
+//      esc_count++;
+//      if (esc_count == 3)
+//          __SYSCALL0(SYS_DEBUG_ENABLE_CONSOLE);
+//  } else {
+//      esc_count=0;
+//  }
+//  if (fb_fb)
+//      return kbd_arch_process_fb(keybuffer, scan_code);
+    kbd_push_scancode(scan_code);
+}
+/** @}
+*/

 /branches/dynload/uspace/srv/kbd/port/i8042.c
 ,0 → 1,158
+/*
+ * Copyright (c) 2001-2004 Jakub Jermar
+ * 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 kbd_port
+ * @ingroup kbd
+ * @{
+ */
+/** @file
+ * @brief i8042 port driver.
+ */
+#include <ipc/ipc.h>
+#include <async.h>
+#include <unistd.h>
+#include <sysinfo.h>
+#include <kbd_port.h>
+#include <kbd.h>
+#include "i8042.h"
+/* Interesting bits for status register */
+#define i8042_OUTPUT_FULL  0x1
+#define i8042_INPUT_FULL   0x2
+#define i8042_MOUSE_DATA   0x20
+/* Command constants */
+#define i8042_CMD_KBD 0x60
+#define i8042_CMD_MOUSE  0xd4
+/* Keyboard cmd byte */
+#define i8042_KBD_IE        0x1
+#define i8042_MOUSE_IE      0x2
+#define i8042_KBD_DISABLE   0x10
+#define i8042_MOUSE_DISABLE 0x20
+#define i8042_KBD_TRANSLATE 0x40
+/* Mouse constants */
+#define MOUSE_OUT_INIT  0xf4
+#define MOUSE_ACK       0xfa
+static irq_cmd_t i8042_cmds[2] = {
+    { CMD_PORT_READ_1, (void *) 0x64, 0, 1 },
+    { CMD_PORT_READ_1, (void *) 0x60, 0, 2 }
+};
+static irq_code_t i8042_kbd = {
+,
+    i8042_cmds
+};
+static void wait_ready(void) {
+    while (i8042_status_read() & i8042_INPUT_FULL)
+        ;
+}
+static void i8042_irq_handler(ipc_callid_t iid, ipc_call_t *call);
+int kbd_port_init(void)
+{
+//  int i;
+    int mouseenabled = 0;
+    async_set_interrupt_received(i8042_irq_handler);
+    iospace_enable(task_get_id(), (void *) i8042_DATA, 5);
+    /* Disable kbd, enable mouse */
+    i8042_command_write(i8042_CMD_KBD);
+    wait_ready();
+    i8042_command_write(i8042_CMD_KBD);
+    wait_ready();
+    i8042_data_write(i8042_KBD_DISABLE);
+    wait_ready();
+    /* Flush all current IO */
+    while (i8042_status_read() & i8042_OUTPUT_FULL)
+        i8042_data_read();
+    /* Initialize mouse */
+/*  i8042_command_write(i8042_CMD_MOUSE);
+    wait_ready();
+    i8042_data_write(MOUSE_OUT_INIT);
+    wait_ready();
+    int mouseanswer = 0;
+    for (i=0;i < 1000; i++) {
+        int status = i8042_status_read();
+        if (status & i8042_OUTPUT_FULL) {
+            int data = i8042_data_read();
+            if (status & i8042_MOUSE_DATA) {
+                mouseanswer = data;
+                break;
+            }
+        }
+        usleep(1000);
+    }*/
+//  if (mouseanswer == MOUSE_ACK) {
+//      /* enable mouse */
+//      mouseenabled = 1;
+//
+//      ipc_register_irq(sysinfo_value("mouse.inr"), sysinfo_value("mouse.devno"), 0, &i8042_kbd);
+//  }
+    /* Enable kbd */
+    ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), 0, &i8042_kbd);
+    int newcontrol = i8042_KBD_IE | i8042_KBD_TRANSLATE;
+    if (mouseenabled)
+        newcontrol |= i8042_MOUSE_IE;
+    i8042_command_write(i8042_CMD_KBD);
+    wait_ready();
+    i8042_data_write(newcontrol);
+    wait_ready();
+    return 0;
+}
+static void i8042_irq_handler(ipc_callid_t iid, ipc_call_t *call)
+{
+    int status = IPC_GET_ARG1(*call);
+    if ((status & i8042_MOUSE_DATA))
+        return 0;
+    int scan_code = IPC_GET_ARG2(*call);
+    kbd_push_scancode(scan_code);
+    return 1;
+}
+/**
+ * @}
+ */

 /branches/dynload/uspace/srv/kbd/port/dummy.c
 ,0 → 1,46
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * 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 kbd_port
+ * @brief   Dummy keyboard port driver.
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ */
+#include <kbd_port.h>
+#include <kbd.h>
+int kbd_port_init(void)
+{
+    return 0;
+}
+/** @}
+*/

 /branches/dynload/uspace/srv/kbd/port/i8042.h
 ,0 → 1,75
+/*
+ * 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 kbd_port
+ * @ingroup  kbd
+ * @{
+ */
+/** @file
+ * @brief i8042 port driver.
+ */
+#ifndef KBD_PORT_i8042_H_
+#define KBD_PORT_i8042_H_
+#include <ddi.h>
+#include <libarch/ddi.h>
+#define i8042_DATA      0x60
+#define i8042_STATUS    0X64
+typedef unsigned char u8;
+typedef short u16;
+static inline void i8042_data_write(u8 data)
+{
+    outb(i8042_DATA, data);
+}
+static inline u8 i8042_data_read(void)
+{
+    return inb(i8042_DATA);
+}
+static inline u8 i8042_status_read(void)
+{
+    return inb(i8042_STATUS);
+}
+static inline void i8042_command_write(u8 command)
+{
+    outb(i8042_STATUS, command);
+}
+#endif
+/**
+ * @}
+ */

 /branches/dynload/uspace/srv/kbd/generic/kbd.c
 ,13 → 42,16
 #include <stdlib.h>
 #include <stdio.h>
 #include <ipc/ns.h>
+#include <async.h>
 #include <errno.h>
-#include <arch/kbd.h>
+#include <libadt/fifo.h>
+#include <kbd/kbd.h>
 #include <kbd.h>
-#include <libadt/fifo.h>
 #include <key_buffer.h>
-#include <async.h>
-#include <keys.h>
+#include <kbd_port.h>
+#include <kbd_ctl.h>
+#include <layout.h>
 #define NAME "kbd"
 ,31 → 59,51
 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
-    if (mouse_arch_process(phone2cons, call))
-        return;
-#endif
-    kbd_arch_process(&keybuffer, call);
+#include <kbd/keycode.h>
+void kbd_push_ev(int type, unsigned int key, unsigned int mods)
+{
+    kbd_event_t ev;
-    if (cons_connected && phone2cons != -1) {
-        /*
-         * recode to ASCII - one interrupt can produce more than one
-         * code so result is stored in fifo
-         */
-        while (!keybuffer_empty(&keybuffer)) {
-            if (!keybuffer_pop(&keybuffer, (int *)&chr))
-                break;
+    printf("type: %d\n", type);
+    printf("mods: 0x%x\n", mods);
+    printf("keycode: %u\n", key);
-            async_msg_1(phone2cons, KBD_PUSHCHAR, chr);
-        }
-    }
+    ev.type = type;
+    ev.key = key;
+    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;
 ,6 → 142,7
 }
 int main(int argc, char **argv)
 {
     printf(NAME ": HelenOS Keyboard service\n");
 ,8 → 149,8
     ipcarg_t phonead;
-    /* Initialize arch dependent parts */
-    if (kbd_arch_init())
+    /* Initialize port driver. */
+    if (kbd_port_init())
         return -1;
     /* Initialize key buffer */
 ,8 → 157,8
     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;
 ,7 → 165,7
     printf(NAME ": Accepting connections\n");
     async_manager();
-    /* Never reached */
+    /* Not reached. */
     return 0;
 }

 /branches/dynload/uspace/srv/kbd/generic/key_buffer.c
 ,7 → 40,7
 /** Clear key buffer.
  */
-void keybuffer_free(keybuffer_t *keybuffer)
+void keybuffer_free(keybuffer_t *keybuffer)
 {
     futex_down(&keybuffer_futex);
     keybuffer->head = 0;
 ,15 → 75,18
     return (keybuffer->items == 0);
 }
-/** Push key to key buffer.
- * If buffer is full, character is ignored.
- * @param key code of stored key
+/** Push key event to key buffer.
+ *
+ * If the buffer is full, the event is ignored.
+ *
+ * @param keybuffer The keybuffer.
+ * @param ev        The event to push.
  */
-void keybuffer_push(keybuffer_t *keybuffer, int key)
+void keybuffer_push(keybuffer_t *keybuffer, const kbd_event_t *ev)
 {
     futex_down(&keybuffer_futex);
     if (keybuffer->items < KEYBUFFER_SIZE) {
-        keybuffer->fifo[keybuffer->tail] = key;
+        keybuffer->fifo[keybuffer->tail] = *ev;
         keybuffer->tail = (keybuffer->tail + 1) % KEYBUFFER_SIZE;
         keybuffer->items++;
     }
 ,16 → 93,25
     futex_up(&keybuffer_futex);
 }
-/** Pop character from buffer.
- * @param c pointer to space where to store character from buffer.
- * @return zero on empty buffer, nonzero else
+void keybuffer_push0(keybuffer_t *keybuffer, int c)
+{
+    kbd_event_t ev;
+    ev.key = c; ev.mods = 0; ev.c = c;
+    keybuffer_push(keybuffer, &ev);
+}
+/** Pop event from buffer.
+ *
+ * @param edst  Pointer to where the event should be saved.
+ * @return  Zero on empty buffer, nonzero otherwise.
  */
-int keybuffer_pop(keybuffer_t *keybuffer, int *c)
+int keybuffer_pop(keybuffer_t *keybuffer, kbd_event_t *edst)
 {
     futex_down(&keybuffer_futex);
     if (keybuffer->items > 0) {
         keybuffer->items--;
-        *c = (keybuffer->fifo[keybuffer->head]) ;
+        *edst = (keybuffer->fifo[keybuffer->head]) ;
         keybuffer->head = (keybuffer->head + 1) % KEYBUFFER_SIZE;
         futex_up(&keybuffer_futex);
         return 1;

 /branches/dynload/uspace/srv/kbd/Makefile
 ,53 → 46,72
     generic/kbd.c \
     generic/key_buffer.c
-ARCH_SOURCES = \
-    arch/$(UARCH)/src/kbd.c
+ARCH_SOURCES =
+GENARCH_SOURCES =
+ifeq ($(KBD_LAYOUT), us_qwerty)
+    GENARCH_SOURCES += layout/us_qwerty.c
+endif
+ifeq ($(KBD_LAYOUT), us_dvorak)
+    GENARCH_SOURCES += layout/us_dvorak.c
+endif
+ifeq ($(UARCH), amd64)
+    GENARCH_SOURCES += \
+        port/i8042.c \
+        ctl/pc.c
+endif
+ifeq ($(UARCH), arm32)
+    GENARCH_SOURCES += \
+        port/gxemul.c
+    ifeq ($(CONFIG_FB), y)
+        GENARCH_SOURCES += \
+            ctl/gxe_fb.c
+    else
+        GENARCH_SOURCES += \
+            ctl/stty.c
+    endif
+endif
 ifeq ($(UARCH), ia32)
-    ARCH_SOURCES += \
-        arch/$(UARCH)/src/mouse.c \
-        arch/$(UARCH)/src/scanc.c
-    GENARCH_SOURCES = \
-        genarch/src/kbd.c
-    CFLAGS += -DMOUSE_ENABLED
+    GENARCH_SOURCES += \
+        port/i8042.c \
+        ctl/pc.c
 endif
 ifeq ($(UARCH), ia64)
-    ARCH_SOURCES += \
-        arch/$(UARCH)/src/mouse.c \
-        arch/$(UARCH)/src/scanc.c \
-        arch/$(UARCH)/src/lkbd.c
-    GENARCH_SOURCES = \
-        genarch/src/kbd.c
-    CFLAGS += -DMOUSE_ENABLED
+    GENARCH_SOURCES += \
+        port/dummy.c \
+        ctl/stty.c
 endif
-ifeq ($(UARCH), amd64)
-    ARCH_SOURCES += \
-        arch/$(UARCH)/src/mouse.c \
-        arch/$(UARCH)/src/scanc.c
-    GENARCH_SOURCES = \
-        genarch/src/kbd.c
-    CFLAGS += -DMOUSE_ENABLED
+ifeq ($(MACHINE), msim)
+    GENARCH_SOURCES += \
+        port/msim.c \
+        ctl/stty.c
 endif
-ifeq ($(UARCH), sparc64)
-    ARCH_SOURCES += \
-        arch/$(UARCH)/src/scanc.c \
-        arch/$(UARCH)/src/sgcn.c
-    GENARCH_SOURCES = \
-        genarch/src/kbd.c \
-        genarch/src/nofb.c
+ifeq ($(MACHINE), lgxemul)
+    GENARCH_SOURCES += \
+        port/gxemul.c
+    ifeq ($(CONFIG_FB), y)
+        GENARCH_SOURCES += \
+            ctl/gxe_fb.c
+    else
+        GENARCH_SOURCES += \
+            ctl/stty.c
+    endif
 endif
-ifeq ($(UARCH), arm32)
-    ARCH_SOURCES += \
-        arch/$(UARCH)/src/kbd_gxemul.c
+ifeq ($(MACHINE), bgxemul)
+    GENARCH_SOURCES += \
+        port/gxemul.c \
+        ctl/stty.c
 endif
-ifeq ($(UARCH), mips32)
+ifeq ($(UARCH), ppc32)
     GENARCH_SOURCES += \
-        genarch/src/nofb.c
+        port/dummy.c \
+        ctl/stty.c
 endif
-ifeq ($(UARCH), mips32eb)
+ifeq ($(UARCH), sparc64)
     GENARCH_SOURCES += \
-        genarch/src/nofb.c
+        port/z8530.c \
+        ctl/sun.c
 endif
 GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))

 /branches/dynload/uspace/srv/kbd/layout/us_qwerty.c
 ,0 → 1,113
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * 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 kbd
+ * @brief   US QWERTY leyout.
+ * @{
+ */
+#include <kbd.h>
+#include <kbd/kbd.h>
+#include <kbd/keycode.h>
+#include <layout.h>
+static int map_normal[] = {
+    [KC_BACKTICK] = '`',
+    [KC_1] = '1',
+    [KC_2] = '2',
+    [KC_3] = '3',
+    [KC_4] = '4',
+    [KC_5] = '5',
+    [KC_6] = '6',
+    [KC_7] = '7',
+    [KC_8] = '8',
+    [KC_9] = '9',
+    [KC_0] = '0',
+    [KC_MINUS] = '-',
+    [KC_EQUALS] = '=',
+    [KC_BACKSPACE] = '\b',
+    [KC_TAB] = '\t',
+    [KC_Q] = 'q',
+    [KC_W] = 'w',
+    [KC_E] = 'e',
+    [KC_R] = 'r',
+    [KC_T] = 't',
+    [KC_Y] = 'y',
+    [KC_U] = 'u',
+    [KC_I] = 'i',
+    [KC_O] = 'o',
+    [KC_P] = 'p',
+    [KC_LBRACKET] = '[',
+    [KC_RBRACKET] = ']',
+    [KC_A] = 'a',
+    [KC_S] = 's',
+    [KC_D] = 'd',
+    [KC_F] = 'f',
+    [KC_G] = 'g',
+    [KC_H] = 'h',
+    [KC_J] = 'j',
+    [KC_K] = 'k',
+    [KC_L] = 'l',
+    [KC_SEMICOLON] = ';',
+    [KC_QUOTE] = '\'',
+    [KC_BACKSLASH] = '\\',
+    [KC_ENTER] = '\n',
+    [KC_Z] = 'z',
+    [KC_X] = 'x',
+    [KC_C] = 'c',
+    [KC_V] = 'v',
+    [KC_B] = 'b',
+    [KC_N] = 'n',
+    [KC_M] = 'm',
+    [KC_COMMA] = ',',
+    [KC_PERIOD] = '.',
+    [KC_SLASH] = '/',
+    [KC_SPACE] = ' '
+};
+char layout_parse_ev(kbd_event_t *ev)
+{
+    if (ev->key >= sizeof(map_normal) / sizeof(int))
+        return 0;
+    return map_normal[ev->key];
+}
+/**
+ * @}
+ */

 /branches/dynload/uspace/srv/kbd/layout/us_dvorak.c
 ,0 → 1,112
+/*
+ * Copyright (c) 2009 Jiri Svoboda
+ * 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 kbd
+ * @brief   US Dvorak Simplified Keyboard layout.
+ * @{
+ */
+#include <kbd.h>
+#include <kbd/kbd.h>
+#include <kbd/keycode.h>
+#include <layout.h>
+static int map_normal[] = {
+    [KC_BACKTICK] = '`',
+    [KC_1] = '1',
+    [KC_2] = '2',
+    [KC_3] = '3',
+    [KC_4] = '4',
+    [KC_5] = '5',
+    [KC_6] = '6',
+    [KC_7] = '7',
+    [KC_8] = '8',
+    [KC_9] = '9',
+    [KC_0] = '0',
+    [KC_MINUS] = '[',
+    [KC_EQUALS] = ']',
+    [KC_BACKSPACE] = '\b',
+    [KC_TAB] = '\t',
+    [KC_Q] = '\'',
+    [KC_W] = ',',
+    [KC_E] = '.',
+    [KC_R] = 'p',
+    [KC_T] = 'y',
+    [KC_Y] = 'f',
+    [KC_U] = 'g',
+    [KC_I] = 'c',
+    [KC_O] = 'r',
+    [KC_P] = 'l',
+    [KC_LBRACKET] = '/',
+    [KC_RBRACKET] = '=',
+    [KC_A] = 'a',
+    [KC_S] = 'o',
+    [KC_D] = 'e',
+    [KC_F] = 'u',
+    [KC_G] = 'i',
+    [KC_H] = 'd',
+    [KC_J] = 'h',
+    [KC_K] = 't',
+    [KC_L] = 'n',
+    [KC_SEMICOLON] = 's',
+    [KC_QUOTE] = '-',
+    [KC_BACKSLASH] = '\\',
+    [KC_Z] = ';',
+    [KC_X] = 'q',
+    [KC_C] = 'j',
+    [KC_V] = 'k',
+    [KC_B] = 'x',
+    [KC_N] = 'b',
+    [KC_M] = 'm',
+    [KC_COMMA] = 'w',
+    [KC_PERIOD] = 'v',
+    [KC_SLASH] = 'z',
+    [KC_ENTER] = '\n'
+};
+char layout_parse_ev(kbd_event_t *ev)
+{
+    if (ev->key >= sizeof(map_normal) / sizeof(int))
+        return 0;
+    return map_normal[ev->key];
+}
+/**
+ * @}
+ */

 /branches/dynload/uspace/srv/ns/ns.c
 ,6 → 40,7
 #include <ipc/ns.h>
 #include <ipc/services.h>
 #include <stdio.h>
+#include <bool.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <errno.h>
 ,6 → 48,7
 #include <libadt/list.h>
 #include <libadt/hash_table.h>
 #include <sysinfo.h>
+#include <loader/loader.h>
 #include <ddi.h>
 #include <as.h>
 ,6 → 60,11
 static int connect_to_service(ipcarg_t service, ipc_call_t *call,
     ipc_callid_t callid);
+void register_clonable(ipcarg_t service, ipcarg_t phone, ipc_call_t *call,
+    ipc_callid_t callid);
+void connect_to_clonable(ipcarg_t service, ipc_call_t *call,
+    ipc_callid_t callid);
 /* Static functions implementing NS hash table operations. */
 static hash_index_t ns_hash(unsigned long *key);
 static int ns_compare(unsigned long *key, hash_count_t keys, link_t *item);
 ,11 → 91,27
 static void *clockaddr = NULL;
 static void *klogaddr = NULL;
-static void get_as_area(ipc_callid_t callid, ipc_call_t *call, char *name,
-    void **addr)
+/** Request for connection to a clonable service. */
+typedef struct {
+    link_t link;
+    ipcarg_t service;
+    ipc_call_t call;
+    ipc_callid_t callid;
+} cs_req_t;
+/** List of clonable-service connection requests. */
+static link_t cs_req;
+/** Return true if @a service is clonable. */
+static bool service_clonable(int service)
 {
+    return service == SERVICE_LOAD;
+}
+static void get_as_area(ipc_callid_t callid, ipc_call_t *call, char *name, void **addr)
+{
     void *ph_addr;
     if (!*addr) {
         ph_addr = (void *) sysinfo_value(name);
         if (!ph_addr) {
 ,8 → 119,11
             return;
         }
         *addr = as_get_mappable_page(PAGE_SIZE);
-        physmem_map(ph_addr, *addr, 1,
-            AS_AREA_READ | AS_AREA_CACHEABLE);
+        if (physmem_map(ph_addr, *addr, 1,
+            AS_AREA_READ | AS_AREA_CACHEABLE) != 0) {
+            ipc_answer_0(callid, ENOENT);
+            return;
+        }
     }
     ipc_answer_2(callid, EOK, (ipcarg_t) *addr, AS_AREA_READ);
 }
 ,6 → 142,8
         printf(NAME ": No memory available\n");
         return ENOMEM;
     }
+    list_initialize(&cs_req);
     printf(NAME ": Accepting connections\n");
     while (1) {
 ,12 → 152,10
         case IPC_M_SHARE_IN:
             switch (IPC_GET_ARG3(call)) {
             case SERVICE_MEM_REALTIME:
-                get_as_area(callid, &call, "clock.faddr",
-                    &clockaddr);
+                get_as_area(callid, &call, "clock.faddr", &clockaddr);
                 break;
             case SERVICE_MEM_KLOG:
-                get_as_area(callid, &call, "klog.faddr",
-                    &klogaddr);
+                get_as_area(callid, &call, "klog.faddr", &klogaddr);
                 break;
             default:
                 ipc_answer_0(callid, ENOENT);
 ,15 → 168,27
             /*
              * Server requests service registration.
              */
-            retval = register_service(IPC_GET_ARG1(call),
-                IPC_GET_ARG5(call), &call);
+            if (service_clonable(IPC_GET_ARG1(call))) {
+                register_clonable(IPC_GET_ARG1(call),
+                    IPC_GET_ARG5(call), &call, callid);
+                continue;
+            } else {
+                retval = register_service(IPC_GET_ARG1(call),
+                    IPC_GET_ARG5(call), &call);
+            }
             break;
         case IPC_M_CONNECT_ME_TO:
             /*
              * Client requests to be connected to a service.
              */
-            retval = connect_to_service(IPC_GET_ARG1(call), &call,
-                callid);
+            if (service_clonable(IPC_GET_ARG1(call))) {
+                connect_to_clonable(IPC_GET_ARG1(call),
+                    &call, callid);
+                continue;
+            } else {
+                retval = connect_to_service(IPC_GET_ARG1(call),
+                    &call, callid);
+            }
             break;
         default:
             retval = ENOENT;
 ,11 → 205,11
 /** Register service.
  *
- * @param service Service to be registered.
- * @param phone Phone to be used for connections to the service.
- * @param call Pointer to call structure.
+ * @param service   Service to be registered.
+ * @param phone     Phone to be used for connections to the service.
+ * @param call      Pointer to call structure.
  *
- * @return Zero on success or a value from @ref errno.h.
+ * @return      Zero on success or a value from @ref errno.h.
  */
 int register_service(ipcarg_t service, ipcarg_t phone, ipc_call_t *call)
 {
 ,7 → 219,7
     };
     hashed_service_t *hs;
     if (hash_table_find(&ns_hash_table, keys)) {
         return EEXISTS;
     }
 ,9 → 240,9
 /** Connect client to service.
  *
- * @param service Service to be connected to.
- * @param call Pointer to call structure.
- * @param callid Call ID of the request.
+ * @param service   Service to be connected to.
+ * @param call      Pointer to call structure.
+ * @param callid    Call ID of the request.
  *
  * @return Zero on success or a value from @ref errno.h.
  */
 ,7 → 251,7
     unsigned long keys[3] = { service, 0, 0 };
     link_t *hlp;
     hashed_service_t *hs;
     hlp = hash_table_find(&ns_hash_table, keys);
     if (!hlp) {
         return ENOENT;
 ,6 → 261,82
         IPC_GET_ARG3(*call), 0, IPC_FF_NONE);
 }
+/** Register clonable service.
+ *
+ * @param service   Service to be registered.
+ * @param phone     Phone to be used for connections to the service.
+ * @param call      Pointer to call structure.
+ */
+void register_clonable(ipcarg_t service, ipcarg_t phone, ipc_call_t *call,
+    ipc_callid_t callid)
+{
+    int rc;
+    cs_req_t *csr;
+    if (list_empty(&cs_req)) {
+        /* There was no pending connection request. */
+        printf(NAME ": Unexpected clonable server.\n");
+        ipc_answer_0(callid, EBUSY);
+        return;
+    }
+    csr = list_get_instance(cs_req.next, cs_req_t, link);
+    list_remove(&csr->link);
+    /* Currently we can only handle a single type of clonable service. */
+    assert(csr->service == SERVICE_LOAD);
+    ipc_answer_0(callid, EOK);
+    rc = ipc_forward_fast(csr->callid, phone, IPC_GET_ARG2(csr->call),
+        IPC_GET_ARG3(csr->call), 0, IPC_FF_NONE);
+    free(csr);
+}
+/** Connect client to clonable service.
+ *
+ * @param service   Service to be connected to.
+ * @param call      Pointer to call structure.
+ * @param callid    Call ID of the request.
+ *
+ * @return      Zero on success or a value from @ref errno.h.
+ */
+void connect_to_clonable(ipcarg_t service, ipc_call_t *call,
+    ipc_callid_t callid)
+{
+    int rc;
+    cs_req_t *csr;
+    assert(service == SERVICE_LOAD);
+    csr = malloc(sizeof(cs_req_t));
+    if (csr == NULL) {
+        ipc_answer_0(callid, ENOMEM);
+        return;
+    }
+    /* Spawn a loader. */
+    rc = loader_spawn("loader");
+    if (rc < 0) {
+        free(csr);
+        ipc_answer_0(callid, rc);
+        return;
+    }
+    csr->service = service;
+    csr->call = *call;
+    csr->callid = callid;
+    /*
+     * We can forward the call only after the server we spawned connects
+     * to us. Meanwhile we might need to service more connection requests.
+     * Thus we store the call in a queue.
+     */
+    list_append(&csr->link, &cs_req);
+}
 /** Compute hash index into NS hash table.
  *
  * @param key Pointer keys. However, only the first key (i.e. service number)

 /branches/dynload/uspace/srv/console/console.c
 ,7 → 35,8
 #include <libc.h>
 #include <fb.h>
 #include <ipc/ipc.h>
-#include <keys.h>
+#include <kbd.h>
+#include <kbd/keycode.h>
 #include <ipc/fb.h>
 #include <ipc/services.h>
 #include <errno.h>
 ,7 → 298,7
     ipc_callid_t callid;
     ipc_call_t call;
     int retval;
-    int c;
+    kbd_event_t ev;
     connection_t *conn;
     int newcon;
 ,22 → 320,24
                 IPC_GET_ARG2(call));
             retval = 0;
             break;
-        case KBD_PUSHCHAR:
-            /* got key from keyboard driver */
+        case KBD_EVENT:
+            /* Got event from keyboard driver. */
             retval = 0;
-            c = IPC_GET_ARG1(call);
+            ev.type = IPC_GET_ARG1(call);
+            ev.key = IPC_GET_ARG2(call);
+            ev.mods = IPC_GET_ARG3(call);
+            ev.c = IPC_GET_ARG4(call);
             /* switch to another virtual console */
             conn = &connections[active_console];
-/*
- *          if ((c >= KBD_KEY_F1) && (c < KBD_KEY_F1 +
- *              CONSOLE_COUNT)) {
- */
-            if ((c >= 0x101) && (c < 0x101 + CONSOLE_COUNT)) {
-                if (c == 0x112)
+            if ((ev.key >= KC_F1) && (ev.key < KC_F1 +
+                CONSOLE_COUNT)) {
+                if (ev.key == KC_F12)
                     change_console(KERNEL_CONSOLE);
                 else
-                    change_console(c - 0x101);
+                    change_console(ev.key - KC_F1);
                 break;
             }
 ,14 → 344,14
             /* if client is awaiting key, send it */
             if (conn->keyrequest_counter > 0) {
                 conn->keyrequest_counter--;
-                ipc_answer_1(fifo_pop(conn->keyrequests), EOK,
-                    c);
+                ipc_answer_4(fifo_pop(conn->keyrequests), EOK,
+                    ev.type, ev.key, ev.mods, ev.c);
                 break;
             }
-            keybuffer_push(&conn->keybuffer, c);
+            keybuffer_push(&conn->keybuffer, &ev);
             retval = 0;
             break;
         default:
             retval = ENOENT;
 ,7 → 366,7
     ipc_callid_t callid;
     ipc_call_t call;
     int consnum;
-    ipcarg_t arg1, arg2, arg3;
+    ipcarg_t arg1, arg2, arg3, arg4;
     connection_t *conn;
     if ((consnum = find_free_connection()) == -1) {
 ,6 → 391,9
         arg1 = 0;
         arg2 = 0;
+        arg3 = 0;
+        arg4 = 0;
         switch (IPC_GET_METHOD(call)) {
         case IPC_M_PHONE_HUNGUP:
             gcons_notify_disconnect(consnum);
 ,7 → 464,7
             if (consnum == active_console)
                 curs_visibility(arg1);
             break;
-        case CONSOLE_GETCHAR:
+        case CONSOLE_GETKEY:
             if (keybuffer_empty(&conn->keybuffer)) {
                 /* buffer is empty -> store request */
                 if (conn->keyrequest_counter <
 ,12 → 480,15
                 }
                 continue;
             }
-            int ch;
-            keybuffer_pop(&conn->keybuffer, &ch);
-            arg1 = ch;
+            kbd_event_t ev;
+            keybuffer_pop(&conn->keybuffer, &ev);
+            arg1 = ev.type;
+            arg2 = ev.key;
+            arg3 = ev.mods;
+            arg4 = ev.c;
             break;
         }
-        ipc_answer_2(callid, EOK, arg1, arg2);
+        ipc_answer_4(callid, EOK, arg1, arg2, arg3, arg4);
     }
 }

 /branches/dynload/uspace/srv/rd/rd.c
 ,7 → 257,7
     int flags = AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE;
     int retval = physmem_map(rd_ph_addr, rd_addr,
         ALIGN_UP(rd_size, PAGE_SIZE) >> PAGE_WIDTH, flags);
     if (retval < 0) {
         printf(NAME ": Error mapping RAM disk\n");
         return false;

 /branches/dynload/uspace/srv/loader/main.c
 ,6 → 50,7
 #include <fcntl.h>
 #include <sys/types.h>
 #include <ipc/ipc.h>
+#include <ipc/services.h>
 #include <ipc/loader.h>
 #include <loader/pcb.h>
 #include <errno.h>
 ,6 → 82,8
 static bool is_dyn_linked;
+/** Used to limit number of connections to one. */
+static bool connected;
 static void loader_get_taskid(ipc_callid_t rid, ipc_call_t *request)
 {
 ,6 → 308,17
     ipc_call_t call;
     int retval;
+    /* Already have a connection? */
+    if (connected) {
+        ipc_answer_0(iid, ELIMIT);
+        return;
+    }
+    connected = true;
+    /* Accept the connection */
+    ipc_answer_0(iid, EOK);
     /* Ignore parameters, the connection is already open */
     (void)iid; (void)icall;
 ,31 → 360,20
  */
 int main(int argc, char *argv[])
 {
-    ipc_callid_t callid;
-    ipc_call_t call;
-    ipcarg_t phone_hash;
+    ipcarg_t phonead;
-    /* The first call only communicates the incoming phone hash */
-    callid = ipc_wait_for_call(&call);
+    connected = false;
+    /* Set a handler of incomming connections. */
+    async_set_client_connection(loader_connection);
-    if (IPC_GET_METHOD(call) != LOADER_HELLO) {
-        if (IPC_GET_METHOD(call) != IPC_M_PHONE_HUNGUP)
-            ipc_answer_0(callid, EINVAL);
-        return 1;
-    }
-    ipc_answer_0(callid, EOK);
-    phone_hash = call.in_phone_hash;
-    /*
-     * Up until now async must not be used as it couldn't
-     * handle incoming requests. (Which means e.g. printf()
-     * cannot be used)
-     */
-    async_new_connection(phone_hash, 0, NULL, loader_connection);
+    /* Register at naming service. */
+    if (ipc_connect_to_me(PHONE_NS, SERVICE_LOAD, 0, 0, &phonead) != 0)
+        return -1;
     async_manager();
-    /* not reached */
+    /* Never reached */
     return 0;
 }

 /branches/dynload/uspace/srv/fb/msim.c
 ,7 → 59,8
     void *phys_addr = (void *) sysinfo_value("fb.address.physical");
     virt_addr = (char *) as_get_mappable_page(1);
-    physmem_map(phys_addr, virt_addr, 1, AS_AREA_READ | AS_AREA_WRITE);
+    if (physmem_map(phys_addr, virt_addr, 1, AS_AREA_READ | AS_AREA_WRITE) != 0)
+        return -1;
     serial_console_init(msim_putc, WIDTH, HEIGHT);

 /branches/dynload/uspace/srv/fb/fb.c
 ,8 → 1671,9
     unsigned int fbsize = fb_scanline * fb_height;
     void *fb_addr = as_get_mappable_page(fbsize);
-    physmem_map(fb_ph_addr + fb_offset, fb_addr,
-        ALIGN_UP(fbsize, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
+    if (physmem_map(fb_ph_addr + fb_offset, fb_addr,
+        ALIGN_UP(fbsize, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE) != 0)
+        return -1;
     if (screen_init(fb_addr, fb_width, fb_height, fb_scanline, fb_visual))
         return 0;

 /branches/dynload/uspace/srv/fb/sgcn.c
 ,19 → 121,13
  */
 int sgcn_init(void)
 {
-    sram_virt_addr = (uintptr_t) as_get_mappable_page(
-        sysinfo_value("sram.area.size"));
-    int result = physmem_map(
-        (void *) sysinfo_value("sram.address.physical"),
-        (void *) sram_virt_addr,
-        sysinfo_value("sram.area.size") / PAGE_SIZE,
-        AS_AREA_READ | AS_AREA_WRITE
-        );
-    if (result != 0) {
-        printf("SGCN: uspace driver couldn't map physical memory: %d\n",
-            result);
-    }
+    sram_virt_addr = (uintptr_t) as_get_mappable_page(sysinfo_value("sram.area.size"));
+    if (physmem_map((void *) sysinfo_value("sram.address.physical"),
+        (void *) sram_virt_addr, sysinfo_value("sram.area.size") / PAGE_SIZE,
+        AS_AREA_READ | AS_AREA_WRITE) != 0)
+        return -1;
     serial_console_init(sgcn_putc, WIDTH, HEIGHT);
     sram_buffer_offset = sysinfo_value("sram.buffer.offset");

 /branches/dynload/uspace/srv/fb/ega.c
 ,7 → 373,7
     scr_width = sysinfo_value("fb.width");
     scr_height = sysinfo_value("fb.height");
-    if(sysinfo_value("fb.blinking")) {
+    if (sysinfo_value("fb.blinking")) {
         ega_normal_color &= 0x77;
         ega_inverted_color &= 0x77;
     }
 ,8 → 385,9
     sz = scr_width * scr_height * 2;
     scr_addr = as_get_mappable_page(sz);
-    physmem_map(ega_ph_addr, scr_addr, ALIGN_UP(sz, PAGE_SIZE) >>
-        PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
+    if (physmem_map(ega_ph_addr, scr_addr, ALIGN_UP(sz, PAGE_SIZE) >>
+        PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE) != 0)
+        return -1;
     async_set_client_connection(ega_client_connection);

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4342 → Rev 4343