aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/media/IR/keymaps/Makefile3
-rw-r--r--drivers/media/IR/keymaps/rc-dib0700-nec.c124
-rw-r--r--drivers/media/IR/keymaps/rc-dib0700-rc5.c (renamed from drivers/media/IR/keymaps/rc-dib0700-big.c)85
-rw-r--r--drivers/media/dvb/dvb-usb/dib0700_devices.c67
-rw-r--r--include/media/rc-map.h5
5 files changed, 184 insertions, 100 deletions
diff --git a/drivers/media/IR/keymaps/Makefile b/drivers/media/IR/keymaps/Makefile
index 85330d171c4e..cbee06243b51 100644
--- a/drivers/media/IR/keymaps/Makefile
+++ b/drivers/media/IR/keymaps/Makefile
@@ -14,7 +14,8 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
14 rc-budget-ci-old.o \ 14 rc-budget-ci-old.o \
15 rc-cinergy-1400.o \ 15 rc-cinergy-1400.o \
16 rc-cinergy.o \ 16 rc-cinergy.o \
17 rc-dib0700-big.o \ 17 rc-dib0700-nec.o \
18 rc-dib0700-rc5.o \
18 rc-dm1105-nec.o \ 19 rc-dm1105-nec.o \
19 rc-dntv-live-dvb-t.o \ 20 rc-dntv-live-dvb-t.o \
20 rc-dntv-live-dvbt-pro.o \ 21 rc-dntv-live-dvbt-pro.o \
diff --git a/drivers/media/IR/keymaps/rc-dib0700-nec.c b/drivers/media/IR/keymaps/rc-dib0700-nec.c
new file mode 100644
index 000000000000..f5809f4757f9
--- /dev/null
+++ b/drivers/media/IR/keymaps/rc-dib0700-nec.c
@@ -0,0 +1,124 @@
1/* rc-dvb0700-big.c - Keytable for devices in dvb0700
2 *
3 * Copyright (c) 2010 by Mauro Carvalho Chehab <mchehab@redhat.com>
4 *
5 * TODO: This table is a real mess, as it merges RC codes from several
6 * devices into a big table. It also has both RC-5 and NEC codes inside.
7 * It should be broken into small tables, and the protocols should properly
8 * be indentificated.
9 *
10 * The table were imported from dib0700_devices.c.
11 *
12 * This program is free software; you can redistribute it and/or modify
13 * it under the terms of the GNU General Public License as published by
14 * the Free Software Foundation; either version 2 of the License, or
15 * (at your option) any later version.
16 */
17
18#include <media/rc-map.h>
19
20static struct ir_scancode dib0700_table[] = {
21 /* Key codes for the Pixelview SBTVD remote */
22 { 0x8613, KEY_MUTE },
23 { 0x8612, KEY_POWER },
24 { 0x8601, KEY_1 },
25 { 0x8602, KEY_2 },
26 { 0x8603, KEY_3 },
27 { 0x8604, KEY_4 },
28 { 0x8605, KEY_5 },
29 { 0x8606, KEY_6 },
30 { 0x8607, KEY_7 },
31 { 0x8608, KEY_8 },
32 { 0x8609, KEY_9 },
33 { 0x8600, KEY_0 },
34 { 0x860d, KEY_CHANNELUP },
35 { 0x8619, KEY_CHANNELDOWN },
36 { 0x8610, KEY_VOLUMEUP },
37 { 0x860c, KEY_VOLUMEDOWN },
38
39 { 0x860a, KEY_CAMERA },
40 { 0x860b, KEY_ZOOM },
41 { 0x861b, KEY_BACKSPACE },
42 { 0x8615, KEY_ENTER },
43
44 { 0x861d, KEY_UP },
45 { 0x861e, KEY_DOWN },
46 { 0x860e, KEY_LEFT },
47 { 0x860f, KEY_RIGHT },
48
49 { 0x8618, KEY_RECORD },
50 { 0x861a, KEY_STOP },
51
52 /* Key codes for the EvolutePC TVWay+ remote */
53 { 0x7a00, KEY_MENU },
54 { 0x7a01, KEY_RECORD },
55 { 0x7a02, KEY_PLAY },
56 { 0x7a03, KEY_STOP },
57 { 0x7a10, KEY_CHANNELUP },
58 { 0x7a11, KEY_CHANNELDOWN },
59 { 0x7a12, KEY_VOLUMEUP },
60 { 0x7a13, KEY_VOLUMEDOWN },
61 { 0x7a40, KEY_POWER },
62 { 0x7a41, KEY_MUTE },
63
64 /* Key codes for the Elgato EyeTV Diversity silver remote */
65 { 0x4501, KEY_POWER },
66 { 0x4502, KEY_MUTE },
67 { 0x4503, KEY_1 },
68 { 0x4504, KEY_2 },
69 { 0x4505, KEY_3 },
70 { 0x4506, KEY_4 },
71 { 0x4507, KEY_5 },
72 { 0x4508, KEY_6 },
73 { 0x4509, KEY_7 },
74 { 0x450a, KEY_8 },
75 { 0x450b, KEY_9 },
76 { 0x450c, KEY_LAST },
77 { 0x450d, KEY_0 },
78 { 0x450e, KEY_ENTER },
79 { 0x450f, KEY_RED },
80 { 0x4510, KEY_CHANNELUP },
81 { 0x4511, KEY_GREEN },
82 { 0x4512, KEY_VOLUMEDOWN },
83 { 0x4513, KEY_OK },
84 { 0x4514, KEY_VOLUMEUP },
85 { 0x4515, KEY_YELLOW },
86 { 0x4516, KEY_CHANNELDOWN },
87 { 0x4517, KEY_BLUE },
88 { 0x4518, KEY_LEFT }, /* Skip backwards */
89 { 0x4519, KEY_PLAYPAUSE },
90 { 0x451a, KEY_RIGHT }, /* Skip forward */
91 { 0x451b, KEY_REWIND },
92 { 0x451c, KEY_L }, /* Live */
93 { 0x451d, KEY_FASTFORWARD },
94 { 0x451e, KEY_STOP }, /* 'Reveal' for Teletext */
95 { 0x451f, KEY_MENU }, /* KEY_TEXT for Teletext */
96 { 0x4540, KEY_RECORD }, /* Font 'Size' for Teletext */
97 { 0x4541, KEY_SCREEN }, /* Full screen toggle, 'Hold' for Teletext */
98 { 0x4542, KEY_SELECT }, /* Select video input, 'Select' for Teletext */
99};
100
101static struct rc_keymap dib0700_map = {
102 .map = {
103 .scan = dib0700_table,
104 .size = ARRAY_SIZE(dib0700_table),
105 .ir_type = IR_TYPE_NEC,
106 .name = RC_MAP_DIB0700_NEC_TABLE,
107 }
108};
109
110static int __init init_rc_map(void)
111{
112 return ir_register_map(&dib0700_map);
113}
114
115static void __exit exit_rc_map(void)
116{
117 ir_unregister_map(&dib0700_map);
118}
119
120module_init(init_rc_map)
121module_exit(exit_rc_map)
122
123MODULE_LICENSE("GPL");
124MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");
diff --git a/drivers/media/IR/keymaps/rc-dib0700-big.c b/drivers/media/IR/keymaps/rc-dib0700-rc5.c
index 2e83820d3e59..e2d0fd2bbaf9 100644
--- a/drivers/media/IR/keymaps/rc-dib0700-big.c
+++ b/drivers/media/IR/keymaps/rc-dib0700-rc5.c
@@ -44,6 +44,7 @@ static struct ir_scancode dib0700_table[] = {
44 { 0x0736, KEY_RECORD }, 44 { 0x0736, KEY_RECORD },
45 { 0x073c, KEY_STOP }, 45 { 0x073c, KEY_STOP },
46 { 0x073f, KEY_CANCEL }, /* '?' key */ 46 { 0x073f, KEY_CANCEL }, /* '?' key */
47
47 /* Key codes for the Terratec Cinergy DT XS Diversity, similar to cinergyT2.c */ 48 /* Key codes for the Terratec Cinergy DT XS Diversity, similar to cinergyT2.c */
48 { 0xeb01, KEY_POWER }, 49 { 0xeb01, KEY_POWER },
49 { 0xeb02, KEY_1 }, 50 { 0xeb02, KEY_1 },
@@ -206,94 +207,14 @@ static struct ir_scancode dib0700_table[] = {
206 { 0x1d37, KEY_RECORD }, 207 { 0x1d37, KEY_RECORD },
207 { 0x1d3b, KEY_GOTO }, 208 { 0x1d3b, KEY_GOTO },
208 { 0x1d3d, KEY_POWER }, 209 { 0x1d3d, KEY_POWER },
209
210 /* Key codes for the Pixelview SBTVD remote (proto NEC) */
211 { 0x8613, KEY_MUTE },
212 { 0x8612, KEY_POWER },
213 { 0x8601, KEY_1 },
214 { 0x8602, KEY_2 },
215 { 0x8603, KEY_3 },
216 { 0x8604, KEY_4 },
217 { 0x8605, KEY_5 },
218 { 0x8606, KEY_6 },
219 { 0x8607, KEY_7 },
220 { 0x8608, KEY_8 },
221 { 0x8609, KEY_9 },
222 { 0x8600, KEY_0 },
223 { 0x860d, KEY_CHANNELUP },
224 { 0x8619, KEY_CHANNELDOWN },
225 { 0x8610, KEY_VOLUMEUP },
226 { 0x860c, KEY_VOLUMEDOWN },
227
228 { 0x860a, KEY_CAMERA },
229 { 0x860b, KEY_ZOOM },
230 { 0x861b, KEY_BACKSPACE },
231 { 0x8615, KEY_ENTER },
232
233 { 0x861d, KEY_UP },
234 { 0x861e, KEY_DOWN },
235 { 0x860e, KEY_LEFT },
236 { 0x860f, KEY_RIGHT },
237
238 { 0x8618, KEY_RECORD },
239 { 0x861a, KEY_STOP },
240
241 /* Key codes for the EvolutePC TVWay+ remote (proto NEC) */
242 { 0x7a00, KEY_MENU },
243 { 0x7a01, KEY_RECORD },
244 { 0x7a02, KEY_PLAY },
245 { 0x7a03, KEY_STOP },
246 { 0x7a10, KEY_CHANNELUP },
247 { 0x7a11, KEY_CHANNELDOWN },
248 { 0x7a12, KEY_VOLUMEUP },
249 { 0x7a13, KEY_VOLUMEDOWN },
250 { 0x7a40, KEY_POWER },
251 { 0x7a41, KEY_MUTE },
252
253 /* Key codes for the Elgato EyeTV Diversity silver remote,
254 set dvb_usb_dib0700_ir_proto=0 */
255 { 0x4501, KEY_POWER },
256 { 0x4502, KEY_MUTE },
257 { 0x4503, KEY_1 },
258 { 0x4504, KEY_2 },
259 { 0x4505, KEY_3 },
260 { 0x4506, KEY_4 },
261 { 0x4507, KEY_5 },
262 { 0x4508, KEY_6 },
263 { 0x4509, KEY_7 },
264 { 0x450a, KEY_8 },
265 { 0x450b, KEY_9 },
266 { 0x450c, KEY_LAST },
267 { 0x450d, KEY_0 },
268 { 0x450e, KEY_ENTER },
269 { 0x450f, KEY_RED },
270 { 0x4510, KEY_CHANNELUP },
271 { 0x4511, KEY_GREEN },
272 { 0x4512, KEY_VOLUMEDOWN },
273 { 0x4513, KEY_OK },
274 { 0x4514, KEY_VOLUMEUP },
275 { 0x4515, KEY_YELLOW },
276 { 0x4516, KEY_CHANNELDOWN },
277 { 0x4517, KEY_BLUE },
278 { 0x4518, KEY_LEFT }, /* Skip backwards */
279 { 0x4519, KEY_PLAYPAUSE },
280 { 0x451a, KEY_RIGHT }, /* Skip forward */
281 { 0x451b, KEY_REWIND },
282 { 0x451c, KEY_L }, /* Live */
283 { 0x451d, KEY_FASTFORWARD },
284 { 0x451e, KEY_STOP }, /* 'Reveal' for Teletext */
285 { 0x451f, KEY_MENU }, /* KEY_TEXT for Teletext */
286 { 0x4540, KEY_RECORD }, /* Font 'Size' for Teletext */
287 { 0x4541, KEY_SCREEN }, /* Full screen toggle, 'Hold' for Teletext */
288 { 0x4542, KEY_SELECT }, /* Select video input, 'Select' for Teletext */
289}; 210};
290 211
291static struct rc_keymap dib0700_map = { 212static struct rc_keymap dib0700_map = {
292 .map = { 213 .map = {
293 .scan = dib0700_table, 214 .scan = dib0700_table,
294 .size = ARRAY_SIZE(dib0700_table), 215 .size = ARRAY_SIZE(dib0700_table),
295 .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */ 216 .ir_type = IR_TYPE_RC5,
296 .name = RC_MAP_DIB0700_BIG_TABLE, 217 .name = RC_MAP_DIB0700_RC5_TABLE,
297 } 218 }
298}; 219};
299 220
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index 6e587cd1f515..ee2a84beb553 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -1872,7 +1872,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
1872 1872
1873 .rc.core = { 1873 .rc.core = {
1874 .rc_interval = DEFAULT_RC_INTERVAL, 1874 .rc_interval = DEFAULT_RC_INTERVAL,
1875 .rc_codes = RC_MAP_DIB0700_BIG_TABLE, 1875 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
1876 .rc_query = dib0700_rc_query_old_firmware 1876 .rc_query = dib0700_rc_query_old_firmware
1877 }, 1877 },
1878 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 1878 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -1902,7 +1902,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
1902 1902
1903 .rc.core = { 1903 .rc.core = {
1904 .rc_interval = DEFAULT_RC_INTERVAL, 1904 .rc_interval = DEFAULT_RC_INTERVAL,
1905 .rc_codes = RC_MAP_DIB0700_BIG_TABLE, 1905 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
1906 .rc_query = dib0700_rc_query_old_firmware 1906 .rc_query = dib0700_rc_query_old_firmware
1907 }, 1907 },
1908 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 1908 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -1957,7 +1957,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
1957 1957
1958 .rc.core = { 1958 .rc.core = {
1959 .rc_interval = DEFAULT_RC_INTERVAL, 1959 .rc_interval = DEFAULT_RC_INTERVAL,
1960 .rc_codes = RC_MAP_DIB0700_BIG_TABLE, 1960 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
1961 .rc_query = dib0700_rc_query_old_firmware 1961 .rc_query = dib0700_rc_query_old_firmware
1962 }, 1962 },
1963 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 1963 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -1994,7 +1994,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
1994 1994
1995 .rc.core = { 1995 .rc.core = {
1996 .rc_interval = DEFAULT_RC_INTERVAL, 1996 .rc_interval = DEFAULT_RC_INTERVAL,
1997 .rc_codes = RC_MAP_DIB0700_BIG_TABLE, 1997 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
1998 .module_name = "dib0700", 1998 .module_name = "dib0700",
1999 .rc_query = dib0700_rc_query_old_firmware 1999 .rc_query = dib0700_rc_query_old_firmware
2000 }, 2000 },
@@ -2066,7 +2066,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
2066 2066
2067 .rc.core = { 2067 .rc.core = {
2068 .rc_interval = DEFAULT_RC_INTERVAL, 2068 .rc_interval = DEFAULT_RC_INTERVAL,
2069 .rc_codes = RC_MAP_DIB0700_BIG_TABLE, 2069 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
2070 .module_name = "dib0700", 2070 .module_name = "dib0700",
2071 .rc_query = dib0700_rc_query_old_firmware 2071 .rc_query = dib0700_rc_query_old_firmware
2072 }, 2072 },
@@ -2106,7 +2106,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
2106 2106
2107 .rc.core = { 2107 .rc.core = {
2108 .rc_interval = DEFAULT_RC_INTERVAL, 2108 .rc_interval = DEFAULT_RC_INTERVAL,
2109 .rc_codes = RC_MAP_DIB0700_BIG_TABLE, 2109 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
2110 .module_name = "dib0700", 2110 .module_name = "dib0700",
2111 .rc_query = dib0700_rc_query_old_firmware 2111 .rc_query = dib0700_rc_query_old_firmware
2112 }, 2112 },
@@ -2139,7 +2139,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
2139 } 2139 }
2140 }, 2140 },
2141 2141
2142 .num_device_descs = 7, 2142 .num_device_descs = 6,
2143 .devices = { 2143 .devices = {
2144 { "DiBcom STK7070PD reference design", 2144 { "DiBcom STK7070PD reference design",
2145 { &dib0700_usb_id_table[17], NULL }, 2145 { &dib0700_usb_id_table[17], NULL },
@@ -2166,6 +2166,45 @@ struct dvb_usb_device_properties dib0700_devices[] = {
2166 { &dib0700_usb_id_table[44], NULL }, 2166 { &dib0700_usb_id_table[44], NULL },
2167 { NULL }, 2167 { NULL },
2168 }, 2168 },
2169 },
2170
2171 .rc.core = {
2172 .rc_interval = DEFAULT_RC_INTERVAL,
2173 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
2174 .module_name = "dib0700",
2175 .rc_query = dib0700_rc_query_old_firmware
2176 },
2177 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
2178
2179 .num_adapters = 2,
2180 .adapter = {
2181 {
2182 .caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
2183 .pid_filter_count = 32,
2184 .pid_filter = stk70x0p_pid_filter,
2185 .pid_filter_ctrl = stk70x0p_pid_filter_ctrl,
2186 .frontend_attach = stk7070pd_frontend_attach0,
2187 .tuner_attach = dib7070p_tuner_attach,
2188
2189 DIB0700_DEFAULT_STREAMING_CONFIG(0x02),
2190
2191 .size_of_priv = sizeof(struct dib0700_adapter_state),
2192 }, {
2193 .caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
2194 .pid_filter_count = 32,
2195 .pid_filter = stk70x0p_pid_filter,
2196 .pid_filter_ctrl = stk70x0p_pid_filter_ctrl,
2197 .frontend_attach = stk7070pd_frontend_attach1,
2198 .tuner_attach = dib7070p_tuner_attach,
2199
2200 DIB0700_DEFAULT_STREAMING_CONFIG(0x03),
2201
2202 .size_of_priv = sizeof(struct dib0700_adapter_state),
2203 }
2204 },
2205
2206 .num_device_descs = 1,
2207 .devices = {
2169 { "Elgato EyeTV Diversity", 2208 { "Elgato EyeTV Diversity",
2170 { &dib0700_usb_id_table[68], NULL }, 2209 { &dib0700_usb_id_table[68], NULL },
2171 { NULL }, 2210 { NULL },
@@ -2174,7 +2213,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
2174 2213
2175 .rc.core = { 2214 .rc.core = {
2176 .rc_interval = DEFAULT_RC_INTERVAL, 2215 .rc_interval = DEFAULT_RC_INTERVAL,
2177 .rc_codes = RC_MAP_DIB0700_BIG_TABLE, 2216 .rc_codes = RC_MAP_DIB0700_NEC_TABLE,
2178 .module_name = "dib0700", 2217 .module_name = "dib0700",
2179 .rc_query = dib0700_rc_query_old_firmware 2218 .rc_query = dib0700_rc_query_old_firmware
2180 }, 2219 },
@@ -2239,7 +2278,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
2239 2278
2240 .rc.core = { 2279 .rc.core = {
2241 .rc_interval = DEFAULT_RC_INTERVAL, 2280 .rc_interval = DEFAULT_RC_INTERVAL,
2242 .rc_codes = RC_MAP_DIB0700_BIG_TABLE, 2281 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
2243 .module_name = "dib0700", 2282 .module_name = "dib0700",
2244 .rc_query = dib0700_rc_query_old_firmware 2283 .rc_query = dib0700_rc_query_old_firmware
2245 }, 2284 },
@@ -2271,7 +2310,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
2271 2310
2272 .rc.core = { 2311 .rc.core = {
2273 .rc_interval = DEFAULT_RC_INTERVAL, 2312 .rc_interval = DEFAULT_RC_INTERVAL,
2274 .rc_codes = RC_MAP_DIB0700_BIG_TABLE, 2313 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
2275 .module_name = "dib0700", 2314 .module_name = "dib0700",
2276 .rc_query = dib0700_rc_query_old_firmware 2315 .rc_query = dib0700_rc_query_old_firmware
2277 }, 2316 },
@@ -2335,7 +2374,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
2335 2374
2336 .rc.core = { 2375 .rc.core = {
2337 .rc_interval = DEFAULT_RC_INTERVAL, 2376 .rc_interval = DEFAULT_RC_INTERVAL,
2338 .rc_codes = RC_MAP_DIB0700_BIG_TABLE, 2377 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
2339 .module_name = "dib0700", 2378 .module_name = "dib0700",
2340 .rc_query = dib0700_rc_query_old_firmware 2379 .rc_query = dib0700_rc_query_old_firmware
2341 }, 2380 },
@@ -2375,7 +2414,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
2375 2414
2376 .rc.core = { 2415 .rc.core = {
2377 .rc_interval = DEFAULT_RC_INTERVAL, 2416 .rc_interval = DEFAULT_RC_INTERVAL,
2378 .rc_codes = RC_MAP_DIB0700_BIG_TABLE, 2417 .rc_codes = RC_MAP_DIB0700_NEC_TABLE,
2379 .module_name = "dib0700", 2418 .module_name = "dib0700",
2380 .rc_query = dib0700_rc_query_old_firmware 2419 .rc_query = dib0700_rc_query_old_firmware
2381 }, 2420 },
@@ -2420,7 +2459,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
2420 2459
2421 .rc.core = { 2460 .rc.core = {
2422 .rc_interval = DEFAULT_RC_INTERVAL, 2461 .rc_interval = DEFAULT_RC_INTERVAL,
2423 .rc_codes = RC_MAP_DIB0700_BIG_TABLE, 2462 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
2424 .module_name = "dib0700", 2463 .module_name = "dib0700",
2425 .rc_query = dib0700_rc_query_old_firmware 2464 .rc_query = dib0700_rc_query_old_firmware
2426 }, 2465 },
@@ -2453,7 +2492,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
2453 2492
2454 .rc.core = { 2493 .rc.core = {
2455 .rc_interval = DEFAULT_RC_INTERVAL, 2494 .rc_interval = DEFAULT_RC_INTERVAL,
2456 .rc_codes = RC_MAP_DIB0700_BIG_TABLE, 2495 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
2457 .module_name = "dib0700", 2496 .module_name = "dib0700",
2458 .rc_query = dib0700_rc_query_old_firmware 2497 .rc_query = dib0700_rc_query_old_firmware
2459 }, 2498 },
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index adbcccb54c8b..9569d0863f8b 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -69,9 +69,8 @@ void rc_map_init(void);
69#define RC_MAP_BUDGET_CI_OLD "rc-budget-ci-old" 69#define RC_MAP_BUDGET_CI_OLD "rc-budget-ci-old"
70#define RC_MAP_CINERGY_1400 "rc-cinergy-1400" 70#define RC_MAP_CINERGY_1400 "rc-cinergy-1400"
71#define RC_MAP_CINERGY "rc-cinergy" 71#define RC_MAP_CINERGY "rc-cinergy"
72/* Temporary table - should be broken into smaller tables */ 72#define RC_MAP_DIB0700_NEC_TABLE "rc-dib0700-nec"
73#define RC_MAP_DIB0700_BIG_TABLE "rc-dib0700-big" 73#define RC_MAP_DIB0700_RC5_TABLE "rc-dib0700-rc5"
74
75#define RC_MAP_DM1105_NEC "rc-dm1105-nec" 74#define RC_MAP_DM1105_NEC "rc-dm1105-nec"
76#define RC_MAP_DNTV_LIVE_DVBT_PRO "rc-dntv-live-dvbt-pro" 75#define RC_MAP_DNTV_LIVE_DVBT_PRO "rc-dntv-live-dvbt-pro"
77#define RC_MAP_DNTV_LIVE_DVB_T "rc-dntv-live-dvb-t" 76#define RC_MAP_DNTV_LIVE_DVB_T "rc-dntv-live-dvb-t"
generated by cgit v1.2.2 (git 2.25.0) at 2025-12-02 15:11:17 -0500