summaryrefslogtreecommitdiff
path: root/sys/dev/kbd
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2004-12-15 23:00:47 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2004-12-15 23:00:47 +0000
commitf5517dc88781b96c75a0546616d9d35246c9fe87 (patch)
treec550f8e94b863608142496a061ce67d57395cc75 /sys/dev/kbd
parenta7500bceb08377da3391bb919b64de66df02759c (diff)
Notes
Diffstat (limited to 'sys/dev/kbd')
-rw-r--r--sys/dev/kbd/atkbd.c3
-rw-r--r--sys/dev/kbd/atkbdreg.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/kbd/atkbd.c b/sys/dev/kbd/atkbd.c
index 5d6822ef28f7..1335bc64099b 100644
--- a/sys/dev/kbd/atkbd.c
+++ b/sys/dev/kbd/atkbd.c
@@ -1117,7 +1117,8 @@ probe_keyboard(KBDC kbdc, int flags)
* to set the command byte to particular values.
*/
test_controller(kbdc);
- test_kbd_port(kbdc);
+ if (!(flags & KB_CONF_NO_PROBE_TEST))
+ test_kbd_port(kbdc);
err = get_kbd_echo(kbdc);
diff --git a/sys/dev/kbd/atkbdreg.h b/sys/dev/kbd/atkbdreg.h
index 4ae93e3b96ff..f60e48c05d94 100644
--- a/sys/dev/kbd/atkbdreg.h
+++ b/sys/dev/kbd/atkbdreg.h
@@ -35,6 +35,7 @@
#define KB_CONF_FAIL_IF_NO_KBD (1 << 0) /* don't install if no kbd is found */
#define KB_CONF_NO_RESET (1 << 1) /* don't reset the keyboard */
#define KB_CONF_ALT_SCANCODESET (1 << 2) /* assume the XT type keyboard */
+#define KB_CONF_NO_PROBE_TEST (1 << 3) /* don't test keyboard during probe */
#ifdef _KERNEL