From patchwork Mon Nov 15 18:50:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mariusz Bialonczyk X-Patchwork-Id: 7850 Return-path: Envelope-to: mchehab@pedra Delivery-date: Tue, 16 Nov 2010 09:55:35 -0200 Received: from mchehab by pedra with local (Exim 4.72) (envelope-from ) id 1PIK8M-000221-Qn for mchehab@pedra; Tue, 16 Nov 2010 09:55:35 -0200 Received: from casper.infradead.org [85.118.1.10] by pedra with IMAP (fetchmail-6.3.17) for (single-drop); Tue, 16 Nov 2010 09:55:34 -0200 (BRST) Received: from vger.kernel.org ([209.132.180.67]) by casper.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1PI48I-0004sW-MB; Mon, 15 Nov 2010 18:50:27 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932510Ab0KOSuY (ORCPT + 1 other); Mon, 15 Nov 2010 13:50:24 -0500 Received: from skyboo.net ([82.160.187.4]:34871 "EHLO skyboo.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1754950Ab0KOSuX (ORCPT ); Mon, 15 Nov 2010 13:50:23 -0500 Received: from [2001:470:1f0b:1af:f000::2] by skyboo.net with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1PI489-000341-CX; Mon, 15 Nov 2010 19:50:22 +0100 Message-ID: <4CE180E5.4090506@skyboo.net> Date: Mon, 15 Nov 2010 19:50:13 +0100 From: =?UTF-8?B?TWFyaXVzeiBCaWHFgm/FhGN6eWs=?= User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.15) Gecko/20101030 Icedove/3.0.10 MIME-Version: 1.0 To: Mauro Carvalho Chehab CC: linux-media@vger.kernel.org References: <4CC7D4C5.6000104@skyboo.net> <4CC85C0B.3010106@skyboo.net> <20101027170709.GA926@hardeman.nu> <4CC86734.1080003@skyboo.net> <20101027204837.GA2906@hardeman.nu> <4CC90A13.4070709@skyboo.net> <4CC9A45A.1000004@skyboo.net> <4CD30DFB.7030304@skyboo.net> <20101104194412.GB9107@hardeman.nu> <4CDD0C1A.7060707@skyboo.net> In-Reply-To: <4CDD0C1A.7060707@skyboo.net> X-SA-Exim-Connect-IP: 2001:470:1f0b:1af:f000::2 X-SA-Exim-Mail-From: manio@skyboo.net X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on draco.skyboo.net X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable version=3.3.1 Subject: [PATH] Fix rc-tbs-nec table after converting the cx88 driver to ir-core X-SA-Exim-Version: 4.2.1 (built Mon, 22 Mar 2010 06:26:47 +0000) X-SA-Exim-Scanned: Yes (on skyboo.net) Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Sender: The patch fixes the rc-tbs-nec table after converting drivers/media/video/cx88 to ir-core (commit ba7e90c9f878e0ac3c0614a5446fe5c62ccc33ec). It is also adds two missing buttons (10- and 10+) with its definition (KEY_10CHANNELSUP and KEY_10CHANNELSDOWN). Signed-off-by: Mariusz Bia?o?czyk --- drivers/media/rc/keymaps/rc-tbs-nec.c | 66 +++++++++++++++++---------------- include/linux/input.h | 2 + 2 files changed, 36 insertions(+), 32 deletions(-) diff --git a/drivers/media/rc/keymaps/rc-tbs-nec.c b/drivers/media/rc/keymaps/rc-tbs-nec.c index 3309631..9a1d9a3 100644 --- a/drivers/media/rc/keymaps/rc-tbs-nec.c +++ b/drivers/media/rc/keymaps/rc-tbs-nec.c @@ -13,38 +13,40 @@ #include static struct ir_scancode tbs_nec[] = { - { 0x04, KEY_POWER2}, /*power*/ - { 0x14, KEY_MUTE}, /*mute*/ - { 0x07, KEY_1}, - { 0x06, KEY_2}, - { 0x05, KEY_3}, - { 0x0b, KEY_4}, - { 0x0a, KEY_5}, - { 0x09, KEY_6}, - { 0x0f, KEY_7}, - { 0x0e, KEY_8}, - { 0x0d, KEY_9}, - { 0x12, KEY_0}, - { 0x16, KEY_CHANNELUP}, /*ch+*/ - { 0x11, KEY_CHANNELDOWN},/*ch-*/ - { 0x13, KEY_VOLUMEUP}, /*vol+*/ - { 0x0c, KEY_VOLUMEDOWN},/*vol-*/ - { 0x03, KEY_RECORD}, /*rec*/ - { 0x18, KEY_PAUSE}, /*pause*/ - { 0x19, KEY_OK}, /*ok*/ - { 0x1a, KEY_CAMERA}, /* snapshot */ - { 0x01, KEY_UP}, - { 0x10, KEY_LEFT}, - { 0x02, KEY_RIGHT}, - { 0x08, KEY_DOWN}, - { 0x15, KEY_FAVORITES}, - { 0x17, KEY_SUBTITLE}, - { 0x1d, KEY_ZOOM}, - { 0x1f, KEY_EXIT}, - { 0x1e, KEY_MENU}, - { 0x1c, KEY_EPG}, - { 0x00, KEY_PREVIOUS}, - { 0x1b, KEY_MODE}, + { 0x84, KEY_POWER2}, /* power */ + { 0x94, KEY_MUTE}, /* mute */ + { 0x87, KEY_1}, + { 0x86, KEY_2}, + { 0x85, KEY_3}, + { 0x8b, KEY_4}, + { 0x8a, KEY_5}, + { 0x89, KEY_6}, + { 0x8f, KEY_7}, + { 0x8e, KEY_8}, + { 0x8d, KEY_9}, + { 0x92, KEY_0}, + { 0xc0, KEY_10CHANNELSUP}, /* 10+ */ + { 0xd0, KEY_10CHANNELSDOWN}, /* 10- */ + { 0x96, KEY_CHANNELUP}, /* ch+ */ + { 0x91, KEY_CHANNELDOWN}, /* ch- */ + { 0x93, KEY_VOLUMEUP}, /* vol+ */ + { 0x8c, KEY_VOLUMEDOWN}, /* vol- */ + { 0x83, KEY_RECORD}, /* rec */ + { 0x98, KEY_PAUSE}, /* pause, yellow */ + { 0x99, KEY_OK}, /* ok */ + { 0x9a, KEY_CAMERA}, /* snapshot */ + { 0x81, KEY_UP}, + { 0x90, KEY_LEFT}, + { 0x82, KEY_RIGHT}, + { 0x88, KEY_DOWN}, + { 0x95, KEY_FAVORITES}, /* blue */ + { 0x97, KEY_SUBTITLE}, /* green */ + { 0x9d, KEY_ZOOM}, + { 0x9f, KEY_EXIT}, + { 0x9e, KEY_MENU}, + { 0x9c, KEY_EPG}, + { 0x80, KEY_PREVIOUS}, /* red */ + { 0x9b, KEY_MODE}, }; static struct rc_keymap tbs_nec_map = { diff --git a/include/linux/input.h b/include/linux/input.h index 51af441..711c1307 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -623,6 +623,8 @@ struct input_keymap_entry { #define KEY_CAMERA_FOCUS 0x210 #define KEY_WPS_BUTTON 0x211 /* WiFi Protected Setup key */ +#define KEY_10CHANNELSUP 0x212 /* 10 channels up (10+) */ +#define KEY_10CHANNELSDOWN 0x213 /* 10 channels down (10-) */ #define BTN_TRIGGER_HAPPY 0x2c0 #define BTN_TRIGGER_HAPPY1 0x2c0