aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/common
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-08-29 08:06:07 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-12 11:19:29 -0400
commitf545cb43942d0556958af9f35cc06cdd42a78971 (patch)
tree982cd88adbd280248a34f437a04526d4cfa9be1c /drivers/media/common
parent62f1aa9f98dca68d5393d555faa8a038bb91cedc (diff)
V4L/DVB (12565): ir-keymaps: standardize timeshift key
Each remote were using a different keycode for timeshift. Use the same keycode for all of them, using the 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.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/media/common/ir-keymaps.c b/drivers/media/common/ir-keymaps.c
index 1a96b35cb846..e8af24f9d2e3 100644
--- a/drivers/media/common/ir-keymaps.c
+++ b/drivers/media/common/ir-keymaps.c
@@ -308,7 +308,7 @@ EXPORT_SYMBOL_GPL(ir_codes_pixelview);
308 present on PV MPEG 8000GT 308 present on PV MPEG 8000GT
309 */ 309 */
310IR_KEYTAB_TYPE ir_codes_pixelview_new[IR_KEYTAB_SIZE] = { 310IR_KEYTAB_TYPE ir_codes_pixelview_new[IR_KEYTAB_SIZE] = {
311 [0x3c] = KEY_PAUSE, /* Timeshift */ 311 [0x3c] = KEY_TIME, /* Timeshift */
312 [0x12] = KEY_POWER, 312 [0x12] = KEY_POWER,
313 313
314 [0x3d] = KEY_1, 314 [0x3d] = KEY_1,
@@ -469,7 +469,7 @@ IR_KEYTAB_TYPE ir_codes_iodata_bctv7e[IR_KEYTAB_SIZE] = {
469 [0x78] = KEY_9, 469 [0x78] = KEY_9,
470 470
471 [0x10] = KEY_L, /* Live */ 471 [0x10] = KEY_L, /* Live */
472 [0x08] = KEY_T, /* Time Shift */ 472 [0x08] = KEY_TIME, /* Time Shift */
473 473
474 [0x18] = KEY_PLAYPAUSE, /* Play */ 474 [0x18] = KEY_PLAYPAUSE, /* Play */
475 475
@@ -572,7 +572,7 @@ IR_KEYTAB_TYPE ir_codes_msi_tvanywhere[IR_KEYTAB_SIZE] = {
572 [0x0c] = KEY_MUTE, 572 [0x0c] = KEY_MUTE,
573 [0x0f] = KEY_SCREEN, /* Full Screen */ 573 [0x0f] = KEY_SCREEN, /* Full Screen */
574 [0x10] = KEY_FN, /* Funtion */ 574 [0x10] = KEY_FN, /* Funtion */
575 [0x11] = KEY_T, /* Time shift */ 575 [0x11] = KEY_TIME, /* Time shift */
576 [0x12] = KEY_POWER, 576 [0x12] = KEY_POWER,
577 [0x13] = KEY_MEDIA, /* MTS */ 577 [0x13] = KEY_MEDIA, /* MTS */
578 [0x14] = KEY_SLOW, 578 [0x14] = KEY_SLOW,
@@ -1270,7 +1270,7 @@ IR_KEYTAB_TYPE ir_codes_manli[IR_KEYTAB_SIZE] = {
1270 [0x0f] = KEY_AUDIO, 1270 [0x0f] = KEY_AUDIO,
1271 [0x1b] = KEY_VOLUMEUP, 1271 [0x1b] = KEY_VOLUMEUP,
1272 [0x1a] = KEY_CHANNELUP, 1272 [0x1a] = KEY_CHANNELUP,
1273 [0x0e] = KEY_SLEEP, /*XXX maybe KEY_PAUSE */ 1273 [0x0e] = KEY_TIME,
1274 [0x1f] = KEY_VOLUMEDOWN, 1274 [0x1f] = KEY_VOLUMEDOWN,
1275 [0x1e] = KEY_CHANNELDOWN, 1275 [0x1e] = KEY_CHANNELDOWN,
1276 1276
@@ -1320,7 +1320,7 @@ IR_KEYTAB_TYPE ir_codes_gotview7135[IR_KEYTAB_SIZE] = {
1320 1320
1321 [0x2a] = KEY_F21, /* LIVE TIMESHIFT */ 1321 [0x2a] = KEY_F21, /* LIVE TIMESHIFT */
1322 [0x0e] = KEY_F22, /* MIN TIMESHIFT */ 1322 [0x0e] = KEY_F22, /* MIN TIMESHIFT */
1323 [0x1e] = KEY_F23, /* TIMESHIFT */ 1323 [0x1e] = KEY_TIME, /* TIMESHIFT */
1324 [0x38] = KEY_F24, /* NORMAL TIMESHIFT */ 1324 [0x38] = KEY_F24, /* NORMAL TIMESHIFT */
1325}; 1325};
1326EXPORT_SYMBOL_GPL(ir_codes_gotview7135); 1326EXPORT_SYMBOL_GPL(ir_codes_gotview7135);
@@ -1361,6 +1361,7 @@ IR_KEYTAB_TYPE ir_codes_purpletv[IR_KEYTAB_SIZE] = {
1361 [0x46] = KEY_PLAY, 1361 [0x46] = KEY_PLAY,
1362 [0x45] = KEY_PAUSE, /* Pause */ 1362 [0x45] = KEY_PAUSE, /* Pause */
1363 [0x44] = KEY_STOP, 1363 [0x44] = KEY_STOP,
1364 [0x43] = KEY_TIME, /* Time Shift */
1364 [0x17] = KEY_CHANNEL, /* SURF CH */ 1365 [0x17] = KEY_CHANNEL, /* SURF CH */
1365 [0x40] = KEY_FORWARD, /* Forward ? */ 1366 [0x40] = KEY_FORWARD, /* Forward ? */
1366 [0x42] = KEY_REWIND, /* Backward ? */ 1367 [0x42] = KEY_REWIND, /* Backward ? */
@@ -1398,7 +1399,7 @@ IR_KEYTAB_TYPE ir_codes_pctv_sedna[IR_KEYTAB_SIZE] = {
1398 [0x18] = KEY_VOLUMEDOWN, 1399 [0x18] = KEY_VOLUMEDOWN,
1399 [0x19] = KEY_SHUFFLE, /* Snapshot */ 1400 [0x19] = KEY_SHUFFLE, /* Snapshot */
1400 [0x1a] = KEY_NEXTSONG, 1401 [0x1a] = KEY_NEXTSONG,
1401 [0x1b] = KEY_TEXT, /* Time Shift */ 1402 [0x1b] = KEY_TIME, /* Time Shift */
1402 [0x1c] = KEY_RADIO, /* FM Radio */ 1403 [0x1c] = KEY_RADIO, /* FM Radio */
1403 [0x1d] = KEY_RECORD, 1404 [0x1d] = KEY_RECORD,
1404 [0x1e] = KEY_PAUSE, 1405 [0x1e] = KEY_PAUSE,
@@ -1534,7 +1535,7 @@ IR_KEYTAB_TYPE ir_codes_winfast[IR_KEYTAB_SIZE] = {
1534 [0x22] = KEY_PREVIOUS, 1535 [0x22] = KEY_PREVIOUS,
1535 [0x23] = KEY_PLAYPAUSE, 1536 [0x23] = KEY_PLAYPAUSE,
1536 [0x24] = KEY_NEXT, 1537 [0x24] = KEY_NEXT,
1537 [0x25] = KEY_ARCHIVE, /* Time Shifting */ 1538 [0x25] = KEY_TIME, /* Time Shifting */
1538 [0x26] = KEY_STOP, 1539 [0x26] = KEY_STOP,
1539 [0x27] = KEY_RECORD, 1540 [0x27] = KEY_RECORD,
1540 [0x28] = KEY_SAVE, /* Screenshot */ 1541 [0x28] = KEY_SAVE, /* Screenshot */
@@ -2296,7 +2297,7 @@ IR_KEYTAB_TYPE ir_codes_behold_columbus[IR_KEYTAB_SIZE] = {
2296 * Timeshift Record ChannelDown VolumeDown * 2297 * Timeshift Record ChannelDown VolumeDown *
2297 * */ 2298 * */
2298 2299
2299 [0x1B] = KEY_REWIND, 2300 [0x1B] = KEY_TIME,
2300 [0x1D] = KEY_RECORD, 2301 [0x1D] = KEY_RECORD,
2301 [0x15] = KEY_CHANNELDOWN, 2302 [0x15] = KEY_CHANNELDOWN,
2302 [0x18] = KEY_VOLUMEDOWN, 2303 [0x18] = KEY_VOLUMEDOWN,
@@ -2448,7 +2449,7 @@ IR_KEYTAB_TYPE ir_codes_kworld_plus_tv_analog[IR_KEYTAB_SIZE] = {
2448 Also, it is not related to the time between keyup 2449 Also, it is not related to the time between keyup
2449 and keydown. 2450 and keydown.
2450 */ 2451 */
2451 [0x19] = KEY_PAUSE, /* Timeshift */ 2452 [0x19] = KEY_TIME, /* Timeshift */
2452 [0x1a] = KEY_STOP, 2453 [0x1a] = KEY_STOP,
2453 [0x1b] = KEY_RECORD, 2454 [0x1b] = KEY_RECORD,
2454 2455
@@ -2619,7 +2620,7 @@ IR_KEYTAB_TYPE ir_codes_real_audio_220_32_keys[IR_KEYTAB_SIZE] = {
2619 [0x0d] = KEY_AUDIO, /* stereo */ 2620 [0x0d] = KEY_AUDIO, /* stereo */
2620 2621
2621 [0x0f] = KEY_PREVIOUS, /* Prev */ 2622 [0x0f] = KEY_PREVIOUS, /* Prev */
2622 [0x1b] = KEY_PAUSE, /* Timeshift */ 2623 [0x1b] = KEY_TIME, /* Timeshift */
2623 [0x1a] = KEY_NEXT, /* Next */ 2624 [0x1a] = KEY_NEXT, /* Next */
2624 2625
2625 [0x0e] = KEY_STOP, 2626 [0x0e] = KEY_STOP,