Attachment 238464 Details for Bug 267922 – hms_conditionalize_kensington_support.patch

[patch] hms_conditionalize_kensington_support.patch

hms_kensington.patch (text/plain), 2.42 KB, created by Vladimir Kondratyev on 2022-12-01 01:14:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Kondratyev

Created: 2022-12-01 01:14:12 UTC

Size: 2.42 KB

patch

obsolete

>diff --git a/sys/dev/hid/hms.c b/sys/dev/hid/hms.c
>index b1580c3db35..a4bf354b273 100644
>--- a/sys/dev/hid/hms.c
>+++ b/sys/dev/hid/hms.c
>@@ -50,6 +50,8 @@ __FBSDID("$FreeBSD$");
> #include <dev/hid/hidquirk.h>
> #include <dev/hid/hidrdesc.h>
> 
>+#include "usbdevs.h"
>+
> static const uint8_t hms_boot_desc[] = { HID_MOUSE_BOOTPROTO_DESCR() };
> 
> enum {
>@@ -61,8 +63,6 @@ enum {
> 	HMS_ABS_Z,
> 	HMS_HWHEEL,
> 	HMS_BTN,
>-	HMS_BTN_MS1,
>-	HMS_BTN_MS2,
> 	HMS_FINAL_CB,
> };
> 
>@@ -95,8 +95,6 @@ static const struct hidmap_item hms_map[] = {
> 	[HMS_ABS_Z]	= HMS_MAP_ABS(HUG_Z,		ABS_Z),
> 	[HMS_HWHEEL]	= HMS_MAP_REL_CN(HUC_AC_PAN,	REL_HWHEEL),
> 	[HMS_BTN]	= HMS_MAP_BUT_RG(1, 16,		BTN_MOUSE),
>-	[HMS_BTN_MS1]	= HMS_MAP_BUT_MS(1,		BTN_RIGHT),
>-	[HMS_BTN_MS2]	= HMS_MAP_BUT_MS(2,		BTN_MIDDLE),
> 	[HMS_FINAL_CB]	= HMS_FINAL_CB(hms_final_cb),
> };
> 
>@@ -107,6 +105,11 @@ static const struct hidmap_item hms_map_wheel_rev[] = {
> 	HMS_MAP_REL_REV(HUG_WHEEL,	REL_WHEEL),
> };
> 
>+static const struct hidmap_item hms_map_kensington_slimblade[] = {
>+	HMS_MAP_BUT_MS(1,	BTN_RIGHT),
>+	HMS_MAP_BUT_MS(2,	BTN_MIDDLE),
>+};
>+
> /* A match on these entries will load hms */
> static const struct hid_device_id hms_devs[] = {
> 	{ HID_TLC(HUP_GENERIC_DESKTOP, HUG_POINTER) },
>@@ -261,6 +264,10 @@ hms_attach(device_t dev)
> 	else
> 		HIDMAP_ADD_MAP(&sc->hm, hms_map_wheel, cap_wheel);
> 
>+	if (hw->idBus == BUS_USB && hw->idVendor == USB_VENDOR_KENSINGTON &&
>+	    hw->idProduct == USB_PRODUCT_KENSINGTON_SLIMBLADE)
>+		HIDMAP_ADD_MAP(&sc->hm, hms_map_kensington_slimblade, NULL);
>+
> #ifdef IICHID_SAMPLING
> 	if (hid_test_quirk(hw, HQ_IICHID_SAMPLING) &&
> 	    hidmap_test_cap(sc->caps, HMS_REL_X) &&
>diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
>index 70540fe6540..4e2f46e5d77 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
>diff --git a/sys/modules/hid/hms/Makefile b/sys/modules/hid/hms/Makefile
>index 29514b86385..0b2f5104885 100644
>--- a/sys/modules/hid/hms/Makefile
>+++ b/sys/modules/hid/hms/Makefile
>@@ -5,6 +5,6 @@
> KMOD=	hms
> SRCS=	hms.c
> SRCS+=	opt_hid.h
>-SRCS+=	bus_if.h device_if.h
>+SRCS+=	bus_if.h device_if.h usbdevs.h
> 
> .include <bsd.kmod.mk>

Actions: View | Diff

Attachments on bug 267922: 238462 | 238464 | 238469