Commit: 168ebbdc9299848b21a5a9b1581b57c9260bae18 - system-core (git)

system/core

Commit MetaInfo

• Revisão: 168ebbdc9299848b21a5a9b1581b57c9260bae18 (tree)
• Hora: 2011-12-19 15:43:01
• Autor: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Mensagem de Log

init: builtins: Add 'setkeycode' command to init.rc parser

The command is used to set an entry into the kernel's scancode-to-keycode map.

Change-Id: If772b3590c08d3696ff9d015f1faf0e75405e262

Mudança Sumário

• modified: init/builtins.c
• modified: init/init_parser.c
• modified: init/keywords.h
• modified: init/readme.txt

Diff

--- a/init/builtins.c
+++ b/init/builtins.c
@@ -87,7 +87,7 @@ static int insmod(const char *filename, char *options)
     return ret;
 }
 
-static int setkey(struct kbentry *kbe)
+static int kbioctl(int cmd, void *data)
 {
     int fd, ret;
 
@@ -95,7 +95,7 @@ static int setkey(struct kbentry *kbe)
     if (fd < 0)
         return -1;
 
-    ret = ioctl(fd, KDSKBENT, kbe);
+    ret = ioctl(fd, cmd, data);
 
     close(fd);
     return ret;
@@ -473,7 +473,23 @@ int do_setkey(int nargs, char **args)
     kbe.kb_table = strtoul(args[1], 0, 0);
     kbe.kb_index = strtoul(args[2], 0, 0);
     kbe.kb_value = strtoul(args[3], 0, 0);
-    return setkey(&kbe);
+    return kbioctl(KDSKBENT, &kbe);
+}
+
+int do_setkeycode(int nargs, char **args)
+{
+    struct kbkeycode kbk;
+    unsigned int sc, kc;
+    sc = strtoul(args[1], 0, 0);
+    if (sc >= 0xe000) {
+        sc -= 0xe000;
+        sc += 128;
+    }
+    kc = strtoul(args[2], 0, 0);
+    kbk.scancode = sc;
+    kbk.keycode = kc;
+    /* sc, kc may be out of range, but we leave the testing to the kernel */
+    return kbioctl(KDSETKEYCODE, &kbk);
 }
 
 int do_setprop(int nargs, char **args)

--- a/init/init_parser.c
+++ b/init/init_parser.c
@@ -133,6 +133,7 @@ int lookup_keyword(const char *s)
         if (!strcmp(s, "ervice")) return K_service;
         if (!strcmp(s, "etenv")) return K_setenv;
         if (!strcmp(s, "etkey")) return K_setkey;
+        if (!strcmp(s, "etkeycode")) return K_setkeycode;
         if (!strcmp(s, "etprop")) return K_setprop;
         if (!strcmp(s, "etrlimit")) return K_setrlimit;
         if (!strcmp(s, "ocket")) return K_socket;

--- a/init/keywords.h
+++ b/init/keywords.h
@@ -17,6 +17,7 @@ int do_restart(int nargs, char **args);
 int do_rm(int nargs, char **args);
 int do_rmdir(int nargs, char **args);
 int do_setkey(int nargs, char **args);
+int do_setkeycode(int nargs, char **args);
 int do_setprop(int nargs, char **args);
 int do_setrlimit(int nargs, char **args);
 int do_start(int nargs, char **args);
@@ -66,6 +67,7 @@ enum {
     KEYWORD(service,     SECTION, 0, 0)
     KEYWORD(setenv,      OPTION,  2, 0)
     KEYWORD(setkey,      COMMAND, 0, do_setkey)
+    KEYWORD(setkeycode,  COMMAND, 2, do_setkeycode)
     KEYWORD(setprop,     COMMAND, 2, do_setprop)
     KEYWORD(setrlimit,   COMMAND, 3, do_setrlimit)
     KEYWORD(socket,      OPTION,  0, 0)

--- a/init/readme.txt
+++ b/init/readme.txt
@@ -185,6 +185,9 @@ mount <type> <device> <dir> [ <mountoption> ]*
 setkey
    TBD
 
+setkeycode <scancode> <keycode>
+   Set an entry into the kernel's scancode-to-keycode map.
+
 setprop <name> <value>
    Set system property <name> to <value>.