Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a69616d5 authored by Benjamin Tissoires's avatar Benjamin Tissoires
Browse files

Revert "HID: logitech: Use LDJ_DEVICE macro for existing Logitech mice" 



This reverts commit 3fe1d6bb.

It turns out the current API is not that compatible with
some Microsoft mice, so better start again from scratch.

Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Acked-by: default avatarHarry Cutts <hcutts@chromium.org>
Acked-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: default avatarJiri Kosina <jkosina@suse.cz>
parent d0341efe

drivers/hid/hid-logitech-hidpp.c

+10 −5
Original line number Diff line number Diff line
@@ -3314,11 +3314,13 @@ static void hidpp_remove(struct hid_device *hdev) 


static const struct hid_device_id hidpp_devices[] = {

	{ /* wireless touchpad */

	  LDJ_DEVICE(0x4011),

	  HID_DEVICE(BUS_USB, HID_GROUP_LOGITECH_DJ_DEVICE,

		USB_VENDOR_ID_LOGITECH, 0x4011),

	  .driver_data = HIDPP_QUIRK_CLASS_WTP | HIDPP_QUIRK_DELAYED_INIT |

			 HIDPP_QUIRK_WTP_PHYSICAL_BUTTONS },

	{ /* wireless touchpad T650 */

	  LDJ_DEVICE(0x4101),

	  HID_DEVICE(BUS_USB, HID_GROUP_LOGITECH_DJ_DEVICE,

		USB_VENDOR_ID_LOGITECH, 0x4101),

	  .driver_data = HIDPP_QUIRK_CLASS_WTP | HIDPP_QUIRK_DELAYED_INIT },

	{ /* wireless touchpad T651 */

	  HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH,
@@ -3358,13 +3360,16 @@ static const struct hid_device_id hidpp_devices[] = { 
	{ /* Mouse Logitech Performance MX */

	  LDJ_DEVICE(0x101a), .driver_data = HIDPP_QUIRK_HI_RES_SCROLL_1P0 },

	{ /* Keyboard logitech K400 */

	  LDJ_DEVICE(0x4024),

	  HID_DEVICE(BUS_USB, HID_GROUP_LOGITECH_DJ_DEVICE,

		USB_VENDOR_ID_LOGITECH, 0x4024),

	  .driver_data = HIDPP_QUIRK_CLASS_K400 },

	{ /* Solar Keyboard Logitech K750 */

	  LDJ_DEVICE(0x4002),

	  HID_DEVICE(BUS_USB, HID_GROUP_LOGITECH_DJ_DEVICE,

		USB_VENDOR_ID_LOGITECH, 0x4002),

	  .driver_data = HIDPP_QUIRK_CLASS_K750 },



	{ LDJ_DEVICE(HID_ANY_ID) },

	{ HID_DEVICE(BUS_USB, HID_GROUP_LOGITECH_DJ_DEVICE,

		USB_VENDOR_ID_LOGITECH, HID_ANY_ID)},



	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G920_WHEEL),

		.driver_data = HIDPP_QUIRK_CLASS_G920 | HIDPP_QUIRK_FORCE_OUTPUT_REPORTS},