cvs commit: src/sys/dev/usb ums.c

[Alexander Leidinger]

On Thu, 29 Dec 2005 11:26:21 -0800
Nate Lawson <nate at root.org> wrote:

> > Index: src/sys/dev/usb/ums.c
> > diff -u src/sys/dev/usb/ums.c:1.79 src/sys/dev/usb/ums.c:1.80
> > --- src/sys/dev/usb/ums.c:1.79	Thu Dec 29 17:44:40 2005
> > +++ src/sys/dev/usb/ums.c	Thu Dec 29 18:35:28 2005
> > @@ -425,7 +425,7 @@
> >  	struct ums_softc *sc = addr;
> >  	u_char *ibuf;
> >  	int dx, dy, dz, dt;
> > -	u_char buttons = 0;
> > +	int buttons = 0;
> >  	int i;
> >  
> >  #define UMS_BUT(i) ((i) < 3 ? (((i) + 2) % 3) : (i))
> 
> I think the UMS_BUT macro operates on only 2 bits.  Are you sure that's 
> still right?

The UMS_BUT macro in NetBSD is different, but I don't know if this is
because of the uhidevs changes (which we don't have) or not. The change
in NetBSD only changed the MAX_BUTTONS define, not the UMS_BUT macro.

I also don't see where it only operates on 2 bits (BTW.: MAX_BUTTONS was
changed from decimal 7 to decimal 31)... if I rewrite it as a function
it looks like:
	int ums_but(int i) {
		if (i < 3) {
			return (i + 2) % 3;
		} else {
			return i;
		}
	}
Or did I miscounted the parenthesis?

Bye,
Alexander.

-- 
            Give a man a fish and you feed him for a day;
     teach him to use the Net and he won't bother you for weeks.

http://www.Leidinger.net                       Alexander @ Leidinger.net
  GPG fingerprint = C518 BC70 E67F 143F BE91  3365 79E2 9C60 B006 3FE7