diff options
| author | Andy Walls <awalls@md.metrocast.net> | 2010-06-28 06:15:35 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-08-02 22:31:44 +0400 |
| commit | 43c2407820d5406bde3c8069583a37fba9c09faf (patch) | |
| tree | a203e3a62b10cf18ad45b632054ac8596a80437e /drivers/media/video/cx23885/cx23885.h | |
| parent | eeefae532e723e8ce62664cb1d299a0baad50f35 (diff) | |
| download | linux-43c2407820d5406bde3c8069583a37fba9c09faf.tar.xz | |
V4L/DVB: cx23885: Convert cx23885-input to use new in kernel IR pulse decoders
Convert the cx23885 driver to use the new in kernel IR pulse
decoders for the integrated CX2388[578] IR controllers. Rip out a lot
of RC-5 decoding related code in the process and rename some variables
for clarity or to more accurately describe their usage.
Signed-off-by: Andy Walls <awalls@md.metrocast.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx23885/cx23885.h')
| -rw-r--r-- | drivers/media/video/cx23885/cx23885.h | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h index 25167dd22ab8..a33f2b71467b 100644 --- a/drivers/media/video/cx23885/cx23885.h +++ b/drivers/media/video/cx23885/cx23885.h @@ -30,7 +30,7 @@ #include <media/tveeprom.h> #include <media/videobuf-dma-sg.h> #include <media/videobuf-dvb.h> -#include <media/ir-common.h> +#include <media/ir-core.h> #include "btcx-risc.h" #include "cx23885-reg.h" @@ -305,20 +305,13 @@ struct cx23885_tsport { void *port_priv; }; -struct cx23885_ir_input { - struct input_dev *dev; - struct ir_input_state ir; +struct cx23885_kernel_ir { + struct cx23885_dev *cx; char *name; char *phys; - int start; - int addr; - int rc5_key_timeout; - struct timer_list timer_keyup; - u32 last_rc5; - u32 last_bit; - u32 code; - int active; + struct input_dev *inp_dev; + struct ir_dev_props props; }; struct cx23885_dev { @@ -380,7 +373,7 @@ struct cx23885_dev { struct work_struct ir_tx_work; unsigned long ir_tx_notifications; - struct cx23885_ir_input *ir_input; + struct cx23885_kernel_ir *kernel_ir; atomic_t ir_input_stopping; /* V4l */ |