dragon ports: Update keymaps to use keysyms

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>

diff --git a/Kernel/platform-dragon-nx32/devtty.c b/Kernel/platform-dragon-nx32/devtty.c
index fe24dc7..720796a 100644 (file)
--- a/Kernel/platform-dragon-nx32/devtty.c
+++ b/Kernel/platform-dragon-nx32/devtty.c
@@ -142,20 +142,20 @@ static void keyproc(void)
 }
 
 uint8_t keyboard[8][7] = {
-       { '0', '8', '@', 'h', 'p', 'x', 10 },
+       { '0', '8', '@', 'h', 'p', 'x', KEY_ENTER },
        { '1', '9', 'a', 'i', 'q', 'y', 0 /* clear - used as ctrl*/ },
-       { '2', ':', 'b', 'j', 'r', 'z', 27 /* break (used for esc) */ },
+       { '2', ':', 'b', 'j', 'r', 'z', KEY_ESC /* break (used for esc) */ },
        { '3', ';', 'c', 'k', 's', '^' /* up */, 0 /* NC */ },
        { '4', ',', 'd', 'l', 't', '|' /* down */, 0 /* NC */ },
-       { '5', '-', 'e', 'm', 'u', 8 /* left */, 0 /* NC */ },
-       { '6', '.', 'f', 'n', 'v', '\t' /* right */, 0 /* NC */ },
+       { '5', '-', 'e', 'm', 'u', KEY_BS /* left */, 0 /* NC */ },
+       { '6', '.', 'f', 'n', 'v', KEY_TAB /* right */, 0 /* NC */ },
        { '7', '/', 'g', 'o', 'w', ' ', 0 /* shift */ },
 };
 
 uint8_t shiftkeyboard[8][7] = {
-       { '_', '(', '\\', 'H', 'P', 'X', 10 },
-       { '!', ')', 'A', 'I', 'Q', 'Y', 0 /* clear */ },
-       { '"', '*', 'B', 'J', 'R', 'Z', 3 /* break */ },
+       { '_', '(', '\\', 'H', 'P', 'X', KEY_ENTER },
+       { '!', ')', 'A', 'I', 'Q', 'Y', 0 /* clear - used as ctrl*/ },
+       { '"', '*', 'B', 'J', 'R', 'Z', CTRL('C') /* break */ },
        { '#', '+', 'C', 'K', 'S', '[' /* up */, 0 /* NC */ },
        { '$', '<', 'D', 'L', 'T', ']' /* down */, 0 /* NC */ },
        { '%', '=', 'E', 'M', 'U', '{' /* left */, 0 /* NC */ },

diff --git a/Kernel/platform-dragon/devtty.c b/Kernel/platform-dragon/devtty.c
index fe24dc7..720796a 100644 (file)
--- a/Kernel/platform-dragon/devtty.c
+++ b/Kernel/platform-dragon/devtty.c
@@ -142,20 +142,20 @@ static void keyproc(void)
 }
 
 uint8_t keyboard[8][7] = {
-       { '0', '8', '@', 'h', 'p', 'x', 10 },
+       { '0', '8', '@', 'h', 'p', 'x', KEY_ENTER },
        { '1', '9', 'a', 'i', 'q', 'y', 0 /* clear - used as ctrl*/ },
-       { '2', ':', 'b', 'j', 'r', 'z', 27 /* break (used for esc) */ },
+       { '2', ':', 'b', 'j', 'r', 'z', KEY_ESC /* break (used for esc) */ },
        { '3', ';', 'c', 'k', 's', '^' /* up */, 0 /* NC */ },
        { '4', ',', 'd', 'l', 't', '|' /* down */, 0 /* NC */ },
-       { '5', '-', 'e', 'm', 'u', 8 /* left */, 0 /* NC */ },
-       { '6', '.', 'f', 'n', 'v', '\t' /* right */, 0 /* NC */ },
+       { '5', '-', 'e', 'm', 'u', KEY_BS /* left */, 0 /* NC */ },
+       { '6', '.', 'f', 'n', 'v', KEY_TAB /* right */, 0 /* NC */ },
        { '7', '/', 'g', 'o', 'w', ' ', 0 /* shift */ },
 };
 
 uint8_t shiftkeyboard[8][7] = {
-       { '_', '(', '\\', 'H', 'P', 'X', 10 },
-       { '!', ')', 'A', 'I', 'Q', 'Y', 0 /* clear */ },
-       { '"', '*', 'B', 'J', 'R', 'Z', 3 /* break */ },
+       { '_', '(', '\\', 'H', 'P', 'X', KEY_ENTER },
+       { '!', ')', 'A', 'I', 'Q', 'Y', 0 /* clear - used as ctrl*/ },
+       { '"', '*', 'B', 'J', 'R', 'Z', CTRL('C') /* break */ },
        { '#', '+', 'C', 'K', 'S', '[' /* up */, 0 /* NC */ },
        { '$', '<', 'D', 'L', 'T', ']' /* down */, 0 /* NC */ },
        { '%', '=', 'E', 'M', 'U', '{' /* left */, 0 /* NC */ },