[PATCH 2/2] HID: ntrig mapping more firmware id bits

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Rafi Rubin <rafi@xxxxxxxxxxxxxx>
---
Two new firmwares supply hints to map three more bits of the raw
firmware id code.

Confirmation, and perhaps the rest of the mapping from someone with both
the knowledge and legal rights would be appreciated.  Not that I mind
the pleasure of the puzzle being filled in slowly over time.
---
 drivers/hid/hid-ntrig.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c
index 616f091..3ce4624 100644
--- a/drivers/hid/hid-ntrig.c
+++ b/drivers/hid/hid-ntrig.c
@@ -96,15 +96,15 @@ struct ntrig_data {
  */
 static int ntrig_version_string(unsigned char *raw, char *buf)
 {
-	__u8 a =  (raw[1] & 0x0e) >> 1;
+	__u8 a =  (raw[1] & 0x1e) >> 1;
 	__u8 b =  (raw[0] & 0x3c) >> 2;
 	__u8 c = ((raw[0] & 0x03) << 3) | ((raw[3] & 0xe0) >> 5);
 	__u8 d = ((raw[3] & 0x07) << 3) | ((raw[2] & 0xe0) >> 5);
-	__u8 e =   raw[2] & 0x07;
+	__u8 e =   raw[2] & 0x1f;
 
 	/*
 	 * As yet unmapped bits:
-	 * 0b11000000 0b11110001 0b00011000 0b00011000
+	 * 0b11000000 0b11100001 0b00000000 0b00011000
 	 */
 
 	return sprintf(buf, "%u.%u.%u.%u.%u", a, b, c, d, e);
-- 
1.7.2.3

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Media Devel]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Linux Wireless Networking]     [Linux Omap]

  Powered by Linux