Author: jkim
Date: Mon Jun 6 22:18:40 2011
New Revision: 222793
URL: http://svn.freebsd.org/changeset/base/222793
Log:
Revert r222152. The root cause was analysed and better fix is upcoming.
Discussed with: delphij
Modified:
head/share/man/man4/atkbd.4
head/sys/dev/atkbdc/atkbd.c
head/sys/dev/atkbdc/atkbdreg.h
Modified: head/share/man/man4/atkbd.4
==============================================================================
--- head/share/man/man4/atkbd.4 Mon Jun 6 22:14:46 2011 (r222792)
+++ head/share/man/man4/atkbd.4 Mon Jun 6 22:18:40 2011 (r222793)
@@ -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
Modified: head/sys/dev/atkbdc/atkbd.c
==============================================================================
--- head/sys/dev/atkbdc/atkbd.c Mon Jun 6 22:14:46 2011 (r222792)
+++ head/sys/dev/atkbdc/atkbd.c Mon Jun 6 22:18:40 2011 (r222793)
@@ -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);
Modified: head/sys/dev/atkbdc/atkbdreg.h
==============================================================================
--- head/sys/dev/atkbdc/atkbdreg.h Mon Jun 6 22:14:46 2011
(r222792)
+++ head/sys/dev/atkbdc/atkbdreg.h Mon Jun 6 22:18:40 2011
(r222793)
@@ -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
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
