HID: fix broken Logitech S510 keyboard report descriptor; make extra keys work

This patch makes extra keys (F1-F12 in special mode, zooming, rotate, shuffle)
on Logitech S510 keyboard work.

Logitech S510 keyboard sends in report no. 3 keys which are far above the
logical maximum described in descriptor for given report.

This patch introduces a HID quirk for this wireless USB receiver/keyboard
in order to fix the report descriptor before it's being parsed - the logical
maximum and the number of usages is bumped up to 0x104d). The values are in the
"Reserved" area of consumer HUT, so HID_MAX_USAGE had to be changed too.

In addition to proper extracting of  the values from report descriptor, proper
HID-input mapping is introduced for them.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>

1 files changed, 21 insertions, 1 deletions

diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 25d180a24fc4..eeba66513997 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -2,7 +2,7 @@
  * $Id: hid-input.c,v 1.2 2002/04/23 00:59:25 rdamazio Exp $
  *
  *  Copyright (c) 2000-2001 Vojtech Pavlik
- *  Copyright (c) 2006 Jiri Kosina
+ *  Copyright (c) 2006-2007 Jiri Kosina
  *
  *  HID to Linux Input mapping
  */
@@ -532,6 +532,26 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                 case 0x302: map_key_clear(KEY_PROG2);           break;
                                 case 0x303: map_key_clear(KEY_PROG3);           break;
 
+                                /* Reported on Logitech S510 wireless keyboard */
+                                case 0x101f: map_key_clear(KEY_ZOOMIN);         break;
+                                case 0x1020: map_key_clear(KEY_ZOOMOUT);        break;
+                                case 0x1021: map_key_clear(KEY_ZOOMRESET);      break;
+                                /* this one is marked as 'Rotate' */
+                                case 0x1028: map_key_clear(KEY_ANGLE);          break;
+                                case 0x1029: map_key_clear(KEY_SHUFFLE);        break;
+                                case 0x1041: map_key_clear(KEY_BATTERY);        break;
+                                case 0x1042: map_key_clear(KEY_WORDPROCESSOR);  break;
+                                case 0x1043: map_key_clear(KEY_SPREADSHEET);    break;
+                                case 0x1044: map_key_clear(KEY_PRESENTATION);   break;
+                                case 0x1045: map_key_clear(KEY_UNDO);           break;
+                                case 0x1046: map_key_clear(KEY_REDO);           break;
+                                case 0x1047: map_key_clear(KEY_PRINT);          break;
+                                case 0x1048: map_key_clear(KEY_SAVE);           break;
+                                case 0x1049: map_key_clear(KEY_PROG1);          break;
+                                case 0x104a: map_key_clear(KEY_PROG2);          break;
+                                case 0x104b: map_key_clear(KEY_PROG3);          break;
+                                case 0x104c: map_key_clear(KEY_PROG4);          break;
+
                                 default:    goto ignore;
                         }
                         break;