diff options
author | Ville-Pekka Vainio <vpivaini@cs.helsinki.fi> | 2007-01-12 12:06:21 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-21 10:34:20 -0500 |
commit | ae1942c5712f700c9ccc8cc287c51db4daaa50d7 (patch) | |
tree | 36eadc93cb0845391b00f0737a07e8633737408c | |
parent | 43db48d3d2f6326c571984b7b30ab355596bb3cc (diff) |
V4L/DVB (5070): Budget-ci: add support for the Technotrend 1500 bundled remote
The keymap is based on a previous patch by Jussi Kukkonen.
This remote is identified by subsystem_device id 0x1010.
Signed-off-by: Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | drivers/media/common/ir-keymaps.c | 39 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/budget-ci.c | 11 | ||||
-rw-r--r-- | include/media/ir-common.h | 1 |
3 files changed, 50 insertions, 1 deletions
diff --git a/drivers/media/common/ir-keymaps.c b/drivers/media/common/ir-keymaps.c index 8b290204ff6c..03b47a262f27 100644 --- a/drivers/media/common/ir-keymaps.c +++ b/drivers/media/common/ir-keymaps.c | |||
@@ -1738,3 +1738,42 @@ IR_KEYTAB_TYPE ir_codes_encore_enltv[IR_KEYTAB_SIZE] = { | |||
1738 | }; | 1738 | }; |
1739 | 1739 | ||
1740 | EXPORT_SYMBOL_GPL(ir_codes_encore_enltv); | 1740 | EXPORT_SYMBOL_GPL(ir_codes_encore_enltv); |
1741 | |||
1742 | /* for the Technotrend 1500 bundled remote: */ | ||
1743 | IR_KEYTAB_TYPE ir_codes_tt_1500[IR_KEYTAB_SIZE] = { | ||
1744 | [ 0x01 ] = KEY_POWER, | ||
1745 | [ 0x02 ] = KEY_SHUFFLE, /* ? double-arrow key */ | ||
1746 | [ 0x03 ] = KEY_1, | ||
1747 | [ 0x04 ] = KEY_2, | ||
1748 | [ 0x05 ] = KEY_3, | ||
1749 | [ 0x06 ] = KEY_4, | ||
1750 | [ 0x07 ] = KEY_5, | ||
1751 | [ 0x08 ] = KEY_6, | ||
1752 | [ 0x09 ] = KEY_7, | ||
1753 | [ 0x0a ] = KEY_8, | ||
1754 | [ 0x0b ] = KEY_9, | ||
1755 | [ 0x0c ] = KEY_0, | ||
1756 | [ 0x0d ] = KEY_UP, | ||
1757 | [ 0x0e ] = KEY_LEFT, | ||
1758 | [ 0x0f ] = KEY_OK, | ||
1759 | [ 0x10 ] = KEY_RIGHT, | ||
1760 | [ 0x11 ] = KEY_DOWN, | ||
1761 | [ 0x12 ] = KEY_INFO, | ||
1762 | [ 0x13 ] = KEY_EXIT, | ||
1763 | [ 0x14 ] = KEY_RED, | ||
1764 | [ 0x15 ] = KEY_GREEN, | ||
1765 | [ 0x16 ] = KEY_YELLOW, | ||
1766 | [ 0x17 ] = KEY_BLUE, | ||
1767 | [ 0x18 ] = KEY_MUTE, | ||
1768 | [ 0x19 ] = KEY_TEXT, | ||
1769 | [ 0x1a ] = KEY_MODE, /* ? TV/Radio */ | ||
1770 | [ 0x21 ] = KEY_OPTION, | ||
1771 | [ 0x22 ] = KEY_EPG, | ||
1772 | [ 0x23 ] = KEY_CHANNELUP, | ||
1773 | [ 0x24 ] = KEY_CHANNELDOWN, | ||
1774 | [ 0x25 ] = KEY_VOLUMEUP, | ||
1775 | [ 0x26 ] = KEY_VOLUMEDOWN, | ||
1776 | [ 0x27 ] = KEY_SETUP, | ||
1777 | }; | ||
1778 | |||
1779 | EXPORT_SYMBOL_GPL(ir_codes_tt_1500); | ||
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c index f2066b47baee..ea4257653318 100644 --- a/drivers/media/dvb/ttpci/budget-ci.c +++ b/drivers/media/dvb/ttpci/budget-ci.c | |||
@@ -223,7 +223,6 @@ static int msp430_ir_init(struct budget_ci *budget_ci) | |||
223 | switch (budget_ci->budget.dev->pci->subsystem_device) { | 223 | switch (budget_ci->budget.dev->pci->subsystem_device) { |
224 | case 0x100c: | 224 | case 0x100c: |
225 | case 0x100f: | 225 | case 0x100f: |
226 | case 0x1010: | ||
227 | case 0x1011: | 226 | case 0x1011: |
228 | case 0x1012: | 227 | case 0x1012: |
229 | case 0x1017: | 228 | case 0x1017: |
@@ -236,6 +235,16 @@ static int msp430_ir_init(struct budget_ci *budget_ci) | |||
236 | else | 235 | else |
237 | budget_ci->ir.rc5_device = rc5_device; | 236 | budget_ci->ir.rc5_device = rc5_device; |
238 | break; | 237 | break; |
238 | case 0x1010: | ||
239 | /* for the Technotrend 1500 bundled remote */ | ||
240 | ir_input_init(input_dev, &budget_ci->ir.state, | ||
241 | IR_TYPE_RC5, ir_codes_tt_1500); | ||
242 | |||
243 | if (rc5_device < 0) | ||
244 | budget_ci->ir.rc5_device = IR_DEVICE_ANY; | ||
245 | else | ||
246 | budget_ci->ir.rc5_device = rc5_device; | ||
247 | break; | ||
239 | default: | 248 | default: |
240 | /* unknown remote */ | 249 | /* unknown remote */ |
241 | ir_input_init(input_dev, &budget_ci->ir.state, | 250 | ir_input_init(input_dev, &budget_ci->ir.state, |
diff --git a/include/media/ir-common.h b/include/media/ir-common.h index 0a75c0fcfea2..9807a7c15830 100644 --- a/include/media/ir-common.h +++ b/include/media/ir-common.h | |||
@@ -139,6 +139,7 @@ extern IR_KEYTAB_TYPE ir_codes_proteus_2309[IR_KEYTAB_SIZE]; | |||
139 | extern IR_KEYTAB_TYPE ir_codes_budget_ci_old[IR_KEYTAB_SIZE]; | 139 | extern IR_KEYTAB_TYPE ir_codes_budget_ci_old[IR_KEYTAB_SIZE]; |
140 | extern IR_KEYTAB_TYPE ir_codes_asus_pc39[IR_KEYTAB_SIZE]; | 140 | extern IR_KEYTAB_TYPE ir_codes_asus_pc39[IR_KEYTAB_SIZE]; |
141 | extern IR_KEYTAB_TYPE ir_codes_encore_enltv[IR_KEYTAB_SIZE]; | 141 | extern IR_KEYTAB_TYPE ir_codes_encore_enltv[IR_KEYTAB_SIZE]; |
142 | extern IR_KEYTAB_TYPE ir_codes_tt_1500[IR_KEYTAB_SIZE]; | ||
142 | 143 | ||
143 | #endif | 144 | #endif |
144 | 145 | ||