diff options
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/bt8xx/bttv-input.c | 26 | ||||
-rw-r--r-- | drivers/media/video/cx18/cx18-i2c.c | 2 | ||||
-rw-r--r-- | drivers/media/video/cx231xx/cx231xx.h | 2 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-input.c | 52 | ||||
-rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 26 | ||||
-rw-r--r-- | drivers/media/video/em28xx/em28xx.h | 2 | ||||
-rw-r--r-- | drivers/media/video/ir-kbd-i2c.c | 20 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-input.c | 66 |
8 files changed, 98 insertions, 98 deletions
diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c index 3e7b48e73b01..ebd51afe8761 100644 --- a/drivers/media/video/bt8xx/bttv-input.c +++ b/drivers/media/video/bt8xx/bttv-input.c | |||
@@ -245,7 +245,7 @@ static void bttv_ir_stop(struct bttv *btv) | |||
245 | int bttv_input_init(struct bttv *btv) | 245 | int bttv_input_init(struct bttv *btv) |
246 | { | 246 | { |
247 | struct card_ir *ir; | 247 | struct card_ir *ir; |
248 | IR_KEYTAB_TYPE *ir_codes = NULL; | 248 | struct ir_scancode_table *ir_codes = NULL; |
249 | struct input_dev *input_dev; | 249 | struct input_dev *input_dev; |
250 | int ir_type = IR_TYPE_OTHER; | 250 | int ir_type = IR_TYPE_OTHER; |
251 | int err = -ENOMEM; | 251 | int err = -ENOMEM; |
@@ -263,7 +263,7 @@ int bttv_input_init(struct bttv *btv) | |||
263 | case BTTV_BOARD_AVERMEDIA: | 263 | case BTTV_BOARD_AVERMEDIA: |
264 | case BTTV_BOARD_AVPHONE98: | 264 | case BTTV_BOARD_AVPHONE98: |
265 | case BTTV_BOARD_AVERMEDIA98: | 265 | case BTTV_BOARD_AVERMEDIA98: |
266 | ir_codes = ir_codes_avermedia; | 266 | ir_codes = &ir_codes_avermedia_table; |
267 | ir->mask_keycode = 0xf88000; | 267 | ir->mask_keycode = 0xf88000; |
268 | ir->mask_keydown = 0x010000; | 268 | ir->mask_keydown = 0x010000; |
269 | ir->polling = 50; // ms | 269 | ir->polling = 50; // ms |
@@ -271,14 +271,14 @@ int bttv_input_init(struct bttv *btv) | |||
271 | 271 | ||
272 | case BTTV_BOARD_AVDVBT_761: | 272 | case BTTV_BOARD_AVDVBT_761: |
273 | case BTTV_BOARD_AVDVBT_771: | 273 | case BTTV_BOARD_AVDVBT_771: |
274 | ir_codes = ir_codes_avermedia_dvbt; | 274 | ir_codes = &ir_codes_avermedia_dvbt_table; |
275 | ir->mask_keycode = 0x0f00c0; | 275 | ir->mask_keycode = 0x0f00c0; |
276 | ir->mask_keydown = 0x000020; | 276 | ir->mask_keydown = 0x000020; |
277 | ir->polling = 50; // ms | 277 | ir->polling = 50; // ms |
278 | break; | 278 | break; |
279 | 279 | ||
280 | case BTTV_BOARD_PXELVWPLTVPAK: | 280 | case BTTV_BOARD_PXELVWPLTVPAK: |
281 | ir_codes = ir_codes_pixelview; | 281 | ir_codes = &ir_codes_pixelview_table; |
282 | ir->mask_keycode = 0x003e00; | 282 | ir->mask_keycode = 0x003e00; |
283 | ir->mask_keyup = 0x010000; | 283 | ir->mask_keyup = 0x010000; |
284 | ir->polling = 50; // ms | 284 | ir->polling = 50; // ms |
@@ -286,24 +286,24 @@ int bttv_input_init(struct bttv *btv) | |||
286 | case BTTV_BOARD_PV_M4900: | 286 | case BTTV_BOARD_PV_M4900: |
287 | case BTTV_BOARD_PV_BT878P_9B: | 287 | case BTTV_BOARD_PV_BT878P_9B: |
288 | case BTTV_BOARD_PV_BT878P_PLUS: | 288 | case BTTV_BOARD_PV_BT878P_PLUS: |
289 | ir_codes = ir_codes_pixelview; | 289 | ir_codes = &ir_codes_pixelview_table; |
290 | ir->mask_keycode = 0x001f00; | 290 | ir->mask_keycode = 0x001f00; |
291 | ir->mask_keyup = 0x008000; | 291 | ir->mask_keyup = 0x008000; |
292 | ir->polling = 50; // ms | 292 | ir->polling = 50; // ms |
293 | break; | 293 | break; |
294 | 294 | ||
295 | case BTTV_BOARD_WINFAST2000: | 295 | case BTTV_BOARD_WINFAST2000: |
296 | ir_codes = ir_codes_winfast; | 296 | ir_codes = &ir_codes_winfast_table; |
297 | ir->mask_keycode = 0x1f8; | 297 | ir->mask_keycode = 0x1f8; |
298 | break; | 298 | break; |
299 | case BTTV_BOARD_MAGICTVIEW061: | 299 | case BTTV_BOARD_MAGICTVIEW061: |
300 | case BTTV_BOARD_MAGICTVIEW063: | 300 | case BTTV_BOARD_MAGICTVIEW063: |
301 | ir_codes = ir_codes_winfast; | 301 | ir_codes = &ir_codes_winfast_table; |
302 | ir->mask_keycode = 0x0008e000; | 302 | ir->mask_keycode = 0x0008e000; |
303 | ir->mask_keydown = 0x00200000; | 303 | ir->mask_keydown = 0x00200000; |
304 | break; | 304 | break; |
305 | case BTTV_BOARD_APAC_VIEWCOMP: | 305 | case BTTV_BOARD_APAC_VIEWCOMP: |
306 | ir_codes = ir_codes_apac_viewcomp; | 306 | ir_codes = &ir_codes_apac_viewcomp_table; |
307 | ir->mask_keycode = 0x001f00; | 307 | ir->mask_keycode = 0x001f00; |
308 | ir->mask_keyup = 0x008000; | 308 | ir->mask_keyup = 0x008000; |
309 | ir->polling = 50; // ms | 309 | ir->polling = 50; // ms |
@@ -311,30 +311,30 @@ int bttv_input_init(struct bttv *btv) | |||
311 | case BTTV_BOARD_ASKEY_CPH03X: | 311 | case BTTV_BOARD_ASKEY_CPH03X: |
312 | case BTTV_BOARD_CONCEPTRONIC_CTVFMI2: | 312 | case BTTV_BOARD_CONCEPTRONIC_CTVFMI2: |
313 | case BTTV_BOARD_CONTVFMI: | 313 | case BTTV_BOARD_CONTVFMI: |
314 | ir_codes = ir_codes_pixelview; | 314 | ir_codes = &ir_codes_pixelview_table; |
315 | ir->mask_keycode = 0x001F00; | 315 | ir->mask_keycode = 0x001F00; |
316 | ir->mask_keyup = 0x006000; | 316 | ir->mask_keyup = 0x006000; |
317 | ir->polling = 50; // ms | 317 | ir->polling = 50; // ms |
318 | break; | 318 | break; |
319 | case BTTV_BOARD_NEBULA_DIGITV: | 319 | case BTTV_BOARD_NEBULA_DIGITV: |
320 | ir_codes = ir_codes_nebula; | 320 | ir_codes = &ir_codes_nebula_table; |
321 | btv->custom_irq = bttv_rc5_irq; | 321 | btv->custom_irq = bttv_rc5_irq; |
322 | ir->rc5_gpio = 1; | 322 | ir->rc5_gpio = 1; |
323 | break; | 323 | break; |
324 | case BTTV_BOARD_MACHTV_MAGICTV: | 324 | case BTTV_BOARD_MACHTV_MAGICTV: |
325 | ir_codes = ir_codes_apac_viewcomp; | 325 | ir_codes = &ir_codes_apac_viewcomp_table; |
326 | ir->mask_keycode = 0x001F00; | 326 | ir->mask_keycode = 0x001F00; |
327 | ir->mask_keyup = 0x004000; | 327 | ir->mask_keyup = 0x004000; |
328 | ir->polling = 50; /* ms */ | 328 | ir->polling = 50; /* ms */ |
329 | break; | 329 | break; |
330 | case BTTV_BOARD_KOZUMI_KTV_01C: | 330 | case BTTV_BOARD_KOZUMI_KTV_01C: |
331 | ir_codes = ir_codes_pctv_sedna; | 331 | ir_codes = &ir_codes_pctv_sedna_table; |
332 | ir->mask_keycode = 0x001f00; | 332 | ir->mask_keycode = 0x001f00; |
333 | ir->mask_keyup = 0x006000; | 333 | ir->mask_keyup = 0x006000; |
334 | ir->polling = 50; /* ms */ | 334 | ir->polling = 50; /* ms */ |
335 | break; | 335 | break; |
336 | case BTTV_BOARD_ENLTV_FM_2: | 336 | case BTTV_BOARD_ENLTV_FM_2: |
337 | ir_codes = ir_codes_encore_enltv2; | 337 | ir_codes = &ir_codes_encore_enltv2_table; |
338 | ir->mask_keycode = 0x00fd00; | 338 | ir->mask_keycode = 0x00fd00; |
339 | ir->mask_keyup = 0x000080; | 339 | ir->mask_keyup = 0x000080; |
340 | ir->polling = 1; /* ms */ | 340 | ir->polling = 1; /* ms */ |
diff --git a/drivers/media/video/cx18/cx18-i2c.c b/drivers/media/video/cx18/cx18-i2c.c index ba754e8056fb..766ddce5780f 100644 --- a/drivers/media/video/cx18/cx18-i2c.c +++ b/drivers/media/video/cx18/cx18-i2c.c | |||
@@ -111,7 +111,7 @@ static int cx18_i2c_new_ir(struct i2c_adapter *adap, u32 hw, const char *type, | |||
111 | switch (hw) { | 111 | switch (hw) { |
112 | case CX18_HW_Z8F0811_IR_RX_HAUP: | 112 | case CX18_HW_Z8F0811_IR_RX_HAUP: |
113 | memset(&ir_init_data, 0, sizeof(struct IR_i2c_init_data)); | 113 | memset(&ir_init_data, 0, sizeof(struct IR_i2c_init_data)); |
114 | ir_init_data.ir_codes = ir_codes_hauppauge_new; | 114 | ir_init_data.ir_codes = &ir_codes_hauppauge_new_table; |
115 | ir_init_data.internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR; | 115 | ir_init_data.internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR; |
116 | ir_init_data.type = IR_TYPE_RC5; | 116 | ir_init_data.type = IR_TYPE_RC5; |
117 | ir_init_data.name = "CX23418 Z8F0811 Hauppauge"; | 117 | ir_init_data.name = "CX23418 Z8F0811 Hauppauge"; |
diff --git a/drivers/media/video/cx231xx/cx231xx.h b/drivers/media/video/cx231xx/cx231xx.h index a0f823ac6b8d..64e2ddd3c401 100644 --- a/drivers/media/video/cx231xx/cx231xx.h +++ b/drivers/media/video/cx231xx/cx231xx.h | |||
@@ -282,7 +282,7 @@ struct cx231xx_board { | |||
282 | 282 | ||
283 | struct cx231xx_input input[MAX_CX231XX_INPUT]; | 283 | struct cx231xx_input input[MAX_CX231XX_INPUT]; |
284 | struct cx231xx_input radio; | 284 | struct cx231xx_input radio; |
285 | IR_KEYTAB_TYPE *ir_codes; | 285 | struct ir_scancode_table *ir_codes; |
286 | }; | 286 | }; |
287 | 287 | ||
288 | /* device states */ | 288 | /* device states */ |
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c index 79c4408a6171..78b3635178af 100644 --- a/drivers/media/video/cx88/cx88-input.c +++ b/drivers/media/video/cx88/cx88-input.c | |||
@@ -191,7 +191,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) | |||
191 | { | 191 | { |
192 | struct cx88_IR *ir; | 192 | struct cx88_IR *ir; |
193 | struct input_dev *input_dev; | 193 | struct input_dev *input_dev; |
194 | IR_KEYTAB_TYPE *ir_codes = NULL; | 194 | struct ir_scancode_table *ir_codes = NULL; |
195 | int ir_type = IR_TYPE_OTHER; | 195 | int ir_type = IR_TYPE_OTHER; |
196 | int err = -ENOMEM; | 196 | int err = -ENOMEM; |
197 | 197 | ||
@@ -207,14 +207,14 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) | |||
207 | case CX88_BOARD_DNTV_LIVE_DVB_T: | 207 | case CX88_BOARD_DNTV_LIVE_DVB_T: |
208 | case CX88_BOARD_KWORLD_DVB_T: | 208 | case CX88_BOARD_KWORLD_DVB_T: |
209 | case CX88_BOARD_KWORLD_DVB_T_CX22702: | 209 | case CX88_BOARD_KWORLD_DVB_T_CX22702: |
210 | ir_codes = ir_codes_dntv_live_dvb_t; | 210 | ir_codes = &ir_codes_dntv_live_dvb_t_table; |
211 | ir->gpio_addr = MO_GP1_IO; | 211 | ir->gpio_addr = MO_GP1_IO; |
212 | ir->mask_keycode = 0x1f; | 212 | ir->mask_keycode = 0x1f; |
213 | ir->mask_keyup = 0x60; | 213 | ir->mask_keyup = 0x60; |
214 | ir->polling = 50; /* ms */ | 214 | ir->polling = 50; /* ms */ |
215 | break; | 215 | break; |
216 | case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1: | 216 | case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1: |
217 | ir_codes = ir_codes_cinergy_1400; | 217 | ir_codes = &ir_codes_cinergy_1400_table; |
218 | ir_type = IR_TYPE_PD; | 218 | ir_type = IR_TYPE_PD; |
219 | ir->sampling = 0xeb04; /* address */ | 219 | ir->sampling = 0xeb04; /* address */ |
220 | break; | 220 | break; |
@@ -229,14 +229,14 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) | |||
229 | case CX88_BOARD_PCHDTV_HD3000: | 229 | case CX88_BOARD_PCHDTV_HD3000: |
230 | case CX88_BOARD_PCHDTV_HD5500: | 230 | case CX88_BOARD_PCHDTV_HD5500: |
231 | case CX88_BOARD_HAUPPAUGE_IRONLY: | 231 | case CX88_BOARD_HAUPPAUGE_IRONLY: |
232 | ir_codes = ir_codes_hauppauge_new; | 232 | ir_codes = &ir_codes_hauppauge_new_table; |
233 | ir_type = IR_TYPE_RC5; | 233 | ir_type = IR_TYPE_RC5; |
234 | ir->sampling = 1; | 234 | ir->sampling = 1; |
235 | break; | 235 | break; |
236 | case CX88_BOARD_WINFAST_DTV2000H: | 236 | case CX88_BOARD_WINFAST_DTV2000H: |
237 | case CX88_BOARD_WINFAST_DTV2000H_J: | 237 | case CX88_BOARD_WINFAST_DTV2000H_J: |
238 | case CX88_BOARD_WINFAST_DTV1800H: | 238 | case CX88_BOARD_WINFAST_DTV1800H: |
239 | ir_codes = ir_codes_winfast; | 239 | ir_codes = &ir_codes_winfast_table; |
240 | ir->gpio_addr = MO_GP0_IO; | 240 | ir->gpio_addr = MO_GP0_IO; |
241 | ir->mask_keycode = 0x8f8; | 241 | ir->mask_keycode = 0x8f8; |
242 | ir->mask_keyup = 0x100; | 242 | ir->mask_keyup = 0x100; |
@@ -245,14 +245,14 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) | |||
245 | case CX88_BOARD_WINFAST2000XP_EXPERT: | 245 | case CX88_BOARD_WINFAST2000XP_EXPERT: |
246 | case CX88_BOARD_WINFAST_DTV1000: | 246 | case CX88_BOARD_WINFAST_DTV1000: |
247 | case CX88_BOARD_WINFAST_TV2000_XP_GLOBAL: | 247 | case CX88_BOARD_WINFAST_TV2000_XP_GLOBAL: |
248 | ir_codes = ir_codes_winfast; | 248 | ir_codes = &ir_codes_winfast_table; |
249 | ir->gpio_addr = MO_GP0_IO; | 249 | ir->gpio_addr = MO_GP0_IO; |
250 | ir->mask_keycode = 0x8f8; | 250 | ir->mask_keycode = 0x8f8; |
251 | ir->mask_keyup = 0x100; | 251 | ir->mask_keyup = 0x100; |
252 | ir->polling = 1; /* ms */ | 252 | ir->polling = 1; /* ms */ |
253 | break; | 253 | break; |
254 | case CX88_BOARD_IODATA_GVBCTV7E: | 254 | case CX88_BOARD_IODATA_GVBCTV7E: |
255 | ir_codes = ir_codes_iodata_bctv7e; | 255 | ir_codes = &ir_codes_iodata_bctv7e_table; |
256 | ir->gpio_addr = MO_GP0_IO; | 256 | ir->gpio_addr = MO_GP0_IO; |
257 | ir->mask_keycode = 0xfd; | 257 | ir->mask_keycode = 0xfd; |
258 | ir->mask_keydown = 0x02; | 258 | ir->mask_keydown = 0x02; |
@@ -260,7 +260,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) | |||
260 | break; | 260 | break; |
261 | case CX88_BOARD_PROLINK_PLAYTVPVR: | 261 | case CX88_BOARD_PROLINK_PLAYTVPVR: |
262 | case CX88_BOARD_PIXELVIEW_PLAYTV_ULTRA_PRO: | 262 | case CX88_BOARD_PIXELVIEW_PLAYTV_ULTRA_PRO: |
263 | ir_codes = ir_codes_pixelview; | 263 | ir_codes = &ir_codes_pixelview_table; |
264 | ir->gpio_addr = MO_GP1_IO; | 264 | ir->gpio_addr = MO_GP1_IO; |
265 | ir->mask_keycode = 0x1f; | 265 | ir->mask_keycode = 0x1f; |
266 | ir->mask_keyup = 0x80; | 266 | ir->mask_keyup = 0x80; |
@@ -268,28 +268,28 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) | |||
268 | break; | 268 | break; |
269 | case CX88_BOARD_PROLINK_PV_8000GT: | 269 | case CX88_BOARD_PROLINK_PV_8000GT: |
270 | case CX88_BOARD_PROLINK_PV_GLOBAL_XTREME: | 270 | case CX88_BOARD_PROLINK_PV_GLOBAL_XTREME: |
271 | ir_codes = ir_codes_pixelview_new; | 271 | ir_codes = &ir_codes_pixelview_new_table; |
272 | ir->gpio_addr = MO_GP1_IO; | 272 | ir->gpio_addr = MO_GP1_IO; |
273 | ir->mask_keycode = 0x3f; | 273 | ir->mask_keycode = 0x3f; |
274 | ir->mask_keyup = 0x80; | 274 | ir->mask_keyup = 0x80; |
275 | ir->polling = 1; /* ms */ | 275 | ir->polling = 1; /* ms */ |
276 | break; | 276 | break; |
277 | case CX88_BOARD_KWORLD_LTV883: | 277 | case CX88_BOARD_KWORLD_LTV883: |
278 | ir_codes = ir_codes_pixelview; | 278 | ir_codes = &ir_codes_pixelview_table; |
279 | ir->gpio_addr = MO_GP1_IO; | 279 | ir->gpio_addr = MO_GP1_IO; |
280 | ir->mask_keycode = 0x1f; | 280 | ir->mask_keycode = 0x1f; |
281 | ir->mask_keyup = 0x60; | 281 | ir->mask_keyup = 0x60; |
282 | ir->polling = 1; /* ms */ | 282 | ir->polling = 1; /* ms */ |
283 | break; | 283 | break; |
284 | case CX88_BOARD_ADSTECH_DVB_T_PCI: | 284 | case CX88_BOARD_ADSTECH_DVB_T_PCI: |
285 | ir_codes = ir_codes_adstech_dvb_t_pci; | 285 | ir_codes = &ir_codes_adstech_dvb_t_pci_table; |
286 | ir->gpio_addr = MO_GP1_IO; | 286 | ir->gpio_addr = MO_GP1_IO; |
287 | ir->mask_keycode = 0xbf; | 287 | ir->mask_keycode = 0xbf; |
288 | ir->mask_keyup = 0x40; | 288 | ir->mask_keyup = 0x40; |
289 | ir->polling = 50; /* ms */ | 289 | ir->polling = 50; /* ms */ |
290 | break; | 290 | break; |
291 | case CX88_BOARD_MSI_TVANYWHERE_MASTER: | 291 | case CX88_BOARD_MSI_TVANYWHERE_MASTER: |
292 | ir_codes = ir_codes_msi_tvanywhere; | 292 | ir_codes = &ir_codes_msi_tvanywhere_table; |
293 | ir->gpio_addr = MO_GP1_IO; | 293 | ir->gpio_addr = MO_GP1_IO; |
294 | ir->mask_keycode = 0x1f; | 294 | ir->mask_keycode = 0x1f; |
295 | ir->mask_keyup = 0x40; | 295 | ir->mask_keyup = 0x40; |
@@ -297,40 +297,40 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) | |||
297 | break; | 297 | break; |
298 | case CX88_BOARD_AVERTV_303: | 298 | case CX88_BOARD_AVERTV_303: |
299 | case CX88_BOARD_AVERTV_STUDIO_303: | 299 | case CX88_BOARD_AVERTV_STUDIO_303: |
300 | ir_codes = ir_codes_avertv_303; | 300 | ir_codes = &ir_codes_avertv_303_table; |
301 | ir->gpio_addr = MO_GP2_IO; | 301 | ir->gpio_addr = MO_GP2_IO; |
302 | ir->mask_keycode = 0xfb; | 302 | ir->mask_keycode = 0xfb; |
303 | ir->mask_keydown = 0x02; | 303 | ir->mask_keydown = 0x02; |
304 | ir->polling = 50; /* ms */ | 304 | ir->polling = 50; /* ms */ |
305 | break; | 305 | break; |
306 | case CX88_BOARD_DNTV_LIVE_DVB_T_PRO: | 306 | case CX88_BOARD_DNTV_LIVE_DVB_T_PRO: |
307 | ir_codes = ir_codes_dntv_live_dvbt_pro; | 307 | ir_codes = &ir_codes_dntv_live_dvbt_pro_table; |
308 | ir_type = IR_TYPE_PD; | 308 | ir_type = IR_TYPE_PD; |
309 | ir->sampling = 0xff00; /* address */ | 309 | ir->sampling = 0xff00; /* address */ |
310 | break; | 310 | break; |
311 | case CX88_BOARD_NORWOOD_MICRO: | 311 | case CX88_BOARD_NORWOOD_MICRO: |
312 | ir_codes = ir_codes_norwood; | 312 | ir_codes = &ir_codes_norwood_table; |
313 | ir->gpio_addr = MO_GP1_IO; | 313 | ir->gpio_addr = MO_GP1_IO; |
314 | ir->mask_keycode = 0x0e; | 314 | ir->mask_keycode = 0x0e; |
315 | ir->mask_keyup = 0x80; | 315 | ir->mask_keyup = 0x80; |
316 | ir->polling = 50; /* ms */ | 316 | ir->polling = 50; /* ms */ |
317 | break; | 317 | break; |
318 | case CX88_BOARD_NPGTECH_REALTV_TOP10FM: | 318 | case CX88_BOARD_NPGTECH_REALTV_TOP10FM: |
319 | ir_codes = ir_codes_npgtech; | 319 | ir_codes = &ir_codes_npgtech_table; |
320 | ir->gpio_addr = MO_GP0_IO; | 320 | ir->gpio_addr = MO_GP0_IO; |
321 | ir->mask_keycode = 0xfa; | 321 | ir->mask_keycode = 0xfa; |
322 | ir->polling = 50; /* ms */ | 322 | ir->polling = 50; /* ms */ |
323 | break; | 323 | break; |
324 | case CX88_BOARD_PINNACLE_PCTV_HD_800i: | 324 | case CX88_BOARD_PINNACLE_PCTV_HD_800i: |
325 | ir_codes = ir_codes_pinnacle_pctv_hd; | 325 | ir_codes = &ir_codes_pinnacle_pctv_hd_table; |
326 | ir_type = IR_TYPE_RC5; | 326 | ir_type = IR_TYPE_RC5; |
327 | ir->sampling = 1; | 327 | ir->sampling = 1; |
328 | break; | 328 | break; |
329 | case CX88_BOARD_POWERCOLOR_REAL_ANGEL: | 329 | case CX88_BOARD_POWERCOLOR_REAL_ANGEL: |
330 | ir_codes = ir_codes_powercolor_real_angel; | 330 | ir_codes = &ir_codes_powercolor_real_angel_table; |
331 | ir->gpio_addr = MO_GP2_IO; | 331 | ir->gpio_addr = MO_GP2_IO; |
332 | ir->mask_keycode = 0x7e; | 332 | ir->mask_keycode = 0x7e; |
333 | ir->polling = 100; /* ms */ | 333 | ir->polling = 100; /* ms */ |
334 | break; | 334 | break; |
335 | } | 335 | } |
336 | 336 | ||
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index b184d482c497..f46b8a5c3a61 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c | |||
@@ -562,7 +562,7 @@ struct em28xx_board em28xx_boards[] = { | |||
562 | .name = "Gadmei UTV330+", | 562 | .name = "Gadmei UTV330+", |
563 | .tuner_type = TUNER_TNF_5335MF, | 563 | .tuner_type = TUNER_TNF_5335MF, |
564 | .tda9887_conf = TDA9887_PRESENT, | 564 | .tda9887_conf = TDA9887_PRESENT, |
565 | .ir_codes = ir_codes_gadmei_rm008z, | 565 | .ir_codes = &ir_codes_gadmei_rm008z_table, |
566 | .decoder = EM28XX_SAA711X, | 566 | .decoder = EM28XX_SAA711X, |
567 | .xclk = EM28XX_XCLK_FREQUENCY_12MHZ, | 567 | .xclk = EM28XX_XCLK_FREQUENCY_12MHZ, |
568 | .input = { { | 568 | .input = { { |
@@ -736,7 +736,7 @@ struct em28xx_board em28xx_boards[] = { | |||
736 | .mts_firmware = 1, | 736 | .mts_firmware = 1, |
737 | .has_dvb = 1, | 737 | .has_dvb = 1, |
738 | .dvb_gpio = hauppauge_wintv_hvr_900_digital, | 738 | .dvb_gpio = hauppauge_wintv_hvr_900_digital, |
739 | .ir_codes = ir_codes_hauppauge_new, | 739 | .ir_codes = &ir_codes_hauppauge_new_table, |
740 | .decoder = EM28XX_TVP5150, | 740 | .decoder = EM28XX_TVP5150, |
741 | .input = { { | 741 | .input = { { |
742 | .type = EM28XX_VMUX_TELEVISION, | 742 | .type = EM28XX_VMUX_TELEVISION, |
@@ -761,7 +761,7 @@ struct em28xx_board em28xx_boards[] = { | |||
761 | .tuner_type = TUNER_XC2028, | 761 | .tuner_type = TUNER_XC2028, |
762 | .tuner_gpio = default_tuner_gpio, | 762 | .tuner_gpio = default_tuner_gpio, |
763 | .mts_firmware = 1, | 763 | .mts_firmware = 1, |
764 | .ir_codes = ir_codes_hauppauge_new, | 764 | .ir_codes = &ir_codes_hauppauge_new_table, |
765 | .decoder = EM28XX_TVP5150, | 765 | .decoder = EM28XX_TVP5150, |
766 | .input = { { | 766 | .input = { { |
767 | .type = EM28XX_VMUX_TELEVISION, | 767 | .type = EM28XX_VMUX_TELEVISION, |
@@ -787,7 +787,7 @@ struct em28xx_board em28xx_boards[] = { | |||
787 | .mts_firmware = 1, | 787 | .mts_firmware = 1, |
788 | .has_dvb = 1, | 788 | .has_dvb = 1, |
789 | .dvb_gpio = hauppauge_wintv_hvr_900_digital, | 789 | .dvb_gpio = hauppauge_wintv_hvr_900_digital, |
790 | .ir_codes = ir_codes_hauppauge_new, | 790 | .ir_codes = &ir_codes_hauppauge_new_table, |
791 | .decoder = EM28XX_TVP5150, | 791 | .decoder = EM28XX_TVP5150, |
792 | .input = { { | 792 | .input = { { |
793 | .type = EM28XX_VMUX_TELEVISION, | 793 | .type = EM28XX_VMUX_TELEVISION, |
@@ -813,7 +813,7 @@ struct em28xx_board em28xx_boards[] = { | |||
813 | .mts_firmware = 1, | 813 | .mts_firmware = 1, |
814 | .has_dvb = 1, | 814 | .has_dvb = 1, |
815 | .dvb_gpio = hauppauge_wintv_hvr_900_digital, | 815 | .dvb_gpio = hauppauge_wintv_hvr_900_digital, |
816 | .ir_codes = ir_codes_hauppauge_new, | 816 | .ir_codes = &ir_codes_hauppauge_new_table, |
817 | .decoder = EM28XX_TVP5150, | 817 | .decoder = EM28XX_TVP5150, |
818 | .input = { { | 818 | .input = { { |
819 | .type = EM28XX_VMUX_TELEVISION, | 819 | .type = EM28XX_VMUX_TELEVISION, |
@@ -839,7 +839,7 @@ struct em28xx_board em28xx_boards[] = { | |||
839 | .mts_firmware = 1, | 839 | .mts_firmware = 1, |
840 | .has_dvb = 1, | 840 | .has_dvb = 1, |
841 | .dvb_gpio = hauppauge_wintv_hvr_900_digital, | 841 | .dvb_gpio = hauppauge_wintv_hvr_900_digital, |
842 | .ir_codes = ir_codes_pinnacle_pctv_hd, | 842 | .ir_codes = &ir_codes_pinnacle_pctv_hd_table, |
843 | .decoder = EM28XX_TVP5150, | 843 | .decoder = EM28XX_TVP5150, |
844 | .input = { { | 844 | .input = { { |
845 | .type = EM28XX_VMUX_TELEVISION, | 845 | .type = EM28XX_VMUX_TELEVISION, |
@@ -865,7 +865,7 @@ struct em28xx_board em28xx_boards[] = { | |||
865 | .mts_firmware = 1, | 865 | .mts_firmware = 1, |
866 | .has_dvb = 1, | 866 | .has_dvb = 1, |
867 | .dvb_gpio = hauppauge_wintv_hvr_900_digital, | 867 | .dvb_gpio = hauppauge_wintv_hvr_900_digital, |
868 | .ir_codes = ir_codes_ati_tv_wonder_hd_600, | 868 | .ir_codes = &ir_codes_ati_tv_wonder_hd_600_table, |
869 | .decoder = EM28XX_TVP5150, | 869 | .decoder = EM28XX_TVP5150, |
870 | .input = { { | 870 | .input = { { |
871 | .type = EM28XX_VMUX_TELEVISION, | 871 | .type = EM28XX_VMUX_TELEVISION, |
@@ -891,7 +891,7 @@ struct em28xx_board em28xx_boards[] = { | |||
891 | .decoder = EM28XX_TVP5150, | 891 | .decoder = EM28XX_TVP5150, |
892 | .has_dvb = 1, | 892 | .has_dvb = 1, |
893 | .dvb_gpio = default_digital, | 893 | .dvb_gpio = default_digital, |
894 | .ir_codes = ir_codes_terratec_cinergy_xs, | 894 | .ir_codes = &ir_codes_terratec_cinergy_xs_table, |
895 | .xclk = EM28XX_XCLK_FREQUENCY_12MHZ, /* NEC IR */ | 895 | .xclk = EM28XX_XCLK_FREQUENCY_12MHZ, /* NEC IR */ |
896 | .input = { { | 896 | .input = { { |
897 | .type = EM28XX_VMUX_TELEVISION, | 897 | .type = EM28XX_VMUX_TELEVISION, |
@@ -1443,7 +1443,7 @@ struct em28xx_board em28xx_boards[] = { | |||
1443 | .mts_firmware = 1, | 1443 | .mts_firmware = 1, |
1444 | .decoder = EM28XX_TVP5150, | 1444 | .decoder = EM28XX_TVP5150, |
1445 | .tuner_gpio = default_tuner_gpio, | 1445 | .tuner_gpio = default_tuner_gpio, |
1446 | .ir_codes = ir_codes_kaiomy, | 1446 | .ir_codes = &ir_codes_kaiomy_table, |
1447 | .input = { { | 1447 | .input = { { |
1448 | .type = EM28XX_VMUX_TELEVISION, | 1448 | .type = EM28XX_VMUX_TELEVISION, |
1449 | .vmux = TVP5150_COMPOSITE0, | 1449 | .vmux = TVP5150_COMPOSITE0, |
@@ -1543,7 +1543,7 @@ struct em28xx_board em28xx_boards[] = { | |||
1543 | .mts_firmware = 1, | 1543 | .mts_firmware = 1, |
1544 | .has_dvb = 1, | 1544 | .has_dvb = 1, |
1545 | .dvb_gpio = evga_indtube_digital, | 1545 | .dvb_gpio = evga_indtube_digital, |
1546 | .ir_codes = ir_codes_evga_indtube, | 1546 | .ir_codes = &ir_codes_evga_indtube_table, |
1547 | .input = { { | 1547 | .input = { { |
1548 | .type = EM28XX_VMUX_TELEVISION, | 1548 | .type = EM28XX_VMUX_TELEVISION, |
1549 | .vmux = TVP5150_COMPOSITE0, | 1549 | .vmux = TVP5150_COMPOSITE0, |
@@ -2217,17 +2217,17 @@ void em28xx_register_i2c_ir(struct em28xx *dev) | |||
2217 | break; | 2217 | break; |
2218 | case (EM2800_BOARD_TERRATEC_CINERGY_200): | 2218 | case (EM2800_BOARD_TERRATEC_CINERGY_200): |
2219 | case (EM2820_BOARD_TERRATEC_CINERGY_250): | 2219 | case (EM2820_BOARD_TERRATEC_CINERGY_250): |
2220 | init_data.ir_codes = ir_codes_em_terratec; | 2220 | init_data.ir_codes = &ir_codes_em_terratec_table; |
2221 | init_data.get_key = em28xx_get_key_terratec; | 2221 | init_data.get_key = em28xx_get_key_terratec; |
2222 | init_data.name = "i2c IR (EM28XX Terratec)"; | 2222 | init_data.name = "i2c IR (EM28XX Terratec)"; |
2223 | break; | 2223 | break; |
2224 | case (EM2820_BOARD_PINNACLE_USB_2): | 2224 | case (EM2820_BOARD_PINNACLE_USB_2): |
2225 | init_data.ir_codes = ir_codes_pinnacle_grey; | 2225 | init_data.ir_codes = &ir_codes_pinnacle_grey_table; |
2226 | init_data.get_key = em28xx_get_key_pinnacle_usb_grey; | 2226 | init_data.get_key = em28xx_get_key_pinnacle_usb_grey; |
2227 | init_data.name = "i2c IR (EM28XX Pinnacle PCTV)"; | 2227 | init_data.name = "i2c IR (EM28XX Pinnacle PCTV)"; |
2228 | break; | 2228 | break; |
2229 | case (EM2820_BOARD_HAUPPAUGE_WINTV_USB_2): | 2229 | case (EM2820_BOARD_HAUPPAUGE_WINTV_USB_2): |
2230 | init_data.ir_codes = ir_codes_hauppauge_new; | 2230 | init_data.ir_codes = &ir_codes_hauppauge_new_table; |
2231 | init_data.get_key = em28xx_get_key_em_haup; | 2231 | init_data.get_key = em28xx_get_key_em_haup; |
2232 | init_data.name = "i2c IR (EM2840 Hauppauge)"; | 2232 | init_data.name = "i2c IR (EM2840 Hauppauge)"; |
2233 | break; | 2233 | break; |
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h index 23f34dd691e9..217f948e03d7 100644 --- a/drivers/media/video/em28xx/em28xx.h +++ b/drivers/media/video/em28xx/em28xx.h | |||
@@ -409,7 +409,7 @@ struct em28xx_board { | |||
409 | 409 | ||
410 | struct em28xx_input input[MAX_EM28XX_INPUT]; | 410 | struct em28xx_input input[MAX_EM28XX_INPUT]; |
411 | struct em28xx_input radio; | 411 | struct em28xx_input radio; |
412 | IR_KEYTAB_TYPE *ir_codes; | 412 | struct ir_scancode_table *ir_codes; |
413 | }; | 413 | }; |
414 | 414 | ||
415 | struct em28xx_eeprom { | 415 | struct em28xx_eeprom { |
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c index b92ddcabf0b6..247d3115a9b7 100644 --- a/drivers/media/video/ir-kbd-i2c.c +++ b/drivers/media/video/ir-kbd-i2c.c | |||
@@ -297,7 +297,7 @@ static void ir_work(struct work_struct *work) | |||
297 | 297 | ||
298 | static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) | 298 | static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) |
299 | { | 299 | { |
300 | IR_KEYTAB_TYPE *ir_codes = NULL; | 300 | struct ir_scancode_table *ir_codes = NULL; |
301 | const char *name = NULL; | 301 | const char *name = NULL; |
302 | int ir_type; | 302 | int ir_type; |
303 | struct IR_i2c *ir; | 303 | struct IR_i2c *ir; |
@@ -322,13 +322,13 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) | |||
322 | name = "Pixelview"; | 322 | name = "Pixelview"; |
323 | ir->get_key = get_key_pixelview; | 323 | ir->get_key = get_key_pixelview; |
324 | ir_type = IR_TYPE_OTHER; | 324 | ir_type = IR_TYPE_OTHER; |
325 | ir_codes = ir_codes_empty; | 325 | ir_codes = &ir_codes_empty_table; |
326 | break; | 326 | break; |
327 | case 0x4b: | 327 | case 0x4b: |
328 | name = "PV951"; | 328 | name = "PV951"; |
329 | ir->get_key = get_key_pv951; | 329 | ir->get_key = get_key_pv951; |
330 | ir_type = IR_TYPE_OTHER; | 330 | ir_type = IR_TYPE_OTHER; |
331 | ir_codes = ir_codes_pv951; | 331 | ir_codes = &ir_codes_pv951_table; |
332 | break; | 332 | break; |
333 | case 0x18: | 333 | case 0x18: |
334 | case 0x1a: | 334 | case 0x1a: |
@@ -336,22 +336,22 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) | |||
336 | ir->get_key = get_key_haup; | 336 | ir->get_key = get_key_haup; |
337 | ir_type = IR_TYPE_RC5; | 337 | ir_type = IR_TYPE_RC5; |
338 | if (hauppauge == 1) { | 338 | if (hauppauge == 1) { |
339 | ir_codes = ir_codes_hauppauge_new; | 339 | ir_codes = &ir_codes_hauppauge_new_table; |
340 | } else { | 340 | } else { |
341 | ir_codes = ir_codes_rc5_tv; | 341 | ir_codes = &ir_codes_rc5_tv_table; |
342 | } | 342 | } |
343 | break; | 343 | break; |
344 | case 0x30: | 344 | case 0x30: |
345 | name = "KNC One"; | 345 | name = "KNC One"; |
346 | ir->get_key = get_key_knc1; | 346 | ir->get_key = get_key_knc1; |
347 | ir_type = IR_TYPE_OTHER; | 347 | ir_type = IR_TYPE_OTHER; |
348 | ir_codes = ir_codes_empty; | 348 | ir_codes = &ir_codes_empty_table; |
349 | break; | 349 | break; |
350 | case 0x6b: | 350 | case 0x6b: |
351 | name = "FusionHDTV"; | 351 | name = "FusionHDTV"; |
352 | ir->get_key = get_key_fusionhdtv; | 352 | ir->get_key = get_key_fusionhdtv; |
353 | ir_type = IR_TYPE_RC5; | 353 | ir_type = IR_TYPE_RC5; |
354 | ir_codes = ir_codes_fusionhdtv_mce; | 354 | ir_codes = &ir_codes_fusionhdtv_mce_table; |
355 | break; | 355 | break; |
356 | case 0x7a: | 356 | case 0x7a: |
357 | case 0x47: | 357 | case 0x47: |
@@ -365,9 +365,9 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) | |||
365 | ir_type = IR_TYPE_RC5; | 365 | ir_type = IR_TYPE_RC5; |
366 | ir->get_key = get_key_haup_xvr; | 366 | ir->get_key = get_key_haup_xvr; |
367 | if (hauppauge == 1) { | 367 | if (hauppauge == 1) { |
368 | ir_codes = ir_codes_hauppauge_new; | 368 | ir_codes = &ir_codes_hauppauge_new_table; |
369 | } else { | 369 | } else { |
370 | ir_codes = ir_codes_rc5_tv; | 370 | ir_codes = &ir_codes_rc5_tv_table; |
371 | } | 371 | } |
372 | } else { | 372 | } else { |
373 | /* Handled by saa7134-input */ | 373 | /* Handled by saa7134-input */ |
@@ -379,7 +379,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) | |||
379 | name = "AVerMedia Cardbus remote"; | 379 | name = "AVerMedia Cardbus remote"; |
380 | ir->get_key = get_key_avermedia_cardbus; | 380 | ir->get_key = get_key_avermedia_cardbus; |
381 | ir_type = IR_TYPE_OTHER; | 381 | ir_type = IR_TYPE_OTHER; |
382 | ir_codes = ir_codes_avermedia_cardbus; | 382 | ir_codes = &ir_codes_avermedia_cardbus_table; |
383 | break; | 383 | break; |
384 | default: | 384 | default: |
385 | dprintk(1, DEVNAME ": Unsupported i2c address 0x%02x\n", addr); | 385 | dprintk(1, DEVNAME ": Unsupported i2c address 0x%02x\n", addr); |
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c index 65fb7b17b678..9070e5fabb4e 100644 --- a/drivers/media/video/saa7134/saa7134-input.c +++ b/drivers/media/video/saa7134/saa7134-input.c | |||
@@ -394,7 +394,7 @@ int saa7134_input_init1(struct saa7134_dev *dev) | |||
394 | { | 394 | { |
395 | struct card_ir *ir; | 395 | struct card_ir *ir; |
396 | struct input_dev *input_dev; | 396 | struct input_dev *input_dev; |
397 | IR_KEYTAB_TYPE *ir_codes = NULL; | 397 | struct ir_scancode_table *ir_codes = NULL; |
398 | u32 mask_keycode = 0; | 398 | u32 mask_keycode = 0; |
399 | u32 mask_keydown = 0; | 399 | u32 mask_keydown = 0; |
400 | u32 mask_keyup = 0; | 400 | u32 mask_keyup = 0; |
@@ -416,27 +416,27 @@ int saa7134_input_init1(struct saa7134_dev *dev) | |||
416 | case SAA7134_BOARD_FLYTVPLATINUM_FM: | 416 | case SAA7134_BOARD_FLYTVPLATINUM_FM: |
417 | case SAA7134_BOARD_FLYTVPLATINUM_MINI2: | 417 | case SAA7134_BOARD_FLYTVPLATINUM_MINI2: |
418 | case SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM: | 418 | case SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM: |
419 | ir_codes = ir_codes_flyvideo; | 419 | ir_codes = &ir_codes_flyvideo_table; |
420 | mask_keycode = 0xEC00000; | 420 | mask_keycode = 0xEC00000; |
421 | mask_keydown = 0x0040000; | 421 | mask_keydown = 0x0040000; |
422 | break; | 422 | break; |
423 | case SAA7134_BOARD_CINERGY400: | 423 | case SAA7134_BOARD_CINERGY400: |
424 | case SAA7134_BOARD_CINERGY600: | 424 | case SAA7134_BOARD_CINERGY600: |
425 | case SAA7134_BOARD_CINERGY600_MK3: | 425 | case SAA7134_BOARD_CINERGY600_MK3: |
426 | ir_codes = ir_codes_cinergy; | 426 | ir_codes = &ir_codes_cinergy_table; |
427 | mask_keycode = 0x00003f; | 427 | mask_keycode = 0x00003f; |
428 | mask_keyup = 0x040000; | 428 | mask_keyup = 0x040000; |
429 | break; | 429 | break; |
430 | case SAA7134_BOARD_ECS_TVP3XP: | 430 | case SAA7134_BOARD_ECS_TVP3XP: |
431 | case SAA7134_BOARD_ECS_TVP3XP_4CB5: | 431 | case SAA7134_BOARD_ECS_TVP3XP_4CB5: |
432 | ir_codes = ir_codes_eztv; | 432 | ir_codes = &ir_codes_eztv_table; |
433 | mask_keycode = 0x00017c; | 433 | mask_keycode = 0x00017c; |
434 | mask_keyup = 0x000002; | 434 | mask_keyup = 0x000002; |
435 | polling = 50; // ms | 435 | polling = 50; // ms |
436 | break; | 436 | break; |
437 | case SAA7134_BOARD_KWORLD_XPERT: | 437 | case SAA7134_BOARD_KWORLD_XPERT: |
438 | case SAA7134_BOARD_AVACSSMARTTV: | 438 | case SAA7134_BOARD_AVACSSMARTTV: |
439 | ir_codes = ir_codes_pixelview; | 439 | ir_codes = &ir_codes_pixelview_table; |
440 | mask_keycode = 0x00001F; | 440 | mask_keycode = 0x00001F; |
441 | mask_keyup = 0x000020; | 441 | mask_keyup = 0x000020; |
442 | polling = 50; // ms | 442 | polling = 50; // ms |
@@ -453,7 +453,7 @@ int saa7134_input_init1(struct saa7134_dev *dev) | |||
453 | case SAA7134_BOARD_AVERMEDIA_GO_007_FM: | 453 | case SAA7134_BOARD_AVERMEDIA_GO_007_FM: |
454 | case SAA7134_BOARD_AVERMEDIA_M102: | 454 | case SAA7134_BOARD_AVERMEDIA_M102: |
455 | case SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS: | 455 | case SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS: |
456 | ir_codes = ir_codes_avermedia; | 456 | ir_codes = &ir_codes_avermedia_table; |
457 | mask_keycode = 0x0007C8; | 457 | mask_keycode = 0x0007C8; |
458 | mask_keydown = 0x000010; | 458 | mask_keydown = 0x000010; |
459 | polling = 50; // ms | 459 | polling = 50; // ms |
@@ -462,14 +462,14 @@ int saa7134_input_init1(struct saa7134_dev *dev) | |||
462 | saa_setb(SAA7134_GPIO_GPSTATUS0, 0x4); | 462 | saa_setb(SAA7134_GPIO_GPSTATUS0, 0x4); |
463 | break; | 463 | break; |
464 | case SAA7134_BOARD_AVERMEDIA_M135A: | 464 | case SAA7134_BOARD_AVERMEDIA_M135A: |
465 | ir_codes = ir_codes_avermedia_m135a; | 465 | ir_codes = &ir_codes_avermedia_m135a_table; |
466 | mask_keydown = 0x0040000; | 466 | mask_keydown = 0x0040000; |
467 | mask_keycode = 0x00013f; | 467 | mask_keycode = 0x00013f; |
468 | nec_gpio = 1; | 468 | nec_gpio = 1; |
469 | break; | 469 | break; |
470 | case SAA7134_BOARD_AVERMEDIA_777: | 470 | case SAA7134_BOARD_AVERMEDIA_777: |
471 | case SAA7134_BOARD_AVERMEDIA_A16AR: | 471 | case SAA7134_BOARD_AVERMEDIA_A16AR: |
472 | ir_codes = ir_codes_avermedia; | 472 | ir_codes = &ir_codes_avermedia_table; |
473 | mask_keycode = 0x02F200; | 473 | mask_keycode = 0x02F200; |
474 | mask_keydown = 0x000400; | 474 | mask_keydown = 0x000400; |
475 | polling = 50; // ms | 475 | polling = 50; // ms |
@@ -478,7 +478,7 @@ int saa7134_input_init1(struct saa7134_dev *dev) | |||
478 | saa_setb(SAA7134_GPIO_GPSTATUS1, 0x1); | 478 | saa_setb(SAA7134_GPIO_GPSTATUS1, 0x1); |
479 | break; | 479 | break; |
480 | case SAA7134_BOARD_AVERMEDIA_A16D: | 480 | case SAA7134_BOARD_AVERMEDIA_A16D: |
481 | ir_codes = ir_codes_avermedia_a16d; | 481 | ir_codes = &ir_codes_avermedia_a16d_table; |
482 | mask_keycode = 0x02F200; | 482 | mask_keycode = 0x02F200; |
483 | mask_keydown = 0x000400; | 483 | mask_keydown = 0x000400; |
484 | polling = 50; /* ms */ | 484 | polling = 50; /* ms */ |
@@ -487,14 +487,14 @@ int saa7134_input_init1(struct saa7134_dev *dev) | |||
487 | saa_setb(SAA7134_GPIO_GPSTATUS1, 0x1); | 487 | saa_setb(SAA7134_GPIO_GPSTATUS1, 0x1); |
488 | break; | 488 | break; |
489 | case SAA7134_BOARD_KWORLD_TERMINATOR: | 489 | case SAA7134_BOARD_KWORLD_TERMINATOR: |
490 | ir_codes = ir_codes_pixelview; | 490 | ir_codes = &ir_codes_pixelview_table; |
491 | mask_keycode = 0x00001f; | 491 | mask_keycode = 0x00001f; |
492 | mask_keyup = 0x000060; | 492 | mask_keyup = 0x000060; |
493 | polling = 50; // ms | 493 | polling = 50; // ms |
494 | break; | 494 | break; |
495 | case SAA7134_BOARD_MANLI_MTV001: | 495 | case SAA7134_BOARD_MANLI_MTV001: |
496 | case SAA7134_BOARD_MANLI_MTV002: | 496 | case SAA7134_BOARD_MANLI_MTV002: |
497 | ir_codes = ir_codes_manli; | 497 | ir_codes = &ir_codes_manli_table; |
498 | mask_keycode = 0x001f00; | 498 | mask_keycode = 0x001f00; |
499 | mask_keyup = 0x004000; | 499 | mask_keyup = 0x004000; |
500 | polling = 50; /* ms */ | 500 | polling = 50; /* ms */ |
@@ -513,25 +513,25 @@ int saa7134_input_init1(struct saa7134_dev *dev) | |||
513 | case SAA7134_BOARD_BEHOLD_507_9FM: | 513 | case SAA7134_BOARD_BEHOLD_507_9FM: |
514 | case SAA7134_BOARD_BEHOLD_507RDS_MK3: | 514 | case SAA7134_BOARD_BEHOLD_507RDS_MK3: |
515 | case SAA7134_BOARD_BEHOLD_507RDS_MK5: | 515 | case SAA7134_BOARD_BEHOLD_507RDS_MK5: |
516 | ir_codes = ir_codes_manli; | 516 | ir_codes = &ir_codes_manli_table; |
517 | mask_keycode = 0x003f00; | 517 | mask_keycode = 0x003f00; |
518 | mask_keyup = 0x004000; | 518 | mask_keyup = 0x004000; |
519 | polling = 50; /* ms */ | 519 | polling = 50; /* ms */ |
520 | break; | 520 | break; |
521 | case SAA7134_BOARD_BEHOLD_COLUMBUS_TVFM: | 521 | case SAA7134_BOARD_BEHOLD_COLUMBUS_TVFM: |
522 | ir_codes = ir_codes_behold_columbus; | 522 | ir_codes = &ir_codes_behold_columbus_table; |
523 | mask_keycode = 0x003f00; | 523 | mask_keycode = 0x003f00; |
524 | mask_keyup = 0x004000; | 524 | mask_keyup = 0x004000; |
525 | polling = 50; // ms | 525 | polling = 50; // ms |
526 | break; | 526 | break; |
527 | case SAA7134_BOARD_SEDNA_PC_TV_CARDBUS: | 527 | case SAA7134_BOARD_SEDNA_PC_TV_CARDBUS: |
528 | ir_codes = ir_codes_pctv_sedna; | 528 | ir_codes = &ir_codes_pctv_sedna_table; |
529 | mask_keycode = 0x001f00; | 529 | mask_keycode = 0x001f00; |
530 | mask_keyup = 0x004000; | 530 | mask_keyup = 0x004000; |
531 | polling = 50; // ms | 531 | polling = 50; // ms |
532 | break; | 532 | break; |
533 | case SAA7134_BOARD_GOTVIEW_7135: | 533 | case SAA7134_BOARD_GOTVIEW_7135: |
534 | ir_codes = ir_codes_gotview7135; | 534 | ir_codes = &ir_codes_gotview7135_table; |
535 | mask_keycode = 0x0003CC; | 535 | mask_keycode = 0x0003CC; |
536 | mask_keydown = 0x000010; | 536 | mask_keydown = 0x000010; |
537 | polling = 5; /* ms */ | 537 | polling = 5; /* ms */ |
@@ -540,75 +540,75 @@ int saa7134_input_init1(struct saa7134_dev *dev) | |||
540 | case SAA7134_BOARD_VIDEOMATE_TV_PVR: | 540 | case SAA7134_BOARD_VIDEOMATE_TV_PVR: |
541 | case SAA7134_BOARD_VIDEOMATE_GOLD_PLUS: | 541 | case SAA7134_BOARD_VIDEOMATE_GOLD_PLUS: |
542 | case SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUSII: | 542 | case SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUSII: |
543 | ir_codes = ir_codes_videomate_tv_pvr; | 543 | ir_codes = &ir_codes_videomate_tv_pvr_table; |
544 | mask_keycode = 0x00003F; | 544 | mask_keycode = 0x00003F; |
545 | mask_keyup = 0x400000; | 545 | mask_keyup = 0x400000; |
546 | polling = 50; // ms | 546 | polling = 50; // ms |
547 | break; | 547 | break; |
548 | case SAA7134_BOARD_PROTEUS_2309: | 548 | case SAA7134_BOARD_PROTEUS_2309: |
549 | ir_codes = ir_codes_proteus_2309; | 549 | ir_codes = &ir_codes_proteus_2309_table; |
550 | mask_keycode = 0x00007F; | 550 | mask_keycode = 0x00007F; |
551 | mask_keyup = 0x000080; | 551 | mask_keyup = 0x000080; |
552 | polling = 50; // ms | 552 | polling = 50; // ms |
553 | break; | 553 | break; |
554 | case SAA7134_BOARD_VIDEOMATE_DVBT_300: | 554 | case SAA7134_BOARD_VIDEOMATE_DVBT_300: |
555 | case SAA7134_BOARD_VIDEOMATE_DVBT_200: | 555 | case SAA7134_BOARD_VIDEOMATE_DVBT_200: |
556 | ir_codes = ir_codes_videomate_tv_pvr; | 556 | ir_codes = &ir_codes_videomate_tv_pvr_table; |
557 | mask_keycode = 0x003F00; | 557 | mask_keycode = 0x003F00; |
558 | mask_keyup = 0x040000; | 558 | mask_keyup = 0x040000; |
559 | break; | 559 | break; |
560 | case SAA7134_BOARD_FLYDVBS_LR300: | 560 | case SAA7134_BOARD_FLYDVBS_LR300: |
561 | case SAA7134_BOARD_FLYDVBT_LR301: | 561 | case SAA7134_BOARD_FLYDVBT_LR301: |
562 | case SAA7134_BOARD_FLYDVBTDUO: | 562 | case SAA7134_BOARD_FLYDVBTDUO: |
563 | ir_codes = ir_codes_flydvb; | 563 | ir_codes = &ir_codes_flydvb_table; |
564 | mask_keycode = 0x0001F00; | 564 | mask_keycode = 0x0001F00; |
565 | mask_keydown = 0x0040000; | 565 | mask_keydown = 0x0040000; |
566 | break; | 566 | break; |
567 | case SAA7134_BOARD_ASUSTeK_P7131_DUAL: | 567 | case SAA7134_BOARD_ASUSTeK_P7131_DUAL: |
568 | case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA: | 568 | case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA: |
569 | case SAA7134_BOARD_ASUSTeK_P7131_ANALOG: | 569 | case SAA7134_BOARD_ASUSTeK_P7131_ANALOG: |
570 | ir_codes = ir_codes_asus_pc39; | 570 | ir_codes = &ir_codes_asus_pc39_table; |
571 | mask_keydown = 0x0040000; | 571 | mask_keydown = 0x0040000; |
572 | rc5_gpio = 1; | 572 | rc5_gpio = 1; |
573 | break; | 573 | break; |
574 | case SAA7134_BOARD_ENCORE_ENLTV: | 574 | case SAA7134_BOARD_ENCORE_ENLTV: |
575 | case SAA7134_BOARD_ENCORE_ENLTV_FM: | 575 | case SAA7134_BOARD_ENCORE_ENLTV_FM: |
576 | ir_codes = ir_codes_encore_enltv; | 576 | ir_codes = &ir_codes_encore_enltv_table; |
577 | mask_keycode = 0x00007f; | 577 | mask_keycode = 0x00007f; |
578 | mask_keyup = 0x040000; | 578 | mask_keyup = 0x040000; |
579 | polling = 50; // ms | 579 | polling = 50; // ms |
580 | break; | 580 | break; |
581 | case SAA7134_BOARD_ENCORE_ENLTV_FM53: | 581 | case SAA7134_BOARD_ENCORE_ENLTV_FM53: |
582 | ir_codes = ir_codes_encore_enltv_fm53; | 582 | ir_codes = &ir_codes_encore_enltv_fm53_table; |
583 | mask_keydown = 0x0040000; | 583 | mask_keydown = 0x0040000; |
584 | mask_keycode = 0x00007f; | 584 | mask_keycode = 0x00007f; |
585 | nec_gpio = 1; | 585 | nec_gpio = 1; |
586 | break; | 586 | break; |
587 | case SAA7134_BOARD_10MOONSTVMASTER3: | 587 | case SAA7134_BOARD_10MOONSTVMASTER3: |
588 | ir_codes = ir_codes_encore_enltv; | 588 | ir_codes = &ir_codes_encore_enltv_table; |
589 | mask_keycode = 0x5f80000; | 589 | mask_keycode = 0x5f80000; |
590 | mask_keyup = 0x8000000; | 590 | mask_keyup = 0x8000000; |
591 | polling = 50; //ms | 591 | polling = 50; //ms |
592 | break; | 592 | break; |
593 | case SAA7134_BOARD_GENIUS_TVGO_A11MCE: | 593 | case SAA7134_BOARD_GENIUS_TVGO_A11MCE: |
594 | ir_codes = ir_codes_genius_tvgo_a11mce; | 594 | ir_codes = &ir_codes_genius_tvgo_a11mce_table; |
595 | mask_keycode = 0xff; | 595 | mask_keycode = 0xff; |
596 | mask_keydown = 0xf00000; | 596 | mask_keydown = 0xf00000; |
597 | polling = 50; /* ms */ | 597 | polling = 50; /* ms */ |
598 | break; | 598 | break; |
599 | case SAA7134_BOARD_REAL_ANGEL_220: | 599 | case SAA7134_BOARD_REAL_ANGEL_220: |
600 | ir_codes = ir_codes_real_audio_220_32_keys; | 600 | ir_codes = &ir_codes_real_audio_220_32_keys_table; |
601 | mask_keycode = 0x3f00; | 601 | mask_keycode = 0x3f00; |
602 | mask_keyup = 0x4000; | 602 | mask_keyup = 0x4000; |
603 | polling = 50; /* ms */ | 603 | polling = 50; /* ms */ |
604 | break; | 604 | break; |
605 | case SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG: | 605 | case SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG: |
606 | ir_codes = ir_codes_kworld_plus_tv_analog; | 606 | ir_codes = &ir_codes_kworld_plus_tv_analog_table; |
607 | mask_keycode = 0x7f; | 607 | mask_keycode = 0x7f; |
608 | polling = 40; /* ms */ | 608 | polling = 40; /* ms */ |
609 | break; | 609 | break; |
610 | case SAA7134_BOARD_VIDEOMATE_S350: | 610 | case SAA7134_BOARD_VIDEOMATE_S350: |
611 | ir_codes = ir_codes_videomate_s350; | 611 | ir_codes = &ir_codes_videomate_s350_table; |
612 | mask_keycode = 0x003f00; | 612 | mask_keycode = 0x003f00; |
613 | mask_keydown = 0x040000; | 613 | mask_keydown = 0x040000; |
614 | break; | 614 | break; |
@@ -722,23 +722,23 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev) | |||
722 | init_data.name = "Pinnacle PCTV"; | 722 | init_data.name = "Pinnacle PCTV"; |
723 | if (pinnacle_remote == 0) { | 723 | if (pinnacle_remote == 0) { |
724 | init_data.get_key = get_key_pinnacle_color; | 724 | init_data.get_key = get_key_pinnacle_color; |
725 | init_data.ir_codes = ir_codes_pinnacle_color; | 725 | init_data.ir_codes = &ir_codes_pinnacle_color_table; |
726 | info.addr = 0x47; | 726 | info.addr = 0x47; |
727 | } else { | 727 | } else { |
728 | init_data.get_key = get_key_pinnacle_grey; | 728 | init_data.get_key = get_key_pinnacle_grey; |
729 | init_data.ir_codes = ir_codes_pinnacle_grey; | 729 | init_data.ir_codes = &ir_codes_pinnacle_grey_table; |
730 | info.addr = 0x47; | 730 | info.addr = 0x47; |
731 | } | 731 | } |
732 | break; | 732 | break; |
733 | case SAA7134_BOARD_UPMOST_PURPLE_TV: | 733 | case SAA7134_BOARD_UPMOST_PURPLE_TV: |
734 | init_data.name = "Purple TV"; | 734 | init_data.name = "Purple TV"; |
735 | init_data.get_key = get_key_purpletv; | 735 | init_data.get_key = get_key_purpletv; |
736 | init_data.ir_codes = ir_codes_purpletv; | 736 | init_data.ir_codes = &ir_codes_purpletv_table; |
737 | break; | 737 | break; |
738 | case SAA7134_BOARD_MSI_TVATANYWHERE_PLUS: | 738 | case SAA7134_BOARD_MSI_TVATANYWHERE_PLUS: |
739 | init_data.name = "MSI TV@nywhere Plus"; | 739 | init_data.name = "MSI TV@nywhere Plus"; |
740 | init_data.get_key = get_key_msi_tvanywhere_plus; | 740 | init_data.get_key = get_key_msi_tvanywhere_plus; |
741 | init_data.ir_codes = ir_codes_msi_tvanywhere_plus; | 741 | init_data.ir_codes = &ir_codes_msi_tvanywhere_plus_table; |
742 | info.addr = 0x30; | 742 | info.addr = 0x30; |
743 | /* MSI TV@nywhere Plus controller doesn't seem to | 743 | /* MSI TV@nywhere Plus controller doesn't seem to |
744 | respond to probes unless we read something from | 744 | respond to probes unless we read something from |
@@ -752,7 +752,7 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev) | |||
752 | case SAA7134_BOARD_HAUPPAUGE_HVR1110: | 752 | case SAA7134_BOARD_HAUPPAUGE_HVR1110: |
753 | init_data.name = "HVR 1110"; | 753 | init_data.name = "HVR 1110"; |
754 | init_data.get_key = get_key_hvr1110; | 754 | init_data.get_key = get_key_hvr1110; |
755 | init_data.ir_codes = ir_codes_hauppauge_new; | 755 | init_data.ir_codes = &ir_codes_hauppauge_new_table; |
756 | break; | 756 | break; |
757 | case SAA7134_BOARD_BEHOLD_607FM_MK3: | 757 | case SAA7134_BOARD_BEHOLD_607FM_MK3: |
758 | case SAA7134_BOARD_BEHOLD_607FM_MK5: | 758 | case SAA7134_BOARD_BEHOLD_607FM_MK5: |
@@ -769,7 +769,7 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev) | |||
769 | case SAA7134_BOARD_BEHOLD_X7: | 769 | case SAA7134_BOARD_BEHOLD_X7: |
770 | init_data.name = "BeholdTV"; | 770 | init_data.name = "BeholdTV"; |
771 | init_data.get_key = get_key_beholdm6xx; | 771 | init_data.get_key = get_key_beholdm6xx; |
772 | init_data.ir_codes = ir_codes_behold; | 772 | init_data.ir_codes = &ir_codes_behold_table; |
773 | break; | 773 | break; |
774 | case SAA7134_BOARD_AVERMEDIA_CARDBUS_501: | 774 | case SAA7134_BOARD_AVERMEDIA_CARDBUS_501: |
775 | case SAA7134_BOARD_AVERMEDIA_CARDBUS_506: | 775 | case SAA7134_BOARD_AVERMEDIA_CARDBUS_506: |