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
This commit is contained in:
Maxim Sobolev 2005-04-07 18:18:17 +00:00
parent cb3f3e5c9b
commit 7ca67a6885
2 changed files with 20 additions and 20 deletions

View File

@ -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;

View File

@ -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;