Commit 43c24078 authored by Andy Walls's avatar Andy Walls Committed by Mauro Carvalho Chehab

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: default avatarAndy Walls <awalls@md.metrocast.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent eeefae53
This diff is collapsed.
...@@ -53,7 +53,7 @@ void cx23885_ir_rx_work_handler(struct work_struct *work) ...@@ -53,7 +53,7 @@ void cx23885_ir_rx_work_handler(struct work_struct *work)
if (events == 0) if (events == 0)
return; return;
if (dev->ir_input) if (dev->kernel_ir)
cx23885_input_rx_work_handler(dev, events); cx23885_input_rx_work_handler(dev, events);
} }
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <media/tveeprom.h> #include <media/tveeprom.h>
#include <media/videobuf-dma-sg.h> #include <media/videobuf-dma-sg.h>
#include <media/videobuf-dvb.h> #include <media/videobuf-dvb.h>
#include <media/ir-common.h> #include <media/ir-core.h>
#include "btcx-risc.h" #include "btcx-risc.h"
#include "cx23885-reg.h" #include "cx23885-reg.h"
...@@ -305,20 +305,13 @@ struct cx23885_tsport { ...@@ -305,20 +305,13 @@ struct cx23885_tsport {
void *port_priv; void *port_priv;
}; };
struct cx23885_ir_input { struct cx23885_kernel_ir {
struct input_dev *dev; struct cx23885_dev *cx;
struct ir_input_state ir;
char *name; char *name;
char *phys; char *phys;
int start; struct input_dev *inp_dev;
int addr; struct ir_dev_props props;
int rc5_key_timeout;
struct timer_list timer_keyup;
u32 last_rc5;
u32 last_bit;
u32 code;
int active;
}; };
struct cx23885_dev { struct cx23885_dev {
...@@ -380,7 +373,7 @@ struct cx23885_dev { ...@@ -380,7 +373,7 @@ struct cx23885_dev {
struct work_struct ir_tx_work; struct work_struct ir_tx_work;
unsigned long ir_tx_notifications; unsigned long ir_tx_notifications;
struct cx23885_ir_input *ir_input; struct cx23885_kernel_ir *kernel_ir;
atomic_t ir_input_stopping; atomic_t ir_input_stopping;
/* V4l */ /* V4l */
......
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