V4L/DVB: cx23885: Convert cx23885-input to use new in kernel IR pulse decoders

[mv-sheeva.git] / drivers / media / video / cx23885 / cx23885.h

diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index 8d6a55e54ee7da7b12350a65bedfb135fd62ae1a..a33f2b71467bcc29e7e701d5d26ee6dde8a4a21c 100644 (file)
--- 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-core.h>
 
 #include "btcx-risc.h"
 #include "cx23885-reg.h"
@@ -304,6 +305,15 @@ struct cx23885_tsport {
        void                       *port_priv;
 };
 
+struct cx23885_kernel_ir {
+       struct cx23885_dev      *cx;
+       char                    *name;
+       char                    *phys;
+
+       struct input_dev        *inp_dev;
+       struct ir_dev_props     props;
+};
+
 struct cx23885_dev {
        atomic_t                   refcount;
        struct v4l2_device         v4l2_dev;
@@ -363,7 +373,7 @@ struct cx23885_dev {
        struct work_struct         ir_tx_work;
        unsigned long              ir_tx_notifications;
 
-       struct card_ir             *ir_input;
+       struct cx23885_kernel_ir   *kernel_ir;
        atomic_t                   ir_input_stopping;
 
        /* V4l */