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

Commit 3975bc56 authored by Robert Schedel's avatar Robert Schedel Committed by Jiri Kosina
Browse files

HID: Support 171 byte variant of Samsung USB IR receiver 

Extends the existing Samsung USB IrDA (0419:0001) quirk with newly reported 171
byte variant. It needs the same quirk as the other devices already supported
by hid-samsung (wrong logical range)

Refactors duplicate trace call into local helper function.

The original bug report for the new variant is available at the second half of
this ticket page:

  https://bugs.launchpad.net/bugs/326986



Signed-off-by: default avatarRobert Schedel <r.schedel@yahoo.de>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 70c66567

drivers/hid/hid-samsung.c

+19 −6
Original line number Original line Diff line number Diff line
@@ -39,7 +39,17 @@ 
 *

 *

 * 3. 135 byte report descriptor

 * 3. 135 byte report descriptor

 * Report #4 has an array field with logical range 0..17 instead of 1..14.

 * Report #4 has an array field with logical range 0..17 instead of 1..14.

 *

 * 4. 171 byte report descriptor

 * Report #3 has an array field with logical range 0..1 instead of 1..3.

 */

 */

static inline void samsung_dev_trace(struct hid_device *hdev,

		unsigned int rsize)

{

	dev_info(&hdev->dev, "fixing up Samsung IrDA %d byte report "

			"descriptor\n", rsize);

}



static void samsung_report_fixup(struct hid_device *hdev, __u8 *rdesc,

static void samsung_report_fixup(struct hid_device *hdev, __u8 *rdesc,

		unsigned int rsize)

		unsigned int rsize)

{

{
@@ -47,8 +57,7 @@ static void samsung_report_fixup(struct hid_device *hdev, __u8 *rdesc, 
			rdesc[177] == 0x75 && rdesc[178] == 0x30 &&

			rdesc[177] == 0x75 && rdesc[178] == 0x30 &&

			rdesc[179] == 0x95 && rdesc[180] == 0x01 &&

			rdesc[179] == 0x95 && rdesc[180] == 0x01 &&

			rdesc[182] == 0x40) {

			rdesc[182] == 0x40) {

		dev_info(&hdev->dev, "fixing up Samsung IrDA %d byte report "

		samsung_dev_trace(hdev, 184);

				"descriptor\n", 184);

		rdesc[176] = 0xff;

		rdesc[176] = 0xff;

		rdesc[178] = 0x08;

		rdesc[178] = 0x08;

		rdesc[180] = 0x06;

		rdesc[180] = 0x06;
@@ -56,17 +65,21 @@ static void samsung_report_fixup(struct hid_device *hdev, __u8 *rdesc, 
	} else

	} else

	if (rsize == 203 && rdesc[192] == 0x15 && rdesc[193] == 0x0 &&

	if (rsize == 203 && rdesc[192] == 0x15 && rdesc[193] == 0x0 &&

			rdesc[194] == 0x25 && rdesc[195] == 0x12) {

			rdesc[194] == 0x25 && rdesc[195] == 0x12) {

		dev_info(&hdev->dev, "fixing up Samsung IrDA %d byte report "

		samsung_dev_trace(hdev, 203);

				"descriptor\n", 203);

		rdesc[193] = 0x1;

		rdesc[193] = 0x1;

		rdesc[195] = 0xf;

		rdesc[195] = 0xf;

	} else

	} else

	if (rsize == 135 && rdesc[124] == 0x15 && rdesc[125] == 0x0 &&

	if (rsize == 135 && rdesc[124] == 0x15 && rdesc[125] == 0x0 &&

			rdesc[126] == 0x25 && rdesc[127] == 0x11) {

			rdesc[126] == 0x25 && rdesc[127] == 0x11) {

		dev_info(&hdev->dev, "fixing up Samsung IrDA %d byte report "

		samsung_dev_trace(hdev, 135);

				"descriptor\n", 135);

		rdesc[125] = 0x1;

		rdesc[125] = 0x1;

		rdesc[127] = 0xe;

		rdesc[127] = 0xe;

	} else

	if (rsize == 171 && rdesc[160] == 0x15 && rdesc[161] == 0x0 &&

			rdesc[162] == 0x25 && rdesc[163] == 0x01) {

		samsung_dev_trace(hdev, 171);

		rdesc[161] = 0x1;

		rdesc[163] = 0x3;

	}

	}

}

}