From patchwork Fri Apr 16 17:00:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Castelli X-Patchwork-Id: 93178 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3GH0btm019724 for ; Fri, 16 Apr 2010 17:00:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758640Ab0DPRAf (ORCPT ); Fri, 16 Apr 2010 13:00:35 -0400 Received: from ey-out-2122.google.com ([74.125.78.26]:47794 "EHLO ey-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758627Ab0DPRAe (ORCPT ); Fri, 16 Apr 2010 13:00:34 -0400 Received: by ey-out-2122.google.com with SMTP id d26so235264eyd.19 for ; Fri, 16 Apr 2010 10:00:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; bh=+35WjML15XINu0SYkiyxve6lhWqhugVpmBSv2TT/Bhg=; b=Fg4cwvi3LTAir2BHU0lR6VLU4GYTkUBq3LGAnkuhmF8wLUD9XlkJ5e/stLa5Lzb0Qd 2/f9X0wN7DY7r3vggsUDwRSNuFOMTrA+dTN7lUGHH1PjfTA8JNjo1G4wTIxv3fJweRD4 c65WPVnAoMN1y01c6TuPojoRVFd4/ekVgNwpQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; b=n49EhHLclsY4YNRQRk4oq9434wLECtTDvTVSEGureyUu04+HNh3rh9GUV7tL6kl2b4 RDdY+h73XQ4/Wlr5vld54XyekDVAWdh0lgJFad8MLjpD5/VbzMbLSb1ld5EA3pQHmeeD psbPY2TBS21cCwWYqSlMiLHt+fki5VvJ9UhTA= Received: by 10.213.40.201 with SMTP id l9mr945195ebe.28.1271437232879; Fri, 16 Apr 2010 10:00:32 -0700 (PDT) Received: from [192.168.1.3] (dhcp-077-251-249-194.chello.nl [77.251.249.194]) by mx.google.com with ESMTPS id 13sm1863138ewy.9.2010.04.16.10.00.32 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 16 Apr 2010 10:00:32 -0700 (PDT) Subject: [PATCH] hid: Add mappings for a few keys found on Logitech MX3200 From: Lorenzo Castelli To: Jiri Kosina , linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org Date: Fri, 16 Apr 2010 19:00:31 +0200 Message-ID: <1271437231.3040.26.camel@lorenzo-desktop> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 16 Apr 2010 17:00:37 +0000 (UTC) diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c index 3677c90..f6433d8 100644 --- a/drivers/hid/hid-lg.c +++ b/drivers/hid/hid-lg.c @@ -126,6 +126,9 @@ static int lg_wireless_mapping(struct hid_input *hi, struct hid_usage *usage, case 0x1004: lg_map_key_clear(KEY_VIDEO); break; case 0x1005: lg_map_key_clear(KEY_AUDIO); break; case 0x100a: lg_map_key_clear(KEY_DOCUMENTS); break; + /* The following two entries are Playlist 1 and 2 on the MX3200 */ + case 0x100f: lg_map_key_clear(KEY_FN_1); break; + case 0x1010: lg_map_key_clear(KEY_FN_2); break; case 0x1011: lg_map_key_clear(KEY_PREVIOUSSONG); break; case 0x1012: lg_map_key_clear(KEY_NEXTSONG); break; case 0x1013: lg_map_key_clear(KEY_CAMERA); break; @@ -137,6 +140,7 @@ static int lg_wireless_mapping(struct hid_input *hi, struct hid_usage *usage, case 0x1019: lg_map_key_clear(KEY_PROG1); break; case 0x101a: lg_map_key_clear(KEY_PROG2); break; case 0x101b: lg_map_key_clear(KEY_PROG3); break; + case 0x101c: lg_map_key_clear(KEY_CYCLEWINDOWS); break; case 0x101f: lg_map_key_clear(KEY_ZOOMIN); break; case 0x1020: lg_map_key_clear(KEY_ZOOMOUT); break; case 0x1021: lg_map_key_clear(KEY_ZOOMRESET); break; @@ -147,6 +151,11 @@ static int lg_wireless_mapping(struct hid_input *hi, struct hid_usage *usage, case 0x1029: lg_map_key_clear(KEY_SHUFFLE); break; case 0x102a: lg_map_key_clear(KEY_BACK); break; case 0x102b: lg_map_key_clear(KEY_CYCLEWINDOWS); break; + case 0x102d: lg_map_key_clear(KEY_WWW); break; + /* The following two are 'Start/answer call' and 'End/reject call' + on the MX3200 */ + case 0x1031: lg_map_key_clear(KEY_OK); break; + case 0x1032: lg_map_key_clear(KEY_CANCEL); break; case 0x1041: lg_map_key_clear(KEY_BATTERY); break; case 0x1042: lg_map_key_clear(KEY_WORDPROCESSOR); break; case 0x1043: lg_map_key_clear(KEY_SPREADSHEET); break;