aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDevin Heitmueller <devin.heitmueller@gmail.com>2008-11-16 06:03:53 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-29 14:53:34 -0500
commit60245e858ddb2255d458868be16ba814f6f8d446 (patch)
treeb8ebb3c68b6b09704a0c06a245c4c889b95d1d84 /drivers
parent4b92253acc723f365ad6b2f32e4118e38133b7b8 (diff)
V4L/DVB (9629): Add support for the ATI TV Wonder HD 600 USB Remote Control
Add support for the ATI TV Wonder HD 600 USB Remote Control (required a new keymap) [mchehab@redhat.com: Fix CodingStyle] Signed-off-by: Devin Heitmueller <devin.heitmueller@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/common/ir-keymaps.c32
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c1
2 files changed, 33 insertions, 0 deletions
diff --git a/drivers/media/common/ir-keymaps.c b/drivers/media/common/ir-keymaps.c
index 4952aeb5dd80..3534cdc1f953 100644
--- a/drivers/media/common/ir-keymaps.c
+++ b/drivers/media/common/ir-keymaps.c
@@ -2511,3 +2511,35 @@ IR_KEYTAB_TYPE ir_codes_real_audio_220_32_keys[IR_KEYTAB_SIZE] = {
2511 2511
2512}; 2512};
2513EXPORT_SYMBOL_GPL(ir_codes_real_audio_220_32_keys); 2513EXPORT_SYMBOL_GPL(ir_codes_real_audio_220_32_keys);
2514
2515/* ATI TV Wonder HD 600 USB
2516 Devin Heitmueller <devin.heitmueller@gmail.com>
2517 */
2518IR_KEYTAB_TYPE ir_codes_ati_tv_wonder_hd_600[IR_KEYTAB_SIZE] = {
2519 [0x00] = KEY_RECORD, /* Row 1 */
2520 [0x01] = KEY_PLAYPAUSE,
2521 [0x02] = KEY_STOP,
2522 [0x03] = KEY_POWER,
2523 [0x04] = KEY_PREVIOUS, /* Row 2 */
2524 [0x05] = KEY_REWIND,
2525 [0x06] = KEY_FORWARD,
2526 [0x07] = KEY_NEXT,
2527 [0x08] = KEY_EPG, /* Row 3 */
2528 [0x09] = KEY_HOME,
2529 [0x0a] = KEY_MENU,
2530 [0x0b] = KEY_CHANNELUP,
2531 [0x0c] = KEY_BACK, /* Row 4 */
2532 [0x0d] = KEY_UP,
2533 [0x0e] = KEY_INFO,
2534 [0x0f] = KEY_CHANNELDOWN,
2535 [0x10] = KEY_LEFT, /* Row 5 */
2536 [0x11] = KEY_SELECT,
2537 [0x12] = KEY_RIGHT,
2538 [0x13] = KEY_VOLUMEUP,
2539 [0x14] = KEY_LAST, /* Row 6 */
2540 [0x15] = KEY_DOWN,
2541 [0x16] = KEY_MUTE,
2542 [0x17] = KEY_VOLUMEDOWN,
2543};
2544
2545EXPORT_SYMBOL_GPL(ir_codes_ati_tv_wonder_hd_600);
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 3b585486f7fe..75b2af2bf4cf 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -640,6 +640,7 @@ struct em28xx_board em28xx_boards[] = {
640 .mts_firmware = 1, 640 .mts_firmware = 1,
641 .has_12mhz_i2s = 1, 641 .has_12mhz_i2s = 1,
642 .has_dvb = 1, 642 .has_dvb = 1,
643 .ir_codes = ir_codes_ati_tv_wonder_hd_600,
643 .decoder = EM28XX_TVP5150, 644 .decoder = EM28XX_TVP5150,
644 .input = { { 645 .input = { {
645 .type = EM28XX_VMUX_TELEVISION, 646 .type = EM28XX_VMUX_TELEVISION,