Thread (15 messages) 15 messages, 4 authors, 2011-03-14

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

flat view
STALE5694d

From: Rafi Rubin <hidden>
Date: 2011-02-25 05:38:44
Also in: lkml
Subsystem: hid core layer, the rest · Maintainers: Jiri Kosina, Benjamin Tissoires, Linus Torvalds

Signed-off-by: Rafi Rubin <redacted>
---
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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help