diff options
| author | jkim <jkim@FreeBSD.org> | 2011-06-06 22:18:40 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2011-06-06 22:18:40 +0000 |
| commit | 165e30068eca33d6e882962c2641a8016be2d90a (patch) | |
| tree | 0ac1cc9193c2fad1cf53a06b08f88d25a228791c | |
| parent | fcab0a31d2e4d49b5dcb107489d0fcd0f87c8ee6 (diff) | |
| download | FreeBSD-src-165e30068eca33d6e882962c2641a8016be2d90a.zip FreeBSD-src-165e30068eca33d6e882962c2641a8016be2d90a.tar.gz | |
Revert r222152. The root cause was analysed and better fix is upcoming.
Discussed with: delphij
| -rw-r--r-- | share/man/man4/atkbd.4 | 7 | ||||
| -rw-r--r-- | sys/dev/atkbdc/atkbd.c | 3 | ||||
| -rw-r--r-- | sys/dev/atkbdc/atkbdreg.h | 1 |
3 files changed, 1 insertions, 10 deletions
diff --git a/share/man/man4/atkbd.4 b/share/man/man4/atkbd.4 index 0c486e2..73831c2 100644 --- a/share/man/man4/atkbd.4 +++ b/share/man/man4/atkbd.4 @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 20, 2011 +.Dd January 29, 2008 .Dt ATKBD 4 .Os .Sh NAME @@ -176,11 +176,6 @@ When this option is given, the .Nm driver will not test the keyboard port during the probe routine. Some machines hang during boot when this test is performed. -.It bit 4 (PROBE_TYPEMATIC) -When this option is given, the -.Nm -driver will try to probe the keyboard typematic rate on boot. -Some machines hang during boot when this test is performed. .El .\".Sh FILES .Sh EXAMPLES diff --git a/sys/dev/atkbdc/atkbd.c b/sys/dev/atkbdc/atkbd.c index 643554d..600020f 100644 --- a/sys/dev/atkbdc/atkbd.c +++ b/sys/dev/atkbdc/atkbd.c @@ -1097,9 +1097,6 @@ get_typematic(keyboard_t *kbd) x86regs_t regs; uint8_t *p; - if (!(kbd->kb_config & KB_CONF_PROBE_TYPEMATIC)) - return (ENODEV); - if (x86bios_get_intr(0x15) == 0 || x86bios_get_intr(0x16) == 0) return (ENODEV); diff --git a/sys/dev/atkbdc/atkbdreg.h b/sys/dev/atkbdc/atkbdreg.h index 3d54b4d..cf7ee6b 100644 --- a/sys/dev/atkbdc/atkbdreg.h +++ b/sys/dev/atkbdc/atkbdreg.h @@ -36,7 +36,6 @@ #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 */ -#define KB_CONF_PROBE_TYPEMATIC (1 << 4) /* probe keyboard typematic */ #ifdef _KERNEL |
