Changeset af75db9 in mainline for kernel/genarch/src/kbd/i8042.c

Timestamp:

2009-02-12T20:05:15Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

912ee7c

Parents:

95b9963

Message:

remove (almost all) platform dependent code from drivers

File:

• kernel/genarch/src/kbd/i8042.c (modified) (5 diffs)

kernel/genarch/src/kbd/i8042.c

@@ -38 +38 @@
 
 #include <genarch/kbd/i8042.h>
-#ifdef ia64
 #include <arch/drivers/kbd.h>
-#endif
 #include <genarch/kbd/key.h>
 #include <genarch/kbd/scanc.h>
@@ -172 +170 @@
         i8042_mouse_irq.handler = i8042_irq_handler;
         irq_register(&i8042_mouse_irq);
-#ifndef ia64    
+        
         trap_virtual_enable_irqs(1 << kbd_inr);
         trap_virtual_enable_irqs(1 << mouse_inr);
-#endif  
+        
         /*
          * Clear input buffer.
@@ -190 +188 @@
 #ifdef KBD_LEGACY
         sysinfo_set_item_val("kbd.type", NULL, KBD_LEGACY);
-#endif  
+#endif
         sysinfo_set_item_val("mouse", NULL, true);
         sysinfo_set_item_val("mouse.devno", NULL, mouse_devno);
@@ -210 +208 @@
 char i8042_key_read(chardev_t *d)
 {
-        char ch;        
-
-        while(!(ch = active_read_buff_read())) {
+        char ch;
+        
+        while (!(ch = active_read_buff_read())) {
                 uint8_t x;
-                while (!(i8042_status_read() & i8042_BUFFER_FULL_MASK))
-                        ;
+                
+                while (!(i8042_status_read() & i8042_BUFFER_FULL_MASK));
+                
                 x = i8042_data_read();
                 if (x & KEY_RELEASE)
@@ -232 +231 @@
 {
         uint8_t x;
-
+        
         while (((x = i8042_status_read() & i8042_BUFFER_FULL_MASK))) {
                 x = i8042_data_read();