Changeset dd641e3 in mainline

Timestamp:

2006-06-04T12:22:54Z (19 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

26f48570

Parents:

67ec84b

Message:

fb make changes neaded by ega driver and console switching by function keys

Files:

• console/console.c (modified) (2 diffs)
• fb/Makefile (modified) (1 diff)
• fb/main.c (modified) (2 diffs)
• kbd/arch/ia32/src/kbd.c (modified) (4 diffs)
• kbd/generic/kbd.c (modified) (1 diff)
• kbd/generic/key_buffer.c (modified) (2 diffs)
• kbd/include/key_buffer.h (modified) (2 diffs)

console/console.c

@@ -285 +285 @@
         ipc_call_t call;
         int retval;
-        char c;
+        int c;
         connection_t *conn;
         
@@ -305 +305 @@
                         conn = &connections[active_console];
 //                      if ((c >= KBD_KEY_F1) && (c < KBD_KEY_F1 + CONSOLE_COUNT)) {
-                        if ((c >= '0') && (c < '0' + CONSOLE_COUNT)) {
-                                if (c == '0')
+                        if ((c >= 0x101) && (c < 0x101 + CONSOLE_COUNT)) {
+                                if (c == 0x112)
                                         change_console(KERNEL_CONSOLE);
                                 else
-                                        change_console(c - '1');
+                                        change_console(c - 0x101);
                                 break;
                         }

fb/Makefile

@@ -46 +46 @@
 OUTPUT = fb
 SOURCES = \
-        fb.c \
-        font-8x16.c \
         main.c \
         sysio.c \
-        ega.c \
         ppm.c
+
+ifeq ($(ARCH), ia32)
+        SOURCES +=      fb.c \
+        font-8x16.c \
+        ega.c 
+endif
+ifeq ($(ARCH), amd64)
+        SORCES +=       fb.c \
+        font-8x16.c \
+        ega.c 
+endif
+
+CFLAGS += -D$(ARCH)
+
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))

fb/main.c

@@ -57 +57 @@
         int initialized = 0;
 
+#ifdef ia32
         if (sysinfo_value("fb.kind") == 1) {
                 if (fb_init() == 0)
@@ -64 +65 @@
                         initialized = 1;
         }
+#endif
+
+#ifdef amd64 
+        if (sysinfo_value("fb.kind") == 1) {
+                if (fb_init() == 0)
+                        initialized = 1;
+        } else if (sysinfo_value("fb.kind") == 2) {
+                if (ega_init() == 0)
+                        initialized = 1;
+        }
+#endif
+
+
         
         if (!initialized)

kbd/arch/ia32/src/kbd.c

@@ -58 +58 @@
 #define SC_END          0x4f
 
+#define FUNCTION_KEYS 0x100
+
 static volatile int keyflags;           /**< Tracking of multiple keypresses. */
 static volatile int lockflags;          /**< Tracking of multiple keys lockings. */
 
 /** Primary meaning of scancodes. */
-static char sc_primary_map[] = {
+static int sc_primary_map[] = {
         SPECIAL, /* 0x00 */
         SPECIAL, /* 0x01 - Esc */
@@ -79 +81 @@
         ' ',
         SPECIAL, /* 0x3a - CapsLock */
-        SPECIAL, /* 0x3b - F1 */
-        SPECIAL, /* 0x3c - F2 */
-        SPECIAL, /* 0x3d - F3 */
-        SPECIAL, /* 0x3e - F4 */
-        SPECIAL, /* 0x3f - F5 */
-        SPECIAL, /* 0x40 - F6 */
-        SPECIAL, /* 0x41 - F7 */
-        SPECIAL, /* 0x42 - F8 */
-        SPECIAL, /* 0x43 - F9 */
-        SPECIAL, /* 0x44 - F10 */
+        (FUNCTION_KEYS | 1), /* 0x3b - F1 */
+        (FUNCTION_KEYS | 2), /* 0x3c - F2 */
+        (FUNCTION_KEYS | 3), /* 0x3d - F3 */
+        (FUNCTION_KEYS | 4), /* 0x3e - F4 */
+        (FUNCTION_KEYS | 5), /* 0x3f - F5 */
+        (FUNCTION_KEYS | 6), /* 0x40 - F6 */
+        (FUNCTION_KEYS | 7), /* 0x41 - F7 */
+        (FUNCTION_KEYS | 8), /* 0x42 - F8 */
+        (FUNCTION_KEYS | 9), /* 0x43 - F9 */
+        (FUNCTION_KEYS | 10), /* 0x44 - F10 */
         SPECIAL, /* 0x45 - NumLock */
         SPECIAL, /* 0x46 - ScrollLock */
@@ -98 +100 @@
         SPECIAL, /* 0x55 - F11/F12/PF1/FN */
         SPECIAL, /* 0x56 - unlabelled key next to LAlt */
-        SPECIAL, /* 0x57 - F11 */
-        SPECIAL, /* 0x58 - F12 */
+        FUNCTION_KEYS | 11, /* 0x57 - F11 */
+        FUNCTION_KEYS | 12, /* 0x58 - F12 */
         SPECIAL, /* 0x59 */
         SPECIAL, /* 0x5a */
@@ -251 +253 @@
 static int key_pressed(keybuffer_t *keybuffer, unsigned char key)
 {
-        char *map = sc_primary_map;
-        char ascii = sc_primary_map[key];
-        char shift, capslock;
-        char letter = 0;
+        int *map = sc_primary_map;
+        int ascii = sc_primary_map[key];
+        int shift, capslock;
+        int letter = 0;
 
         switch (key) {

kbd/generic/kbd.c

@@ -92 +92 @@
                         case IPC_M_INTERRUPT:
                                 if (connected) {
+                                        int chr;
                                         /* recode to ASCII - one interrupt can produce more than one code so result is stored in fifo */
                                         kbd_arch_process(&keybuffer, IPC_GET_ARG2(call));
 
                                         retval = 0;
+                                        
 
                                         while (!keybuffer_empty(&keybuffer)) {
-                                                if (!keybuffer_pop(&keybuffer, (char *)&arg1)) {
+                                                if (!keybuffer_pop(&keybuffer, (int *)&chr)) {
                                                         break;
                                                 }
-                                                send_call(phoneid, KBD_PUSHCHAR, arg1);
+                                                {
+                                                        arg1=chr;
+                                                        send_call(phoneid, KBD_PUSHCHAR, arg1);
+                                                }    
                                         }
 

kbd/generic/key_buffer.c

@@ -73 +73 @@
  * @param key code of stored key
  */
-void keybuffer_push(keybuffer_t *keybuffer, char key)
+void keybuffer_push(keybuffer_t *keybuffer, int key)
 {
         futex_down(&keybuffer_futex);
@@ -88 +88 @@
  * @return zero on empty buffer, nonzero else
  */
-int keybuffer_pop(keybuffer_t *keybuffer, char *c)
+int keybuffer_pop(keybuffer_t *keybuffer, int *c)
 {
         futex_down(&keybuffer_futex);
         if (keybuffer->items > 0) {
                 keybuffer->items--;
-                *c = keybuffer->fifo[keybuffer->head];
+                *c = (keybuffer->fifo[keybuffer->head]) ;
                 keybuffer->head = (keybuffer->head + 1) % KEYBUFFER_SIZE;
                 futex_up(&keybuffer_futex);

kbd/include/key_buffer.h

@@ -36 +36 @@
 
 typedef struct {
-        char fifo[KEYBUFFER_SIZE];
+        int fifo[KEYBUFFER_SIZE];
         unsigned long head;
         unsigned long tail;
@@ -46 +46 @@
 int keybuffer_available(keybuffer_t *keybuffer);
 int keybuffer_empty(keybuffer_t *keybuffer);
-void keybuffer_push(keybuffer_t *keybuffer, char key);
-int keybuffer_pop(keybuffer_t *keybuffer, char *c);
+void keybuffer_push(keybuffer_t *keybuffer, int key);
+int keybuffer_pop(keybuffer_t *keybuffer, int *c);
 
 #endif