diff options
| author | sobomax <sobomax@FreeBSD.org> | 2005-04-07 23:59:37 +0000 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2005-04-07 23:59:37 +0000 |
| commit | f3e888418b8262914947b21ba457313e40a1bb27 (patch) | |
| tree | de65dcce785759e092b2ec206e7c9515441aeb11 /sys/dev | |
| parent | 36bb342d0c44fe47fd91be109a9913975f7a4203 (diff) | |
| download | FreeBSD-src-f3e888418b8262914947b21ba457313e40a1bb27.zip FreeBSD-src-f3e888418b8262914947b21ba457313e40a1bb27.tar.gz | |
Backout previous diffs - this functionality is already provided by the
hints to the atkbd(4).
PR:
Submitted by: jhb
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/atkbdc/atkbdc.c | 15 | ||||
| -rw-r--r-- | sys/dev/kbd/atkbdc.c | 15 |
2 files changed, 0 insertions, 30 deletions
diff --git a/sys/dev/atkbdc/atkbdc.c b/sys/dev/atkbdc/atkbdc.c index 08fa768..7fc2325 100644 --- a/sys/dev/atkbdc/atkbdc.c +++ b/sys/dev/atkbdc/atkbdc.c @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/syslog.h> #include <machine/bus_pio.h> @@ -942,26 +941,12 @@ test_controller(KBDC p) return (c == KBD_DIAG_DONE); } - int 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; while (retry-- > 0) { empty_both_buffers(p, 10); diff --git a/sys/dev/kbd/atkbdc.c b/sys/dev/kbd/atkbdc.c index 08fa768..7fc2325 100644 --- a/sys/dev/kbd/atkbdc.c +++ b/sys/dev/kbd/atkbdc.c @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/syslog.h> #include <machine/bus_pio.h> @@ -942,26 +941,12 @@ test_controller(KBDC p) return (c == KBD_DIAG_DONE); } - int 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; while (retry-- > 0) { empty_both_buffers(p, 10); |
