aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/common
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-08-29 08:48:21 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-12 11:19:32 -0400
commit092315a76ca28a2e8e09b071f1c0efb83bafc234 (patch)
tree028e194903c495731f5a8dbb2b2d9e8612191e7a /drivers/media/common
parentcd748871fe5e689cd9917f561967bf4c63960e66 (diff)
V4L/DVB (12567): ir-keymaps: use KEY_CAMERA for snapshots
KEY_CAMERA is already used for a long time with webcam drivers to take a picture. On other media drivers, due to the lack of a snapshot button, random KEY codes were sent, being KEY_SHUFFLE the most used one, probably due to cut-and-paste from other remotes, since one of them uses the same key for snapshot and shuffle. The better is to use KEY_CAMERA on all drivers solving this issue. This follows the IR standard map as defined at: http://linuxtv.org/wiki/index.php/Remote_Controllers Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/common')
-rw-r--r--drivers/media/common/ir-keymaps.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/media/common/ir-keymaps.c b/drivers/media/common/ir-keymaps.c
index a166bdd8ee9a..0b8bfac14313 100644
--- a/drivers/media/common/ir-keymaps.c
+++ b/drivers/media/common/ir-keymaps.c
@@ -333,7 +333,7 @@ IR_KEYTAB_TYPE ir_codes_pixelview_new[IR_KEYTAB_SIZE] = {
333 [0x14] = KEY_VOLUMEDOWN, 333 [0x14] = KEY_VOLUMEDOWN,
334 [0x13] = KEY_ZOOM, 334 [0x13] = KEY_ZOOM,
335 335
336 [0x19] = KEY_SHUFFLE, /* SNAPSHOT */ 336 [0x19] = KEY_CAMERA, /* SNAPSHOT */
337 [0x1a] = KEY_SEARCH, /* scan */ 337 [0x1a] = KEY_SEARCH, /* scan */
338 338
339 [0x37] = KEY_REWIND, /* << */ 339 [0x37] = KEY_REWIND, /* << */
@@ -660,7 +660,7 @@ IR_KEYTAB_TYPE ir_codes_msi_tvanywhere_plus[IR_KEYTAB_SIZE] = {
660 660
661 [0x0f] = KEY_CLOSE, /* Minimize */ 661 [0x0f] = KEY_CLOSE, /* Minimize */
662 [0x19] = KEY_ZOOM, /* Zoom */ 662 [0x19] = KEY_ZOOM, /* Zoom */
663 [0x1a] = KEY_SHUFFLE, /* Snapshot */ 663 [0x1a] = KEY_CAMERA, /* Snapshot */
664 [0x0d] = KEY_LANGUAGE, /* MTS */ 664 [0x0d] = KEY_LANGUAGE, /* MTS */
665 665
666 [0x14] = KEY_VOLUMEDOWN,/* Vol- */ 666 [0x14] = KEY_VOLUMEDOWN,/* Vol- */
@@ -1066,7 +1066,7 @@ IR_KEYTAB_TYPE ir_codes_eztv[IR_KEYTAB_SIZE] = {
1066 [0x2b] = KEY_RECORD, /* recording */ 1066 [0x2b] = KEY_RECORD, /* recording */
1067 [0x2c] = KEY_STOP, /* stop */ 1067 [0x2c] = KEY_STOP, /* stop */
1068 [0x2d] = KEY_PLAY, /* play */ 1068 [0x2d] = KEY_PLAY, /* play */
1069 [0x2e] = KEY_SHUFFLE, /* snapshot / shuffle */ 1069 [0x2e] = KEY_CAMERA, /* snapshot / shuffle */
1070 1070
1071 [0x00] = KEY_0, 1071 [0x00] = KEY_0,
1072 [0x05] = KEY_1, 1072 [0x05] = KEY_1,
@@ -1117,7 +1117,7 @@ IR_KEYTAB_TYPE ir_codes_avermedia[IR_KEYTAB_SIZE] = {
1117 1117
1118 [0x2a] = KEY_SEARCH, /* AUTOSCAN */ 1118 [0x2a] = KEY_SEARCH, /* AUTOSCAN */
1119 [0x1a] = KEY_SLEEP, /* FREEZE */ 1119 [0x1a] = KEY_SLEEP, /* FREEZE */
1120 [0x3a] = KEY_SHUFFLE, /* SNAPSHOT */ 1120 [0x3a] = KEY_CAMERA, /* SNAPSHOT */
1121 [0x0a] = KEY_MUTE, /* MUTE */ 1121 [0x0a] = KEY_MUTE, /* MUTE */
1122 1122
1123 [0x26] = KEY_RECORD, /* RECORD */ 1123 [0x26] = KEY_RECORD, /* RECORD */
@@ -1278,7 +1278,7 @@ IR_KEYTAB_TYPE ir_codes_manli[IR_KEYTAB_SIZE] = {
1278 * MUTE SNAPSHOT* 1278 * MUTE SNAPSHOT*
1279 * */ 1279 * */
1280 [0x13] = KEY_MUTE, 1280 [0x13] = KEY_MUTE,
1281 [0x19] = KEY_RECORD, /*XXX*/ 1281 [0x19] = KEY_CAMERA,
1282 1282
1283 /* 0x1d unused ? */ 1283 /* 0x1d unused ? */
1284}; 1284};
@@ -1308,8 +1308,8 @@ IR_KEYTAB_TYPE ir_codes_gotview7135[IR_KEYTAB_SIZE] = {
1308 [0x0c] = KEY_VOLUMEDOWN, 1308 [0x0c] = KEY_VOLUMEDOWN,
1309 [0x28] = KEY_VOLUMEUP, 1309 [0x28] = KEY_VOLUMEUP,
1310 [0x08] = KEY_MUTE, 1310 [0x08] = KEY_MUTE,
1311 [0x26] = KEY_SEARCH, /*SCAN*/ 1311 [0x26] = KEY_SEARCH, /* SCAN */
1312 [0x3f] = KEY_SHUFFLE, /* SNAPSHOT */ 1312 [0x3f] = KEY_CAMERA, /* SNAPSHOT */
1313 [0x12] = KEY_RECORD, 1313 [0x12] = KEY_RECORD,
1314 [0x32] = KEY_STOP, 1314 [0x32] = KEY_STOP,
1315 [0x3c] = KEY_PLAY, 1315 [0x3c] = KEY_PLAY,
@@ -1397,7 +1397,7 @@ IR_KEYTAB_TYPE ir_codes_pctv_sedna[IR_KEYTAB_SIZE] = {
1397 [0x13] = KEY_MUTE, 1397 [0x13] = KEY_MUTE,
1398 [0x15] = KEY_CHANNELDOWN, 1398 [0x15] = KEY_CHANNELDOWN,
1399 [0x18] = KEY_VOLUMEDOWN, 1399 [0x18] = KEY_VOLUMEDOWN,
1400 [0x19] = KEY_SHUFFLE, /* Snapshot */ 1400 [0x19] = KEY_CAMERA, /* Snapshot */
1401 [0x1a] = KEY_NEXTSONG, 1401 [0x1a] = KEY_NEXTSONG,
1402 [0x1b] = KEY_TIME, /* Time Shift */ 1402 [0x1b] = KEY_TIME, /* Time Shift */
1403 [0x1c] = KEY_RADIO, /* FM Radio */ 1403 [0x1c] = KEY_RADIO, /* FM Radio */
@@ -1989,7 +1989,7 @@ IR_KEYTAB_TYPE ir_codes_encore_enltv2[IR_KEYTAB_SIZE] = {
1989 [0x72] = KEY_CHANNELDOWN, 1989 [0x72] = KEY_CHANNELDOWN,
1990 1990
1991 [0x41] = KEY_RECORD, 1991 [0x41] = KEY_RECORD,
1992 [0x51] = KEY_SHUFFLE, /* Snapshot */ 1992 [0x51] = KEY_CAMERA, /* Snapshot */
1993 [0x75] = KEY_TIME, /* Timeshift */ 1993 [0x75] = KEY_TIME, /* Timeshift */
1994 [0x71] = KEY_TV2, /* PIP */ 1994 [0x71] = KEY_TV2, /* PIP */
1995 1995
@@ -2237,7 +2237,7 @@ IR_KEYTAB_TYPE ir_codes_behold[IR_KEYTAB_SIZE] = {
2237 * FREEZE SNAPSHOT * 2237 * FREEZE SNAPSHOT *
2238 * */ 2238 * */
2239 [0x58] = KEY_SLOW, 2239 [0x58] = KEY_SLOW,
2240 [0x5c] = KEY_SAVE, 2240 [0x5c] = KEY_CAMERA,
2241 2241
2242}; 2242};
2243EXPORT_SYMBOL_GPL(ir_codes_behold); 2243EXPORT_SYMBOL_GPL(ir_codes_behold);
@@ -2277,7 +2277,7 @@ IR_KEYTAB_TYPE ir_codes_behold_columbus[IR_KEYTAB_SIZE] = {
2277 [0x04] = KEY_4, 2277 [0x04] = KEY_4,
2278 [0x05] = KEY_5, 2278 [0x05] = KEY_5,
2279 [0x06] = KEY_6, 2279 [0x06] = KEY_6,
2280 [0x19] = KEY_BOOKMARKS, /* Snapshot key */ 2280 [0x19] = KEY_CAMERA, /* Snapshot key */
2281 [0x07] = KEY_7, 2281 [0x07] = KEY_7,
2282 [0x08] = KEY_8, 2282 [0x08] = KEY_8,
2283 [0x09] = KEY_9, 2283 [0x09] = KEY_9,
@@ -2348,7 +2348,7 @@ IR_KEYTAB_TYPE ir_codes_genius_tvgo_a11mce[IR_KEYTAB_SIZE] = {
2348 an alternate name written */ 2348 an alternate name written */
2349 [0x1e] = KEY_UP, /* Video Setting */ 2349 [0x1e] = KEY_UP, /* Video Setting */
2350 [0x0a] = KEY_DOWN, /* Video Default */ 2350 [0x0a] = KEY_DOWN, /* Video Default */
2351 [0x05] = KEY_LEFT, /* Snapshot */ 2351 [0x05] = KEY_CAMERA, /* Snapshot */
2352 [0x0c] = KEY_RIGHT, /* Hide Panel */ 2352 [0x0c] = KEY_RIGHT, /* Hide Panel */
2353 /* Four buttons without label */ 2353 /* Four buttons without label */
2354 [0x49] = KEY_RED, 2354 [0x49] = KEY_RED,
@@ -2393,7 +2393,7 @@ IR_KEYTAB_TYPE ir_codes_powercolor_real_angel[IR_KEYTAB_SIZE] = {
2393 [0x27] = KEY_FASTFORWARD, 2393 [0x27] = KEY_FASTFORWARD,
2394 [0x26] = KEY_REWIND, 2394 [0x26] = KEY_REWIND,
2395 [0x1e] = KEY_SEARCH, /* autoscan */ 2395 [0x1e] = KEY_SEARCH, /* autoscan */
2396 [0x0e] = KEY_SHUFFLE, /* snapshot */ 2396 [0x0e] = KEY_CAMERA, /* snapshot */
2397 [0x2d] = KEY_SETUP, 2397 [0x2d] = KEY_SETUP,
2398 [0x0f] = KEY_SCREEN, /* full screen */ 2398 [0x0f] = KEY_SCREEN, /* full screen */
2399 [0x14] = KEY_RADIO, /* FM radio */ 2399 [0x14] = KEY_RADIO, /* FM radio */
@@ -2455,7 +2455,7 @@ IR_KEYTAB_TYPE ir_codes_kworld_plus_tv_analog[IR_KEYTAB_SIZE] = {
2455 2455
2456 [0x15] = KEY_AUDIO, /* ((*)) */ 2456 [0x15] = KEY_AUDIO, /* ((*)) */
2457 [0x0f] = KEY_ZOOM, 2457 [0x0f] = KEY_ZOOM,
2458 [0x1c] = KEY_SHUFFLE, /* snapshot */ 2458 [0x1c] = KEY_CAMERA, /* snapshot */
2459 2459
2460 [0x18] = KEY_RED, /* B */ 2460 [0x18] = KEY_RED, /* B */
2461 [0x23] = KEY_GREEN, /* C */ 2461 [0x23] = KEY_GREEN, /* C */
@@ -2571,7 +2571,7 @@ IR_KEYTAB_TYPE ir_codes_encore_enltv_fm53[IR_KEYTAB_SIZE] = {
2571 [0x40] = KEY_LAST, /* recall */ 2571 [0x40] = KEY_LAST, /* recall */
2572 2572
2573 [0x02] = KEY_MODE, /* TV/AV */ 2573 [0x02] = KEY_MODE, /* TV/AV */
2574 [0x05] = KEY_SHUFFLE, /* SNAPSHOT */ 2574 [0x05] = KEY_CAMERA, /* SNAPSHOT */
2575 2575
2576 [0x4c] = KEY_CHANNELUP, /* UP */ 2576 [0x4c] = KEY_CHANNELUP, /* UP */
2577 [0x00] = KEY_CHANNELDOWN, /* DOWN */ 2577 [0x00] = KEY_CHANNELDOWN, /* DOWN */
@@ -2627,7 +2627,7 @@ IR_KEYTAB_TYPE ir_codes_real_audio_220_32_keys[IR_KEYTAB_SIZE] = {
2627 2627
2628 [0x1d] = KEY_RECORD, 2628 [0x1d] = KEY_RECORD,
2629 [0x13] = KEY_MUTE, 2629 [0x13] = KEY_MUTE,
2630 [0x19] = KEY_SHUFFLE, /* Snapshot */ 2630 [0x19] = KEY_CAMERA, /* Snapshot */
2631 2631
2632}; 2632};
2633EXPORT_SYMBOL_GPL(ir_codes_real_audio_220_32_keys); 2633EXPORT_SYMBOL_GPL(ir_codes_real_audio_220_32_keys);
@@ -2811,7 +2811,7 @@ IR_KEYTAB_TYPE ir_codes_videomate_s350[IR_KEYTAB_SIZE] = {
2811 [0x29] = KEY_CHANNEL, /* SURF */ 2811 [0x29] = KEY_CHANNEL, /* SURF */
2812 [0x2b] = KEY_A, 2812 [0x2b] = KEY_A,
2813 [0x2c] = KEY_B, 2813 [0x2c] = KEY_B,
2814 [0x2f] = KEY_SHUFFLE, /* Snapshot */ 2814 [0x2f] = KEY_CAMERA, /* Snapshot */
2815 [0x23] = KEY_RADIO, 2815 [0x23] = KEY_RADIO,
2816 [0x02] = KEY_PREVIOUSSONG, 2816 [0x02] = KEY_PREVIOUSSONG,
2817 [0x06] = KEY_NEXTSONG, 2817 [0x06] = KEY_NEXTSONG,