Changeset fcd7053 in mainline for uspace/srv/kbd/arch/ia64/src/kbd.c

Timestamp:

2009-02-12T20:11:25Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

fa024ce

Parents:

84266669

Message:

cleanup configuration
code cleanup

File:

• uspace/srv/kbd/arch/ia64/src/kbd.c (modified) (7 diffs)

uspace/srv/kbd/arch/ia64/src/kbd.c

@@ -115 +115 @@
 
 
-
-irq_cmd_t ski_cmds[1] = {
-        { CMD_IA64_GETCHAR, 0, 0, 2 }
-};
-
-irq_code_t ski_kbd = {
-        1,
-        ski_cmds
-};
-
-
-
 irq_cmd_t ns16550_cmds[1] = {
         { CMD_PORT_READ_1, 0, 0, 2 },
@@ -145 +133 @@
         if (sysinfo_value("kbd")) {
                 kbd_type=sysinfo_value("kbd.type");
-                if(kbd_type==KBD_SKI) ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), 0, &ski_kbd);
-                if(kbd_type==KBD_LEGACY) return lkbd_arch_init();
-                if(kbd_type==KBD_NS16550) {
-                        ns16550_kbd.cmds[0].addr= (void *)  (sysinfo_value("kbd.port")+RBR_REG);
+                if (kbd_type == KBD_LEGACY)
+                        return lkbd_arch_init();
+                if (kbd_type == KBD_NS16550) {
+                        ns16550_kbd.cmds[0].addr = (void *) (sysinfo_value("kbd.port") + RBR_REG);
                         ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"), 0, &ns16550_kbd);
-                        iospace_enable(task_get_id(),ns16550_port=sysinfo_value("kbd.port"),8);
-                }       
+                        iospace_enable(task_get_id(), ns16550_port = sysinfo_value("kbd.port"), 8);
+                }
                 return 0;
-        }       
+        }
         return 1;
 }
@@ -171 +159 @@
         static unsigned long buf = 0;
         static int count = 0, esc_count=0;      
-
+        
         int scan_code = IPC_GET_ARG2(*call);
-
+        
         if (scan_code == 0x1b) {
                 esc_count++;
@@ -182 +170 @@
                 esc_count = 0;
         }
-
-        if(scan_code==0x0d) return 1;   //Delete CR
-        if(scan_code==0x7f) scan_code='\b';     //Convert backspace
-
+        
+        if (scan_code == 0x0d)
+                return 1;        /* Delete CR */
+        if (scan_code == 0x7f)
+                scan_code='\b';  /* Convert backspace */
+        
         if(scan_code == 0x7e) {
                 switch (buf) {
@@ -308 +298 @@
         return 1;
 }
-
-
-
-
-
-
 
 int kbd_ski_process(keybuffer_t *keybuffer, ipc_call_t *call) 
@@ -394 +378 @@
 {
         printf("KBD Key pressed: %x(%c)\n",IPC_GET_ARG2(*call),IPC_GET_ARG2(*call));
-        if(kbd_type==KBD_SKI) return kbd_ski_process(keybuffer,call);
-        if(kbd_type==KBD_NS16550) return kbd_ns16550_process(keybuffer,call);
-        if(kbd_type==KBD_LEGACY) return lkbd_arch_process(keybuffer,call);
-
-        
+        if (kbd_type == KBD_SKI)
+                return kbd_ski_process(keybuffer, call);
+        if (kbd_type == KBD_NS16550)
+                return kbd_ns16550_process(keybuffer,call);
+        if (kbd_type == KBD_LEGACY)
+                return lkbd_arch_process(keybuffer,call);
 }
 
@@ -405 +390 @@
 /**
  * @}
- */ 
+ */