V4L/DVB (10138): v4l2-ioctl: change to long return type to match unlocked_ioctl.

[safe/jmp/linux-2.6] / include / media / tuner.h

diff --git a/include/media/tuner.h b/include/media/tuner.h
index 160381c..7d4e2db 100644 (file)
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -24,8 +24,6 @@
 
 #include <linux/videodev2.h>
 
-extern int tuner_debug;
-
 #define ADDR_UNSET (255)
 
 #define TUNER_TEMIC_PAL                        0        /* 4002 FH5 (3X 7756, 9483) */
@@ -80,7 +78,7 @@ extern int tuner_debug;
 
 #define TUNER_HITACHI_NTSC             40
 #define TUNER_PHILIPS_PAL_MK           41
-#define TUNER_PHILIPS_ATSC             42
+#define TUNER_PHILIPS_FCV1236D         42
 #define TUNER_PHILIPS_FM1236_MK3       43
 
 #define TUNER_PHILIPS_4IN1             44      /* ATI TV Wonder Pro - Conexant */
@@ -117,12 +115,15 @@ extern int tuner_debug;
 #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_XC2028                   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 */
 #define TUNER_TEA5761                  75      /* Only FM Radio Tuner */
+#define TUNER_XC5000                   76      /* Xceive Silicon Tuner */
+#define TUNER_TCL_MF02GIP_5N           77      /* TCL MF02GIP_5N */
+#define TUNER_PHILIPS_FMD1216MEX_MK3   78
 
 /* tv card specific */
 #define TDA9887_PRESENT                (1<<0)
@@ -146,6 +147,7 @@ extern int tuner_debug;
 #define TDA9887_AUTOMUTE               (1<<18)
 #define TDA9887_GATING_18              (1<<19)
 #define TDA9887_GAIN_NORMAL            (1<<20)
+#define TDA9887_RIF_41_3               (1<<21)  /* radio IF1 41.3 vs 33.3 */
 
 #ifdef __KERNEL__
 
@@ -178,7 +180,7 @@ struct tuner_setup {
        unsigned int    type;   /* Tuner type */
        unsigned int    mode_mask;  /* Allowed tuner modes */
        unsigned int    config; /* configuraion for more complex tuners */
-       int (*tuner_callback) (void *dev, int command,int arg);
+       int (*tuner_callback) (void *dev, int component, int cmd, int arg);
 };
 
 #endif /* __KERNEL__ */