Changeset 481c520 in mainline for arch/ia32/src/drivers/i8042.c

Timestamp:

2006-02-27T12:30:11Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

02f441c0

Parents:

4a2b52f

Message:

sparc64 work.
Revive OFW console code and use it before the kernel switches to standalone console.

ia32 + ia64 cosmetic changes.

File:

• arch/ia32/src/drivers/i8042.c (modified) (8 diffs)

arch/ia32/src/drivers/i8042.c

@@ -46 +46 @@
  */
 
-#define i8042_DATA              0x60
-#define i8042_STATUS            0x64
+#define i8042_DATA                      0x60
+#define i8042_STATUS                    0x64
 #define i8042_BUFFER_FULL_MASK          0x01
-
 
 /** Keyboard commands. */
@@ -57 +56 @@
 
 /*
- 60   Write 8042 Command Byte: next data byte written to port 60h is
-      placed in 8042 command register.Format:
-
-     |7|6|5|4|3|2|1|0|8042 Command Byte
-      | | | | | | | `---- 1=enable output register full interrupt
-      | | | | | | `----- should be 0
-      | | | | | `------ 1=set status register system, 0=clear
-      | | | | `------- 1=override keyboard inhibit, 0=allow inhibit
-      | | | `-------- disable keyboard I/O by driving clock line low
-      | | `--------- disable auxiliary device, drives clock line low
-      | `---------- IBM scancode translation 0=AT, 1=PC/XT
-      `----------- reserved, should be 0
-*/
-
-#define i8042_SET_COMMAND 0x60
-#define i8042_COMMAND 0x49
-#define i8042_WAIT_MASK 0x02
-
+ * 60  Write 8042 Command Byte: next data byte written to port 60h is
+ *     placed in 8042 command register.Format:
+ *
+ *    |7|6|5|4|3|2|1|0|8042 Command Byte
+ *     | | | | | | | `---- 1=enable output register full interrupt
+ *     | | | | | | `----- should be 0
+ *     | | | | | `------ 1=set status register system, 0=clear
+ *     | | | | `------- 1=override keyboard inhibit, 0=allow inhibit
+ *     | | | `-------- disable keyboard I/O by driving clock line low
+ *     | | `--------- disable auxiliary device, drives clock line low
+ *     | `---------- IBM scancode translation 0=AT, 1=PC/XT
+ *     `----------- reserved, should be 0
+ */
+
+#define i8042_SET_COMMAND       0x60
+#define i8042_COMMAND           0x49
+#define i8042_WAIT_MASK         0x02
 
 #define SPECIAL         '?'
@@ -88 +86 @@
 
 #define ACTIVE_READ_BUFF_SIZE 16 /*Must be power of 2*/
-
 
 __u8 active_read_buff[ACTIVE_READ_BUFF_SIZE]={0};
@@ -272 +269 @@
 {
         exc_register(VECTOR_KBD, "i8042_interrupt", i8042_interrupt);
-        while (inb(i8042_STATUS)&i8042_WAIT_MASK);     /*Wait*/
+        while (inb(i8042_STATUS)&i8042_WAIT_MASK) {
+                /* wait */
+        }
         outb(i8042_STATUS,i8042_SET_COMMAND);
-        while (inb(i8042_STATUS)&i8042_WAIT_MASK);     /*Wait*/
+        while (inb(i8042_STATUS)&i8042_WAIT_MASK) {
+                /* wait */
+        }
         outb(i8042_DATA,i8042_COMMAND);
 
@@ -406 +407 @@
 }
 
-
 static __u8 active_read_buff_read(void)
 {
@@ -428 +428 @@
 
 
-static void active_readed_key_pressed(__u8 sc)
+static void active_read_key_pressed(__u8 sc)
 {
         char *map = sc_primary_map;
@@ -497 +497 @@
 }
 
-
 static char key_read(chardev_t *d)
 {
         char ch;        
-        
 
         while(!(ch=active_read_buff_read()))
@@ -511 +509 @@
                         key_released(x ^ KEY_RELEASE);
                 else
-                        active_readed_key_pressed(x);
+                        active_read_key_pressed(x);
         }
         return ch;
 }
-
-