diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2007-11-26 22:45:28 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2007-11-26 22:45:28 +0000 |
| commit | 39c42e0288ffa508378cb82d08d4718cc37f4a02 (patch) | |
| tree | b7bce6c0847b061fa6f7d62b4fac09b8fdd38d0b /sys | |
| parent | a5108a33e5ff6b0e6bd28de4d98f93feda5a892d (diff) | |
Undo (well, comment out) 1.10 - this causes a regression on oqo-1 machines,
but fixes keyboard on legacy (non-ps/2) controllers, which are probably still
more common; discussed and ok deraadt@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ic/pckbc.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/dev/ic/pckbc.c b/sys/dev/ic/pckbc.c index 2db66e42ee2..b1b798edf3d 100644 --- a/sys/dev/ic/pckbc.c +++ b/sys/dev/ic/pckbc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pckbc.c,v 1.14 2007/01/31 14:38:54 mickey Exp $ */ +/* $OpenBSD: pckbc.c,v 1.15 2007/11/26 22:45:27 miod Exp $ */ /* $NetBSD: pckbc.c,v 1.5 2000/06/09 04:58:35 soda Exp $ */ /* @@ -359,6 +359,12 @@ pckbc_attach(sc) } bus_space_write_1(iot, ioh_d, 0, 0x5a); /* a random value */ res = pckbc_poll_data1(iot, ioh_d, ioh_c, PCKBC_AUX_SLOT, 1); +#if 0 + /* + * The following code is necessary to find the aux port on the + * oqo-1 machine. However if confuses old (non-ps/2) keyboard + * controllers. + */ if (res == -1) { /* Read of aux echo timed out, try again */ if (!pckbc_send_cmd(iot, ioh_c, KBC_AUXWRITE)) @@ -371,6 +377,7 @@ pckbc_attach(sc) printf("kbc: aux echo: %x\n", res); #endif } +#endif if (res != -1) { /* * In most cases, the 0x5a gets echoed. |