Changeset 5173

Timestamp:

Feb 28, 2010 8:12:37 PM (3 years ago)

Author:

stepan

Message:

use names instead of numbers where possible, also print a better message if no
keyboard is connected.

Signed-off-by: Stefan Reinauer <stepan@…>
Acked-by: Stefan Reinauer <stepan@…>

File:

• trunk/src/pc80/keyboard.c (modified) (6 diffs)

trunk/src/pc80/keyboard.c

@@ -155 +155 @@
                 regval = inb(KBD_DATA);
                 --resend;
-        } while (regval == 0xFE && resend > 0);
+        } while (regval == KBD_REPLY_RESEND && resend > 0);
 
         return regval;
@@ -184 +184 @@
         /* reset keyboard and self test (keyboard side) */
         regval = send_keyboard(0xFF);
-        if (regval != 0xFA) {
+        if (regval == KBD_REPLY_RESEND) {
+                /* keeps sending RESENDs, probably no keyboard. */
+                printk_info("No PS/2 keyboard detected.\n");
+                return;
+        }
+
+        if (regval != KBD_REPLY_ACK) {
                 printk_err("Keyboard selftest failed ACK: 0x%x\n", regval);
                 return;
@@ -207 +213 @@
         /* disable the keyboard */
         regval = send_keyboard(0xF5);
-        if (regval != 0xFA) {
+        if (regval != KBD_REPLY_ACK) {
                 printk_err("Keyboard disable failed ACK: 0x%x\n", regval);
                 return;
@@ -214 +220 @@
         /* Set scancode command */
         regval = send_keyboard(0xF0);
-        if (regval != 0xFA) {
+        if (regval != KBD_REPLY_ACK) {
                 printk_err("Keyboard set scancode cmd failed ACK: 0x%x\n", regval);
                 return;
@@ -220 +226 @@
         /* Set scancode mode 2 */
         regval = send_keyboard(0x02);
-        if (regval != 0xFA) {
+        if (regval != KBD_REPLY_ACK) {
                 printk_err("Keyboard set scancode mode failed ACK: 0x%x\n", regval);
                 return;
@@ -227 +233 @@
         /* enable the keyboard */
         regval = send_keyboard(0xF4);
-        if (regval != 0xFA) {
+        if (regval != KBD_REPLY_ACK) {
                 printk_err("Keyboard enable failed ACK: 0x%x\n", regval);
                 return;