Skip to content

L
linux-davinci
Commit 91812fa7 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files
Options

V4L/DVB (9611): em28xx: experimental support for HVR-950 IR 

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a924a499
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 4 deletions
drivers/media/video/em28xx/em28xx-input.c
View file @ 91812fa7
...@@ -270,6 +270,11 @@ int em28xx_ir_init(struct em28xx *dev) ...@@ -270,6 +270,11 @@ int em28xx_ir_init(struct em28xx *dev)
/* detect & configure */ /* detect & configure */
switch (dev->model) { switch (dev->model) {
case EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950:
ir_type = IR_TYPE_OTHER;
ir_codes = ir_codes_hauppauge_new;
ir->mask_keycode = 0x007f0000;
break;
} }
if (NULL == ir_codes) { if (NULL == ir_codes) {
...@@ -277,10 +282,6 @@ int em28xx_ir_init(struct em28xx *dev) ...@@ -277,10 +282,6 @@ int em28xx_ir_init(struct em28xx *dev)
goto err_out_free; goto err_out_free;
} }
/* Get the current key status, to avoid adding an
unexistent key code */
ir->last_gpio = ir->get_key(ir);
/* init input device */ /* init input device */
snprintf(ir->name, sizeof(ir->name), "em28xx IR (%s)", snprintf(ir->name, sizeof(ir->name), "em28xx IR (%s)",
dev->name); dev->name);
...@@ -301,6 +302,10 @@ int em28xx_ir_init(struct em28xx *dev) ...@@ -301,6 +302,10 @@ int em28xx_ir_init(struct em28xx *dev)
ir->dev = dev; ir->dev = dev;
dev->ir = ir; dev->ir = ir;
/* Get the current key status, to avoid adding an
unexistent key code */
ir->last_gpio = ir->get_key(ir);
em28xx_ir_start(ir); em28xx_ir_start(ir);
/* all done */ /* all done */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment