keycode: Add more codes, move CTRL back to fix build breakage

diff --git a/Kernel/include/keycode.h b/Kernel/include/keycode.h
index 7741210..4621a94 100644 (file)
--- a/Kernel/include/keycode.h
+++ b/Kernel/include/keycode.h
@@ -9,7 +9,6 @@
  */
 
 
-#define CTRL(x)                ((x)&0x1F)
 #define ESC(x)         (0x80|(x))
 
 #define KEY_DEL                0x7F
@@ -30,6 +29,10 @@
 #define KEY_EXTRA      ESC('e')
 #define KEY_PRINT      ESC(']')
 #define KEY_STOP       CTRL('C')
+#define KEY_DELR       ESC('r')
+#define KEY_PLUS       ESC('+')
+#define KEY_MINUS      ESC('-')
+#define KEY_EXIT       ESC('q')
 
 #define KEY_F1         ESC('1')
 #define KEY_F2         ESC('2')
@@ -48,5 +51,6 @@
 #define KEY_POUND      0x80
 #define KEY_HALF       0x81
 #define KEY_EURO       0x82
+#define KEY_DOT                0x83
 
 #endif

diff --git a/Kernel/include/tty.h b/Kernel/include/tty.h
index 89527e6..ab5cda2 100644 (file)
--- a/Kernel/include/tty.h
+++ b/Kernel/include/tty.h
@@ -159,6 +159,8 @@ struct tty {
     struct termios termios;
 };
 
+#define CTRL(x)                ((x)&0x1F)
+
 extern struct tty ttydata[NUM_DEV_TTY + 1];
 
 extern CODE1 void tty_init(void);