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

Commit ab94e562 authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Jiri Kosina
Browse files

HID: logitech: move dj devices to the HID++ module 



Devices connected through the Logitech Wireless Receiver are HID++ devices.
We can handle them here to benefit from this new module and activate
enhaced support of the various wireless touchpad or mice with touch
sensors on them.

Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Tested-by: default avatarAndrew de los Reyes <adlr@chromium.org>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 2f31c525

drivers/hid/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ config HID_LOGITECH_DJ 
	tristate "Logitech Unifying receivers full support"

	depends on HIDRAW

	depends on HID_LOGITECH

	select HID_LOGITECH_HIDPP

	---help---

	Say Y if you want support for Logitech Unifying receivers and devices.

	Unifying receivers are capable of pairing up to 6 Logitech compliant

drivers/hid/hid-logitech-dj.c

+1 −41
Original line number Diff line number Diff line
@@ -977,48 +977,8 @@ static struct hid_driver logi_djreceiver_driver = { 
#endif

};



module_hid_driver(logi_djreceiver_driver);



static const struct hid_device_id logi_dj_devices[] = {

	{ HID_DEVICE(BUS_USB, HID_GROUP_LOGITECH_DJ_DEVICE,

		USB_VENDOR_ID_LOGITECH, HID_ANY_ID)},

	{}

};



static struct hid_driver logi_djdevice_driver = {

	.name = "logitech-djdevice",

	.id_table = logi_dj_devices,

};





static int __init logi_dj_init(void)

{

	int retval;



	dbg_hid("Logitech-DJ:%s\n", __func__);



	retval = hid_register_driver(&logi_djreceiver_driver);

	if (retval)

		return retval;



	retval = hid_register_driver(&logi_djdevice_driver);

	if (retval)

		hid_unregister_driver(&logi_djreceiver_driver);



	return retval;



}



static void __exit logi_dj_exit(void)

{

	dbg_hid("Logitech-DJ:%s\n", __func__);



	hid_unregister_driver(&logi_djdevice_driver);

	hid_unregister_driver(&logi_djreceiver_driver);



}



module_init(logi_dj_init);

module_exit(logi_dj_exit);

MODULE_LICENSE("GPL");

MODULE_AUTHOR("Logitech");

MODULE_AUTHOR("Nestor Lopez Casado");

drivers/hid/hid-logitech-hidpp.c

+13 −8
Original line number Diff line number Diff line
@@ -777,6 +777,7 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id) 
	hid_device_io_start(hdev);



	connected = hidpp_is_connected(hidpp);

	if (id->group != HID_GROUP_LOGITECH_DJ_DEVICE) {

		if (!connected) {

			hid_err(hdev, "Device not connected");

			goto hid_parse_fail;
@@ -786,6 +787,7 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id) 
		hid_info(hdev, "HID++ %u.%u device connected.\n",

			 hidpp->protocol_major, hidpp->protocol_minor);

		hidpp_overwrite_name(hdev);

	}



	if (hidpp->quirks & HIDPP_QUIRK_CLASS_WTP) {

		ret = wtp_get_config(hidpp);
@@ -824,6 +826,9 @@ static const struct hid_device_id hidpp_devices[] = { 
	  HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH,

		USB_DEVICE_ID_LOGITECH_T651),

	  .driver_data = HIDPP_QUIRK_CLASS_WTP },



	{ HID_DEVICE(BUS_USB, HID_GROUP_LOGITECH_DJ_DEVICE,

		USB_VENDOR_ID_LOGITECH, HID_ANY_ID)},

	{}

};