summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornetchild <netchild@FreeBSD.org>2005-12-29 17:44:40 +0000
committernetchild <netchild@FreeBSD.org>2005-12-29 17:44:40 +0000
commit806b08f03cef437dd8aec629b447c036a08b459c (patch)
treedc9fc839c0fc36a4f680dab7f0d7e6e914c3718a
parent5d64a3828ebe84a4c8a85504ffdac3850fe2feb0 (diff)
downloadFreeBSD-src-806b08f03cef437dd8aec629b447c036a08b459c.zip
FreeBSD-src-806b08f03cef437dd8aec629b447c036a08b459c.tar.gz
Merge NetBSD rev. 1.61:
- Support more than 7 buttons for USB mice. Patch from NetBSD kern/30248. PR: 83353 Submitted by: Seán Farley <sean-freebsd@farley.org>
-rw-r--r--sys/dev/usb/ums.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index 1955aeb..8b2e516 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -117,7 +117,7 @@ struct ums_softc {
#define UMS_SPUR_BUT_UP 0x02 /* spurious button up events */
#define UMS_T 0x04 /* aa direction available (tilt) */
int nbuttons;
-#define MAX_BUTTONS 7 /* chosen because sc_buttons is u_char */
+#define MAX_BUTTONS 31 /* chosen because sc_buttons is int */
u_char qbuf[QUEUE_BUFSIZE]; /* must be divisable by 3&4 */
u_char dummy[100]; /* XXX just for safety and for now */
OpenPOWER on IntegriCloud