Index: kbd/arch/mips32/src/kbd.c
===================================================================
--- kbd/arch/mips32/src/kbd.c	(revision 15039b6701d041636bc9aaa20ee0cd202b7473dc)
+++ kbd/arch/mips32/src/kbd.c	(revision f8d5b85b5d8cc7dd6a90f20c66cc1966227a32a5)
@@ -81,15 +81,16 @@
 
 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,7 +100,7 @@
         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,13 +109,13 @@
 
 
-	//* 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,5 +253,5 @@
 
 
-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,13 +260,13 @@
 
 
-	//* 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,11 +391,9 @@
 	}
 
-	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;
 }
-
-/**
- * @}
- */ 
+/** @}
+*/
