aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDâniel Fraga <fragabr@gmail.com>2008-04-08 18:56:44 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 13:07:58 -0400
commitba928034df7e8b603152c896a2f84f9b12e8c290 (patch)
tree1748053be850156814ca548d8f4c9f8a678686b7 /drivers
parentab364983087152e53676d914141f30e83ead12ff (diff)
V4L/DVB (7506): Powercolor Real Angel 330 (remote control support)
The attached patch adds complete remote control support for Powercolor Real Angel 330. Signed-off-by: Daniel Fraga <fragabr@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/common/ir-keymaps.c43
-rw-r--r--drivers/media/video/cx88/cx88-input.c6
2 files changed, 49 insertions, 0 deletions
diff --git a/drivers/media/common/ir-keymaps.c b/drivers/media/common/ir-keymaps.c
index 35793185630b..c5d10bdf4286 100644
--- a/drivers/media/common/ir-keymaps.c
+++ b/drivers/media/common/ir-keymaps.c
@@ -2084,3 +2084,46 @@ IR_KEYTAB_TYPE ir_codes_genius_tvgo_a11mce[IR_KEYTAB_SIZE] = {
2084 [0x50] = KEY_BLUE, 2084 [0x50] = KEY_BLUE,
2085}; 2085};
2086EXPORT_SYMBOL_GPL(ir_codes_genius_tvgo_a11mce); 2086EXPORT_SYMBOL_GPL(ir_codes_genius_tvgo_a11mce);
2087
2088/*
2089 * Remote control for Powercolor Real Angel 330
2090 * Daniel Fraga <fragabr@gmail.com>
2091 */
2092IR_KEYTAB_TYPE ir_codes_powercolor_real_angel[IR_KEYTAB_SIZE] = {
2093 [0x38] = KEY_SWITCHVIDEOMODE, /* switch inputs */
2094 [0x0c] = KEY_MEDIA, /* Turn ON/OFF App */
2095 [0x00] = KEY_0,
2096 [0x01] = KEY_1,
2097 [0x02] = KEY_2,
2098 [0x03] = KEY_3,
2099 [0x04] = KEY_4,
2100 [0x05] = KEY_5,
2101 [0x06] = KEY_6,
2102 [0x07] = KEY_7,
2103 [0x08] = KEY_8,
2104 [0x09] = KEY_9,
2105 [0x0a] = KEY_DIGITS, /* single, double, tripple digit */
2106 [0x29] = KEY_PREVIOUS, /* previous channel */
2107 [0x12] = KEY_BRIGHTNESSUP,
2108 [0x13] = KEY_BRIGHTNESSDOWN,
2109 [0x2b] = KEY_MODE, /* stereo/mono */
2110 [0x2c] = KEY_TEXT, /* teletext */
2111 [0x20] = KEY_UP, /* channel up */
2112 [0x21] = KEY_DOWN, /* channel down */
2113 [0x10] = KEY_RIGHT, /* volume up */
2114 [0x11] = KEY_LEFT, /* volume down */
2115 [0x0d] = KEY_MUTE,
2116 [0x1f] = KEY_RECORD,
2117 [0x17] = KEY_PLAY,
2118 [0x16] = KEY_PAUSE,
2119 [0x0b] = KEY_STOP,
2120 [0x27] = KEY_FASTFORWARD,
2121 [0x26] = KEY_REWIND,
2122 [0x1e] = KEY_SEARCH, /* autoscan */
2123 [0x0e] = KEY_SHUFFLE, /* snapshot */
2124 [0x2d] = KEY_SETUP,
2125 [0x0f] = KEY_SCREEN, /* full screen */
2126 [0x14] = KEY_RADIO, /* FM radio */
2127 [0x25] = KEY_POWER, /* power */
2128};
2129EXPORT_SYMBOL_GPL(ir_codes_powercolor_real_angel);
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index 6b25b8c9bb6d..53526d997a4e 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -317,6 +317,12 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
317 ir_type = IR_TYPE_RC5; 317 ir_type = IR_TYPE_RC5;
318 ir->sampling = 1; 318 ir->sampling = 1;
319 break; 319 break;
320 case CX88_BOARD_POWERCOLOR_REAL_ANGEL:
321 ir_codes = ir_codes_powercolor_real_angel;
322 ir->gpio_addr = MO_GP2_IO;
323 ir->mask_keycode = 0x7e;
324 ir->polling = 100; /* ms */
325 break;
320 } 326 }
321 327
322 if (NULL == ir_codes) { 328 if (NULL == ir_codes) {