From nobody Sat Dec 24 09:02:16 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NfJ2w6Nssz1HXC7; Sat, 24 Dec 2022 09:02:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NfJ2w5z0qz3lnG; Sat, 24 Dec 2022 09:02:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671872536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wg4JVAsXdie1GArCCQ9bfVBPk7AgZiSmdb1twDQZAA4=; b=qcEI2tKasXyw9ChEXWBG18HNRp6GrZQTREq+QIS55d243vC8MB2SfZ/6XAT1Q+HIQP0O3n oB7fXXoXec9Xz7Yl5WVEgeY1MpFtiiSyNQDcUHHjHOLGmqyuhB+odWk3GXlxWTjtRyJZJ0 G45a29EZiskLXgOGfb12lx0bxp0s880peT0UuuKxN0jyqQDQtHLRT1szKj4vJznISzLTy1 UlAS1UCOeFnqwvB/v/F+nFhrv9iriuLjnzQXOd+DdALXCcThYz1gnqwW/A1rRpy4hiOwq/ LSYyVyzGO0DHlf/HJ9SQdfBGFEfCvB1cYQmzLgt4htv0gu1QFp2OrxX03STXIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671872536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wg4JVAsXdie1GArCCQ9bfVBPk7AgZiSmdb1twDQZAA4=; b=gdkASkptkQQAzc/0dhY1eOQrZEOOxH12Rbp9N7sB60MdmzJr8ADKf331oLM+WtGOPVhOko sJpzzDl0vly1QvBBB6yewtuTU3Z5ujK/X2w0u2LmWZHsHvsfYEo+5owUjb1bbaf34FocCw q5fp1go1VI75kl/BCrTfkuIEBDZUr5GT7zT8G6NweNyLsEB0r9BthO3HLCT0UDwnBca9Wm 8PTwqR3w3X5vnYK6g2ouICuDawWpxzlVzKK4/bzdspnz7i4HOvyj2z1W8/tRd3OEOMGNcy RCWF8RLhkeFgTgkn0W4f0t6ycNkT8AUrLh0p7CxK2akOlFw48WlJ1u2hoRD/8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671872536; a=rsa-sha256; cv=none; b=SIGk10xDWgKcorK4ZMgQ2c+/xUC1meLsUMHhI1AafloJm55auU1gvKHIarHsuatJ7U/V9q usC4eBa24Pv72DarJRyPNgwvDhUS3QvdlpwJX5IISnH6bzG+rszY8H5aBrc07QHkVUKtId qExsvYUJgeyJtjtpUHxa6EO/k4nSxkytjbrThiWzxwDt8Dd3YuPRdx6f+Yl7fyZ5VC2IST mQ7nvFx/HmE4aLRlbbu7bzLUxj8G2QP7+dH47cTy6hEIu/+zg1sNaYXcLGfyQj5J5OyxQI EnuTYfcQFCAkjwUbjq99dgqbdvSAeeQGhR2r7zOEbtAx1oEsMdHo9C2t9Mq3dQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NfJ2w51lQz171p; Sat, 24 Dec 2022 09:02:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BO92GjZ025991; Sat, 24 Dec 2022 09:02:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BO92G7i025990; Sat, 24 Dec 2022 09:02:16 GMT (envelope-from git) Date: Sat, 24 Dec 2022 09:02:16 GMT Message-Id: <202212240902.2BO92G7i025990@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: ab4f740bc59e - main - ums(4): Disable vendor usage page button support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ab4f740bc59e3ba2948bcc4e03bd6125b1dae36f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=ab4f740bc59e3ba2948bcc4e03bd6125b1dae36f commit ab4f740bc59e3ba2948bcc4e03bd6125b1dae36f Author: Vladimir Kondratyev AuthorDate: 2022-12-24 09:01:20 +0000 Commit: Vladimir Kondratyev CommitDate: 2022-12-24 09:01:20 +0000 ums(4): Disable vendor usage page button support for all devices except Kensington Slimblade Trackball as it brokes some other devices like Contour Rollermouse Red Add a quirk for it as well. Reported by: Atte Peltomäki PR: 267922 MFC after: 2 weeks --- share/man/man4/usb_quirk.4 | 2 ++ sys/dev/usb/input/ums.c | 18 ++++++++++++------ sys/dev/usb/quirk/usb_quirk.c | 3 +++ sys/dev/usb/quirk/usb_quirk.h | 1 + sys/dev/usb/usbdevs | 1 + 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/share/man/man4/usb_quirk.4 b/share/man/man4/usb_quirk.4 index 8751807f9dec..c176993bdbc3 100644 --- a/share/man/man4/usb_quirk.4 +++ b/share/man/man4/usb_quirk.4 @@ -78,6 +78,8 @@ does not identify properly mouse sends an unknown leading byte .It UQ_MS_REVZ mouse has Z-axis reversed +.It UQ_MS_VENDOR_BTN +mouse has buttons in vendor usage page .It UQ_NO_STRINGS string descriptors are broken .It UQ_POWER_CLAIM diff --git a/sys/dev/usb/input/ums.c b/sys/dev/usb/input/ums.c index 987c4b9d1309..2280cdc29e8d 100644 --- a/sys/dev/usb/input/ums.c +++ b/sys/dev/usb/input/ums.c @@ -122,6 +122,7 @@ struct ums_info { #define UMS_FLAG_SBU 0x0010 /* spurious button up events */ #define UMS_FLAG_REVZ 0x0020 /* Z-axis is reversed */ #define UMS_FLAG_W_AXIS 0x0040 +#define UMS_FLAG_VBTN 0x0080 /* Buttons in vendor usage page */ uint8_t sc_iid_w; uint8_t sc_iid_x; @@ -538,12 +539,13 @@ ums_hid_parse(struct ums_softc *sc, device_t dev, const uint8_t *buf, } /* detect other buttons */ - - for (j = 0; (i < UMS_BUTTON_MAX) && (j < 2); i++, j++) { - if (!hid_locate(buf, len, HID_USAGE2(HUP_MICROSOFT, (j + 1)), - hid_input, index, &info->sc_loc_btn[i], NULL, - &info->sc_iid_btn[i])) { - break; + if (info->sc_flags & UMS_FLAG_VBTN) { + for (j = 0; (i < UMS_BUTTON_MAX) && (j < 2); i++, j++) { + if (!hid_locate(buf, len, HID_USAGE2(HUP_MICROSOFT, + (j + 1)), hid_input, index, &info->sc_loc_btn[i], + NULL, &info->sc_iid_btn[i])) { + break; + } } } @@ -618,6 +620,10 @@ ums_attach(device_t dev) isize = hid_report_size_max(d_ptr, d_len, hid_input, &sc->sc_iid); + if (usb_test_quirk(uaa, UQ_MS_VENDOR_BTN)) + for (i = 0; i < UMS_INFO_MAX; i++) + sc->sc_info[i].sc_flags |= UMS_FLAG_VBTN; + /* * The Microsoft Wireless Notebook Optical Mouse seems to be in worse * shape than the Wireless Intellimouse 2.0, as its X, Y, wheel, and diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index 856cd3c006f9..68e4910202b0 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -175,6 +175,8 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { /* Quirk for Corsair STRAFE Gaming keyboard */ USB_QUIRK(CORSAIR, STRAFE, 0x0000, 0xffff, UQ_KBD_BOOTPROTO), USB_QUIRK(CORSAIR, STRAFE2, 0x0000, 0xffff, UQ_KBD_BOOTPROTO), + /* Quirk for Kensington Slimblade Trackball */ + USB_QUIRK(KENSINGTON, SLIMBLADE, 0x0000, 0xffff, UQ_MS_VENDOR_BTN), /* umodem(4) device quirks */ USB_QUIRK(METRICOM, RICOCHET_GS, 0x100, 0x100, UQ_ASSUME_CM_OVER_DATA), USB_QUIRK(SANYO, SCP4900, 0x000, 0x000, UQ_ASSUME_CM_OVER_DATA), @@ -649,6 +651,7 @@ static const char *usb_quirk_str[USB_QUIRK_MAX] = { [UQ_MS_BAD_CLASS] = "UQ_MS_BAD_CLASS", [UQ_MS_LEADING_BYTE] = "UQ_MS_LEADING_BYTE", [UQ_MS_REVZ] = "UQ_MS_REVZ", + [UQ_MS_VENDOR_BTN] = "UQ_MS_VENDOR_BTN", [UQ_NO_STRINGS] = "UQ_NO_STRINGS", [UQ_POWER_CLAIM] = "UQ_POWER_CLAIM", [UQ_SPUR_BUT_UP] = "UQ_SPUR_BUT_UP", diff --git a/sys/dev/usb/quirk/usb_quirk.h b/sys/dev/usb/quirk/usb_quirk.h index 9b3d0c81ce03..85bec036f84d 100644 --- a/sys/dev/usb/quirk/usb_quirk.h +++ b/sys/dev/usb/quirk/usb_quirk.h @@ -55,6 +55,7 @@ enum { UQ_MS_BAD_CLASS, /* doesn't identify properly */ UQ_MS_LEADING_BYTE, /* mouse sends an unknown leading byte */ UQ_MS_REVZ, /* mouse has Z-axis reversed */ + UQ_MS_VENDOR_BTN, /* mouse has buttons in vendor usage page */ UQ_NO_STRINGS, /* string descriptors are broken */ UQ_POWER_CLAIM, /* hub lies about power status */ UQ_SPUR_BUT_UP, /* spurious mouse button up events */ diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 70540fe6540b..4e2f46e5d77b 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -2710,6 +2710,7 @@ product KEISOKUGIKEN USBDAQ 0x0068 HKS-0200 USBDAQ /* Kensington products */ product KENSINGTON ORBIT 0x1003 Orbit USB/PS2 trackball product KENSINGTON TURBOBALL 0x1005 TurboBall +product KENSINGTON SLIMBLADE 0x2041 Slimblade Trackball /* Synaptics products */ product SYNAPTICS FPR9A 0x009a Fingerprint Reader