Patch from Takashi NAKAMURA <QZM00427@nifty.ne.jp> to support the

Contour 3-button mouse from the Contour Design Corp.
It looks like a Microspeed mouse.
This commit is contained in:
briggs 1998-08-11 20:07:59 +00:00
parent f3dd6e430b
commit b3e5811a08
3 changed files with 16 additions and 10 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: adb.c,v 1.23 1998/04/13 02:36:24 scottr Exp $ */
/* $NetBSD: adb.c,v 1.24 1998/08/11 20:07:59 briggs Exp $ */
/*-
* Copyright (C) 1994 Bradley A. Grantham
@ -371,7 +371,8 @@ adb_processevent(event)
button_bit = 1;
switch (event->hand_id) {
case ADBMS_USPEED:
/* MicroSpeed mouse */
case ADBMS_UCONTOUR:
/* MicroSpeed mouse and Contour Mouse */
if (max_byte == 4)
buttons = (~event->bytes[2]) & 0xff;
else

View File

@ -1,4 +1,4 @@
/* $NetBSD: adbsys.c,v 1.38 1998/05/28 02:11:32 scottr Exp $ */
/* $NetBSD: adbsys.c,v 1.39 1998/08/11 20:08:00 briggs Exp $ */
/*-
* Copyright (C) 1994 Bradley A. Grantham
@ -225,14 +225,15 @@ extdms_init(totaladbs)
/* Get the ADB information */
adbaddr = GetIndADB(&adbdata, adbindex);
if (adbdata.origADBAddr == ADBADDR_MS &&
(adbdata.devType == ADBMS_USPEED)) {
/* Found MicroSpeed Mouse Deluxe Mac */
(adbdata.devType == ADBMS_USPEED ||
adbdata.devType == ADBMS_UCONTOUR)) {
/* Found MicroSpeed Mouse Deluxe Mac or Contour Mouse */
cmd = ((adbaddr<<4)&0xF0)|0x9; /* listen 1 */
/*
* To setup the MicroSpeed, it appears that we can
* send the following command to the mouse and then
* expect data back in the form:
* To setup the MicroSpeed or the Contour, it appears
* that we can send the following command to the mouse
* and then expect data back in the form:
* buffer[0] = 4 (bytes)
* buffer[1], buffer[2] as std. mouse
* buffer[3] = buffer[4] = 0xff when no buttons
@ -525,6 +526,9 @@ adb_init()
case ADBMS_USPEED:
printf("MicroSpeed mouse, default parameters");
break;
case ADBMS_UCONTOUR:
printf("Contour mouse, default parameters");
break;
case ADBMS_EXTENDED:
extdms_done = 0;
/* talk register 1 */

View File

@ -1,4 +1,4 @@
/* $NetBSD: adbsys.h,v 1.10 1997/11/05 08:22:11 ender Exp $ */
/* $NetBSD: adbsys.h,v 1.11 1998/08/11 20:07:59 briggs Exp $ */
/*-
* Copyright (C) 1993, 1994 Allen K. Briggs, Chris P. Caputo,
@ -122,7 +122,8 @@ typedef struct adb_dev_s{
#define ADBMS_200DPI 2
#define ADBMS_MSA3 3 /* Mouse Systems A3 Mouse */
#define ADBMS_EXTENDED 4 /* Extended mouse protocol */
#define ADBMS_USPEED 47 /* MicroSpeed mouse */
#define ADBMS_USPEED 0x2f /* MicroSpeed mouse */
#define ADBMS_UCONTOUR 0x66 /* Contour mouse */
/* Interesting tablet handler ID */
#define ADB_ARTPAD 58 /* WACOM ArtPad II tablet */