summaryrefslogtreecommitdiff
path: root/drivers/media/video/cx23885/cx23885.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/cx23885/cx23885.h')
-rw-r--r--drivers/media/video/cx23885/cx23885.h19
1 files changed, 18 insertions, 1 deletions
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index 8d6a55e54ee7..25167dd22ab8 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -30,6 +30,7 @@
#include <media/tveeprom.h>
#include <media/videobuf-dma-sg.h>
#include <media/videobuf-dvb.h>
+#include <media/ir-common.h>
#include "btcx-risc.h"
#include "cx23885-reg.h"
@@ -304,6 +305,22 @@ struct cx23885_tsport {
void *port_priv;
};
+struct cx23885_ir_input {
+ struct input_dev *dev;
+ struct ir_input_state ir;
+ 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 cx23885_dev {
atomic_t refcount;
struct v4l2_device v4l2_dev;
@@ -363,7 +380,7 @@ struct cx23885_dev {
struct work_struct ir_tx_work;
unsigned long ir_tx_notifications;
- struct card_ir *ir_input;
+ struct cx23885_ir_input *ir_input;
atomic_t ir_input_stopping;
/* V4l */