diff options
| author | yokota <yokota@FreeBSD.org> | 1999-08-22 06:11:52 +0000 |
|---|---|---|
| committer | yokota <yokota@FreeBSD.org> | 1999-08-22 06:11:52 +0000 |
| commit | 32c895f1be06b0bcd40d479d469108edc747c1b5 (patch) | |
| tree | 83847d3356e32e35b6df93e82df46451d6cf89e2 /sys | |
| parent | 8a60c0ef2b678ff880d7574bfdea99371e4e0672 (diff) | |
| download | FreeBSD-src-32c895f1be06b0bcd40d479d469108edc747c1b5.zip FreeBSD-src-32c895f1be06b0bcd40d479d469108edc747c1b5.tar.gz | |
Improve the detection code for GlidePoint. This is still a kludge,
but better than before...
PR: kern/13215
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/atkbdc/psm.c | 6 | ||||
| -rw-r--r-- | sys/isa/psm.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c index fa5ba72..bdc39dc 100644 --- a/sys/dev/atkbdc/psm.c +++ b/sys/dev/atkbdc/psm.c @@ -20,7 +20,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: psm.c,v 1.14 1999/07/12 15:16:04 yokota Exp $ + * $Id: psm.c,v 1.15 1999/08/17 12:14:13 yokota Exp $ */ /* @@ -2209,9 +2209,11 @@ enable_aglide(struct psm_softc *sc) * NOTE: ALPS produces several models of GlidePoint. Some of those * do not respond to this sequence, thus, cannot be detected this way. */ + if (set_mouse_sampling_rate(sc->kbdc, 100) != 100) + return FALSE; if (!mouse_id_proc1(sc->kbdc, PSMD_RES_LOW, 2, status)) return FALSE; - if ((status[0] & 0x10) || (status[1] == PSMD_RES_LOW)) + if ((status[1] == PSMD_RES_LOW) || (status[2] == 100)) return FALSE; return TRUE; } diff --git a/sys/isa/psm.c b/sys/isa/psm.c index fa5ba72..bdc39dc 100644 --- a/sys/isa/psm.c +++ b/sys/isa/psm.c @@ -20,7 +20,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: psm.c,v 1.14 1999/07/12 15:16:04 yokota Exp $ + * $Id: psm.c,v 1.15 1999/08/17 12:14:13 yokota Exp $ */ /* @@ -2209,9 +2209,11 @@ enable_aglide(struct psm_softc *sc) * NOTE: ALPS produces several models of GlidePoint. Some of those * do not respond to this sequence, thus, cannot be detected this way. */ + if (set_mouse_sampling_rate(sc->kbdc, 100) != 100) + return FALSE; if (!mouse_id_proc1(sc->kbdc, PSMD_RES_LOW, 2, status)) return FALSE; - if ((status[0] & 0x10) || (status[1] == PSMD_RES_LOW)) + if ((status[1] == PSMD_RES_LOW) || (status[2] == 100)) return FALSE; return TRUE; } |
