Changeset f8d5b85 in mainline

Timestamp:

2006-06-13T11:04:16Z (18 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

0384428

Parents:

15039b67

Message:

Kbd patch for gxemul with no framebuffer

File:

• kbd/arch/mips32/src/kbd.c (modified) (6 diffs)

kbd/arch/mips32/src/kbd.c

@@ -81 +81 @@
 
 static int msim,gxemul;
+static int fb_fb;
+
 
 int kbd_arch_init(void)
 {
+        fb_fb=sysinfo_value("fb.kind")==1;
         ipc_register_irq(2, &msim_kbd);
-        msim=sysinfo_value("machine.msim");
-        gxemul=sysinfo_value("machine.lgxemul");
         return 0;
 }
 
 
-//*
+/*
 //*
 //* Please preserve this code (it can be used to determine scancodes)
@@ -99 +100 @@
         return "0123456789ABCDEF"[v];
 }
-//*/
-
-static int kbd_arch_process_msim(keybuffer_t *keybuffer, int scan_code)
+*/
+
+static int kbd_arch_process_no_fb(keybuffer_t *keybuffer, int scan_code)
 {
 
@@ -108 +109 @@
 
 
-        //* Please preserve this code (it can be used to determine scancodes)
-        //*
-        //keybuffer_push(keybuffer, to_hex((scan_code>>4)&0xf));
-        //keybuffer_push(keybuffer, to_hex(scan_code&0xf));
-        //keybuffer_push(keybuffer, ' ');
-        //keybuffer_push(keybuffer, ' ');
-        //*/
-        //return 1;
-        
+        /* Please preserve this code (it can be used to determine scancodes)
+        
+        keybuffer_push(keybuffer, to_hex((scan_code>>4)&0xf));
+        keybuffer_push(keybuffer, to_hex(scan_code&0xf));
+        keybuffer_push(keybuffer, ' ');
+        keybuffer_push(keybuffer, ' ');
+        
+        return 1;
+        */
         
         if(scan_code==0x7e)
@@ -252 +253 @@
 
 
-static int kbd_arch_process_gxemul(keybuffer_t *keybuffer, int scan_code)
+static int kbd_arch_process_fb(keybuffer_t *keybuffer, int scan_code)
 {
 
@@ -259 +260 @@
 
 
-        //* Please preserve this code (it can be used to determine scancodes)
-        //*
-        //keybuffer_push(keybuffer, to_hex((scan_code>>4)&0xf));
-        //keybuffer_push(keybuffer, to_hex(scan_code&0xf));
-        //keybuffer_push(keybuffer, ' ');
-        //keybuffer_push(keybuffer, ' ');
-        //*/
-        //return 1;
-        
+        /* Please preserve this code (it can be used to determine scancodes)
+        
+        keybuffer_push(keybuffer, to_hex((scan_code>>4)&0xf));
+        keybuffer_push(keybuffer, to_hex(scan_code&0xf));
+        keybuffer_push(keybuffer, ' ');
+        keybuffer_push(keybuffer, ' ');
+        
+        return 1;
+        */
         
         if ( scan_code == '\r' )
@@ -390 +391 @@
         }
 
-        if(msim) return kbd_arch_process_msim(keybuffer, scan_code);
-        if(gxemul) return kbd_arch_process_gxemul(keybuffer, scan_code);
+        if(fb_fb) return kbd_arch_process_fb(keybuffer, scan_code);
+        return kbd_arch_process_no_fb(keybuffer, scan_code);
 
         return 0;
 }
-
-/**
- * @}
- */ 
+/** @}
+*/