Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 01:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] Fix rc-tbs-nec table after converting the cx88 driver to ir-core

Browse Source 
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).

[mchehab@redhat.com: move keycode numbers to 0x1b8/0x1b9 as requested by the input Maintainer]
Signed-off-by: Mariusz Białończyk <manio@skyboo.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mariusz Białończyk 2010-11-15 15:50:13 -03:00 committed by Mauro Carvalho Chehab
parent 0e835087df
commit eac8ae087a
2 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
drivers/media/rc/keymaps/rc-tbs-nec.c
View File

@ -13,38 +13,40 @@
#include <media/rc-map.h>
static struct rc_map_table 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_map_list tbs_nec_map = {

2
include/linux/input.h
View File

@ -590,6 +590,8 @@ struct input_keymap_entry {
#define KEY_FRAMEFORWARD 0x1b5
#define KEY_CONTEXT_MENU 0x1b6 /* GenDesc - system context menu */
#define KEY_MEDIA_REPEAT 0x1b7 /* Consumer - transport control */
#define KEY_10CHANNELSUP 0x1b8 /* 10 channels up (10+) */
#define KEY_10CHANNELSDOWN 0x1b9 /* 10 channels down (10-) */
#define KEY_DEL_EOL 0x1c0
#define KEY_DEL_EOS 0x1c1