Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/drivers/media/video/cx231xx/cx231xx.h b/drivers/media/video/cx231xx/cx231xx.h
index d067df9b81e74b79456ca6241fa57f41c1308aa8..72bbea2bcd56980b7caa5b1a6e7305c9a86dfaf4 100644 (file)
--- a/drivers/media/video/cx231xx/cx231xx.h
+++ b/drivers/media/video/cx231xx/cx231xx.h
@@ -34,7 +34,8 @@
 
 #include <media/videobuf-vmalloc.h>
 #include <media/v4l2-device.h>
-#include <media/ir-core.h>
+#include <media/rc-core.h>
+#include <media/ir-kbd-i2c.h>
 #include <media/videobuf-dvb.h>
 
 #include "cx231xx-reg.h"
@@ -62,6 +63,7 @@
 #define CX231XX_BOARD_CNXT_RDU_250     7
 #define CX231XX_BOARD_HAUPPAUGE_EXETER  8
 #define CX231XX_BOARD_HAUPPAUGE_USBLIVE2 9
+#define CX231XX_BOARD_PV_PLAYTV_USB_HYBRID 10
 
 /* Limits minimum and default number of buffers */
 #define CX231XX_MIN_BUF                 4
@@ -344,6 +346,10 @@ struct cx231xx_board {
        /* i2c masters */
        u8 tuner_i2c_master;
        u8 demod_i2c_master;
+       u8 ir_i2c_master;
+
+       /* for devices with I2C chips for IR */
+       char *rc_map_name;
 
        unsigned int max_range_640_480:1;
        unsigned int has_dvb:1;
@@ -356,7 +362,7 @@ struct cx231xx_board {
 
        struct cx231xx_input input[MAX_CX231XX_INPUT];
        struct cx231xx_input radio;
-       struct ir_scancode_table *ir_codes;
+       struct rc_map *ir_codes;
 };
 
 /* device states */
@@ -605,6 +611,9 @@ struct cx231xx {
 
        struct cx231xx_board board;
 
+       /* For I2C IR support */
+       struct IR_i2c_init_data    init_data;
+
        unsigned int stream_on:1;       /* Locks streams */
        unsigned int vbi_stream_on:1;   /* Locks streams for VBI */
        unsigned int has_audio_class:1;
@@ -616,8 +625,6 @@ struct cx231xx {
        struct v4l2_subdev *sd_cx25840;
        struct v4l2_subdev *sd_tuner;
 
-       struct cx231xx_IR *ir;
-
        struct work_struct wq_trigger;          /* Trigger to start/stop audio for alsa module */
        atomic_t           stream_started;      /* stream should be running if true */
 
@@ -954,6 +961,17 @@ int cx231xx_tuner_callback(void *ptr, int component, int command, int arg);
 extern int cx231xx_417_register(struct cx231xx *dev);
 extern void cx231xx_417_unregister(struct cx231xx *dev);
 
+/* cx23885-input.c                                             */
+
+#if defined(CONFIG_VIDEO_CX231XX_RC)
+int cx231xx_ir_init(struct cx231xx *dev);
+void cx231xx_ir_exit(struct cx231xx *dev);
+#else
+#define cx231xx_ir_init(dev)   (0)
+#define cx231xx_ir_exit(dev)   (0)
+#endif
+
+
 /* printk macros */
 
 #define cx231xx_err(fmt, arg...) do {\