diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-12 15:05:46 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-12 15:05:46 -0200 |
| commit | a96c9ec714a47d993bf53aaeb71a0de88f22277c (patch) | |
| tree | 5ccdeb88e5cb0a2dfdcfc911b2065195f6248ee0 /linux/drivers/media/video/em28xx/em28xx-input.c | |
| parent | 01d75ca958ddacff75e9a47150a32fa064d9367d (diff) | |
| download | mediapointer-dvb-s2-a96c9ec714a47d993bf53aaeb71a0de88f22277c.tar.gz mediapointer-dvb-s2-a96c9ec714a47d993bf53aaeb71a0de88f22277c.tar.bz2 | |
em28xx: experimental support for HVR-950 IR
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/em28xx/em28xx-input.c')
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-input.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-input.c b/linux/drivers/media/video/em28xx/em28xx-input.c index c3c9cba30..e20e57185 100644 --- a/linux/drivers/media/video/em28xx/em28xx-input.c +++ b/linux/drivers/media/video/em28xx/em28xx-input.c @@ -288,28 +288,18 @@ int em28xx_ir_init(struct em28xx *dev) /* detect & configure */ switch (dev->model) { -#if 0 - /* dummy entry, just as a reference, while we don't add - other entries here - */ - case EM2820_BOARD_UNKNOWN: + case EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950: ir_type = IR_TYPE_OTHER; - ir_codes = ir_codes_empty; + ir_codes = ir_codes_hauppauge_new; ir->mask_keycode = 0x007f0000; break; } -#endif - } if (NULL == ir_codes) { err = -ENODEV; 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 */ snprintf(ir->name, sizeof(ir->name), "em28xx IR (%s)", dev->name); @@ -334,6 +324,10 @@ int em28xx_ir_init(struct em28xx *dev) ir->dev = dev; 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); /* all done */ |