summaryrefslogtreecommitdiffstats
path: root/sys/dev/atkbdc
diff options
context:
space:
mode:
authorsobomax <sobomax@FreeBSD.org>2005-04-07 18:18:17 +0000
committersobomax <sobomax@FreeBSD.org>2005-04-07 18:18:17 +0000
commit0518f8286a7116705d5f27978109b144253840ed (patch)
tree22fdc50a961ed711b7616f026d0af9e372c40d37 /sys/dev/atkbdc
parent7c5f435fc4a8b39b2a13692d82727151f25dc37c (diff)
downloadFreeBSD-src-0518f8286a7116705d5f27978109b144253840ed.zip
FreeBSD-src-0518f8286a7116705d5f27978109b144253840ed.tar.gz
Make previous commit actually working by replacing TUNABLE_INT() with
TUNABLE_INT_FETCH(). Apparently keyboard init is performed earlier in the boot process than fetching all static tunables. MFC after: 1 day
Diffstat (limited to 'sys/dev/atkbdc')
-rw-r--r--sys/dev/atkbdc/atkbdc.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/sys/dev/atkbdc/atkbdc.c b/sys/dev/atkbdc/atkbdc.c
index 0e1fdea..08fa768 100644
--- a/sys/dev/atkbdc/atkbdc.c
+++ b/sys/dev/atkbdc/atkbdc.c
@@ -942,16 +942,6 @@ test_controller(KBDC p)
return (c == KBD_DIAG_DONE);
}
-/*
- * Provide a way to disable using Keyboard Interface Test command, which may
- * cause problems with some non-compliant hardware, resulting in machine
- * being powered down early in the boot process.
- *
- * Particularly it's known that HP ZV5000 and Compaq R3000Z notebooks are
- * affected.
- */
-static int broken_kit_cmd = 0;
-TUNABLE_INT("hw.atkbdc.broken_kit_cmd", &broken_kit_cmd);
int
test_kbd_port(KBDC p)
@@ -959,7 +949,17 @@ test_kbd_port(KBDC p)
int retry = KBD_MAXRETRY;
int again = KBD_MAXWAIT;
int c = -1;
-
+ int broken_kit_cmd = 0;
+
+ /*
+ * Provide a way to disable using Keyboard Interface Test command, which
+ * may cause problems with some non-compliant hardware, resulting in
+ * machine being powered down early in the boot process.
+ *
+ * Particularly it's known that HP ZV5000 and Compaq R3000Z notebooks are
+ * affected.
+ */
+ TUNABLE_INT_FETCH("hw.atkbdc.broken_kit_cmd", &broken_kit_cmd);
if (broken_kit_cmd != 0)
return 0;
OpenPOWER on IntegriCloud