diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2013-12-29 18:31:51 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2013-12-29 18:31:51 +0000 |
| commit | 9d75e57fff3521b02c9cf1e4c588602473e86cd5 (patch) | |
| tree | 77adeb001826aff39a34db4290017ce5f2d1dcb3 /sys | |
| parent | 64391fd6ec8462250e279285d71e378ca4fa3e56 (diff) | |
Force clock clamping after one byte received instead of three. There are still
circumstances where the pckbc code gets confused otherwise, on *some*
controllers.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/sgi/dev/iockbc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/sgi/dev/iockbc.c b/sys/arch/sgi/dev/iockbc.c index 7d11ae08f55..4bbd8f6337e 100644 --- a/sys/arch/sgi/dev/iockbc.c +++ b/sys/arch/sgi/dev/iockbc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iockbc.c,v 1.9 2013/12/25 21:01:01 miod Exp $ */ +/* $OpenBSD: iockbc.c,v 1.10 2013/12/29 18:31:50 miod Exp $ */ /* * Copyright (c) 2013, Miodrag Vallat * Copyright (c) 2006, 2007, 2009 Joel Sing <jsing@openbsd.org> @@ -504,7 +504,7 @@ iockbc_attach_common(struct iockbc_softc *isc, bus_addr_t addr, int console, } else { /* * Setup up controller: do not force pull clock and data lines - * low, clamp clocks after three bytes received. + * low, clamp clocks after one byte received. */ cs = reginfo[PCKBC_KBD_SLOT].cs; csr = bus_space_read_4(isc->iot, isc->ioh, cs); @@ -512,8 +512,8 @@ iockbc_attach_common(struct iockbc_softc *isc, bus_addr_t addr, int console, IOC3_KBC_CTRL_KBD_PULL_CLOCK_LOW | IOC3_KBC_CTRL_AUX_PULL_DATA_LOW | IOC3_KBC_CTRL_AUX_PULL_CLOCK_LOW | - IOC3_KBC_CTRL_KBD_CLAMP_1 | IOC3_KBC_CTRL_AUX_CLAMP_1); - csr |= IOC3_KBC_CTRL_KBD_CLAMP_3 | IOC3_KBC_CTRL_AUX_CLAMP_3; + IOC3_KBC_CTRL_KBD_CLAMP_3 | IOC3_KBC_CTRL_AUX_CLAMP_3); + csr |= IOC3_KBC_CTRL_KBD_CLAMP_1 | IOC3_KBC_CTRL_AUX_CLAMP_1; bus_space_write_4(isc->iot, isc->ioh, cs, csr); /* Setup pckbc_internal structure. */ @@ -1186,15 +1186,15 @@ iockbc_cnattach() /* * Setup up controller: do not force pull clock and data lines - * low, clamp clocks after three bytes received. + * low, clamp clocks after one byte received. */ csr = bus_space_read_4(iot, ioh, reginfo->cs); csr &= ~(IOC3_KBC_CTRL_KBD_PULL_DATA_LOW | IOC3_KBC_CTRL_KBD_PULL_CLOCK_LOW | IOC3_KBC_CTRL_AUX_PULL_DATA_LOW | IOC3_KBC_CTRL_AUX_PULL_CLOCK_LOW | - IOC3_KBC_CTRL_KBD_CLAMP_1 | IOC3_KBC_CTRL_AUX_CLAMP_1); - csr |= IOC3_KBC_CTRL_KBD_CLAMP_3 | IOC3_KBC_CTRL_AUX_CLAMP_3; + IOC3_KBC_CTRL_KBD_CLAMP_3 | IOC3_KBC_CTRL_AUX_CLAMP_3); + csr |= IOC3_KBC_CTRL_KBD_CLAMP_1 | IOC3_KBC_CTRL_AUX_CLAMP_1; bus_space_write_4(iot, ioh, reginfo->cs, csr); /* Setup pckbc_internal structure. */ |