[PATCH] autofs4: pending flag not cleared on mount fail

[linux-2.6-omap-h63xx.git] / include / media / tuner.h

diff --git a/include/media/tuner.h b/include/media/tuner.h
index 27cbf08c931dcc007648c31ae138dd139217f34a..2f7b00b08e8817224c5827ab09e7f13bd376d883 100644 (file)
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -23,6 +23,9 @@
 #define _TUNER_H
 
 #include <linux/videodev2.h>
+#include <media/tuner-types.h>
+
+extern int tuner_debug;
 
 #define ADDR_UNSET (255)
 
@@ -107,13 +110,19 @@
 #define TUNER_TEA5767                  62      /* Only FM Radio Tuner */
 #define TUNER_PHILIPS_FMD1216ME_MK3    63
 
-#define TUNER_LG_TDVS_H062F            64      /* DViCO FusionHDTV 5 */
+#define TUNER_LG_TDVS_H06XF            64      /* TDVS H061F, H062F, H064F */
 #define TUNER_YMEC_TVF66T5_B_DFF       65      /* Acorp Y878F */
-#define TUNER_LG_NTSC_TALN_MINI                66
+#define TUNER_LG_TALN                  66
 #define TUNER_PHILIPS_TD1316           67
 
 #define TUNER_PHILIPS_TUV1236D         68      /* ATI HDTV Wonder */
 #define TUNER_TNF_5335MF                69     /* Sabrent Bt848   */
+#define TUNER_SAMSUNG_TCPN_2121P30A     70     /* Hauppauge PVR-500MCE NTSC */
+#define TUNER_XCEIVE_XC3028            71
+
+#define TUNER_THOMSON_FE6600           72      /* DViCO FusionHDTV DVB-T Hybrid */
+#define TUNER_SAMSUNG_TCPG_6121P30A     73     /* Hauppauge PVR-500 PAL */
+#define TUNER_TDA9887                   74      /* This tuner should be used only internally */
 
 /* tv card specific */
 #define TDA9887_PRESENT                (1<<0)
@@ -177,12 +186,18 @@ struct tuner {
        unsigned int mode;
        unsigned int mode_mask; /* Combination of allowable modes */
 
-       unsigned int freq;      /* keep track of the current settings */
+       unsigned int tv_freq;   /* keep track of the current settings */
+       unsigned int radio_freq;
+       u16          last_div;
        unsigned int audmode;
        v4l2_std_id  std;
 
        int          using_v4l2;
 
+       /* used by tda9887 */
+       unsigned int       tda9887_config;
+       unsigned char      tda9887_data[4];
+
        /* used by MT2032 */
        unsigned int xogc;
        unsigned int radio_if2;
@@ -195,21 +210,25 @@ struct tuner {
        unsigned int sgIF;
 
        /* function ptrs */
-       void (*tv_freq)(struct i2c_client *c, unsigned int freq);
-       void (*radio_freq)(struct i2c_client *c, unsigned int freq);
+       void (*set_tv_freq)(struct i2c_client *c, unsigned int freq);
+       void (*set_radio_freq)(struct i2c_client *c, unsigned int freq);
        int  (*has_signal)(struct i2c_client *c);
        int  (*is_stereo)(struct i2c_client *c);
+       int  (*get_afc)(struct i2c_client *c);
+       void (*tuner_status)(struct i2c_client *c);
        void (*standby)(struct i2c_client *c);
 };
 
 extern unsigned const int tuner_count;
 
 extern int microtune_init(struct i2c_client *c);
+extern int xc3028_init(struct i2c_client *c);
 extern int tda8290_init(struct i2c_client *c);
 extern int tda8290_probe(struct i2c_client *c);
 extern int tea5767_tuner_init(struct i2c_client *c);
 extern int default_tuner_init(struct i2c_client *c);
 extern int tea5767_autodetection(struct i2c_client *c);
+extern int tda9887_tuner_init(struct i2c_client *c);
 
 #define tuner_warn(fmt, arg...) do {\
        printk(KERN_WARNING "%s %d-%04x: " fmt, t->i2c.driver->driver.name, \