diff options
author | Maxim Sobolev <sobomax@FreeBSD.org> | 2005-04-07 18:18:17 +0000 |
---|---|---|
committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2005-04-07 18:18:17 +0000 |
commit | 7ca67a6885c324da4180fdc2fa8aa6a5e93fd81e (patch) | |
tree | 22fdc50a961ed711b7616f026d0af9e372c40d37 /sys/dev/kbd | |
parent | cb3f3e5c9b9210ffe20b1c36adeb6e9fa8585afa (diff) | |
download | src-7ca67a6885c324da4180fdc2fa8aa6a5e93fd81e.tar.gz src-7ca67a6885c324da4180fdc2fa8aa6a5e93fd81e.zip |
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
Notes
Notes:
svn path=/head/; revision=144753
Diffstat (limited to 'sys/dev/kbd')
-rw-r--r-- | sys/dev/kbd/atkbdc.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sys/dev/kbd/atkbdc.c b/sys/dev/kbd/atkbdc.c index 0e1fdeaa0d07..08fa768462b9 100644 --- a/sys/dev/kbd/atkbdc.c +++ b/sys/dev/kbd/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; |