1 files changed, 98 insertions, 95 deletions
diff --git a/include/media/tuner.h b/include/media/tuner.h
index eeaa15ddee85..4ad08e24a1aa 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -1,6 +1,4 @@
+/*
-/* $Id: tuner.h,v 1.45 2005/07/28 18:41:21 mchehab Exp $
- *
    tuner.h - definition for different tuners
    Copyright (C) 1997 Markus Schroeder (schroedm@uni-duesseldorf.de)
@@ -28,88 +26,90 @@
 #define ADDR_UNSET (255)
-#define TUNER_TEMIC_PAL     0        /* 4002 FH5 (3X 7756, 9483) */
+#define TUNER_TEMIC_PAL                 0        /* 4002 FH5 (3X 7756, 9483) */
-#define TUNER_PHILIPS_PAL_I 1
+#define TUNER_PHILIPS_PAL_I             1
-#define TUNER_PHILIPS_NTSC  2
+#define TUNER_PHILIPS_NTSC              2
-#define TUNER_PHILIPS_SECAM 3           /* you must actively select B/G, L, L` */
+#define TUNER_PHILIPS_SECAM             3       /* you must actively select B/G, L, L` */
-#define TUNER_ABSENT        4
+#define TUNER_ABSENT                    4
-#define TUNER_PHILIPS_PAL   5
+#define TUNER_PHILIPS_PAL               5
-#define TUNER_TEMIC_NTSC    6        /* 4032 FY5 (3X 7004, 9498, 9789)  */
+#define TUNER_TEMIC_NTSC                6       /* 4032 FY5 (3X 7004, 9498, 9789)  */
-#define TUNER_TEMIC_PAL_I   7        /* 4062 FY5 (3X 8501, 9957)        */
+#define TUNER_TEMIC_PAL_I               7       /* 4062 FY5 (3X 8501, 9957) */
-#define TUNER_TEMIC_4036FY5_NTSC 8   /* 4036 FY5 (3X 1223, 1981, 7686)  */
+#define TUNER_TEMIC_4036FY5_NTSC        8       /* 4036 FY5 (3X 1223, 1981, 7686) */
-#define TUNER_ALPS_TSBH1_NTSC    9
+#define TUNER_ALPS_TSBH1_NTSC           9
-#define TUNER_ALPS_TSBE1_PAL    10
+#define TUNER_ALPS_TSBE1_PAL            10
-#define TUNER_ALPS_TSBB5_PAL_I  11
+#define TUNER_ALPS_TSBB5_PAL_I          11
-#define TUNER_ALPS_TSBE5_PAL    12
+#define TUNER_ALPS_TSBE5_PAL            12
-#define TUNER_ALPS_TSBC5_PAL    13
+#define TUNER_ALPS_TSBC5_PAL            13
-#define TUNER_TEMIC_4006FH5_PAL 14   /* 4006 FH5 (3X 9500, 9501, 7291)     */
+#define TUNER_TEMIC_4006FH5_PAL         14      /* 4006 FH5 (3X 9500, 9501, 7291) */
-#define TUNER_ALPS_TSHC6_NTSC   15
+#define TUNER_ALPS_TSHC6_NTSC           15
-#define TUNER_TEMIC_PAL_DK      16   /* 4016 FY5 (3X 1392, 1393)     */
+#define TUNER_TEMIC_PAL_DK              16      /* 4016 FY5 (3X 1392, 1393) */
-#define TUNER_PHILIPS_NTSC_M    17
+#define TUNER_PHILIPS_NTSC_M            17
-#define TUNER_TEMIC_4066FY5_PAL_I       18  /* 4066 FY5 (3X 7032, 7035) */
+#define TUNER_TEMIC_4066FY5_PAL_I       18      /* 4066 FY5 (3X 7032, 7035) */
-#define TUNER_TEMIC_4006FN5_MULTI_PAL   19  /* B/G, I and D/K autodetected (3X 7595, 7606, 7657)*/
+#define TUNER_TEMIC_4006FN5_MULTI_PAL   19      /* B/G, I and D/K autodetected (3X 7595, 7606, 7657) */
-#define TUNER_TEMIC_4009FR5_PAL         20  /* incl. FM radio (3X 7607, 7488, 7711)*/
+#define TUNER_TEMIC_4009FR5_PAL         20      /* incl. FM radio (3X 7607, 7488, 7711) */
-#define TUNER_TEMIC_4039FR5_NTSC        21  /* incl. FM radio (3X 7246, 7578, 7732)*/
+#define TUNER_TEMIC_4039FR5_NTSC        21      /* incl. FM radio (3X 7246, 7578, 7732) */
-#define TUNER_TEMIC_4046FM5             22  /* you must actively select B/G, D/K, I, L, L` !  (3X 7804, 7806, 8103, 8104)*/
+#define TUNER_TEMIC_4046FM5             22      /* you must actively select B/G, D/K, I, L, L` !  (3X 7804, 7806, 8103, 8104) */
 #define TUNER_PHILIPS_PAL_DK            23
-#define TUNER_PHILIPS_FQ1216ME          24  /* you must actively select B/G/D/K, I, L, L` */
+#define TUNER_PHILIPS_FQ1216ME          24      /* you must actively select B/G/D/K, I, L, L` */
-#define TUNER_LG_PAL_I_FM       25
+#define TUNER_LG_PAL_I_FM               25
-#define TUNER_LG_PAL_I          26
+#define TUNER_LG_PAL_I                  26
-#define TUNER_LG_NTSC_FM        27
+#define TUNER_LG_NTSC_FM                27
-#define TUNER_LG_PAL_FM         28
+#define TUNER_LG_PAL_FM                 28
-#define TUNER_LG_PAL            29
+#define TUNER_LG_PAL                    29
-#define TUNER_TEMIC_4009FN5_MULTI_PAL_FM        30  /* B/G, I and D/K autodetected (3X 8155, 8160, 8163)*/
+#define TUNER_TEMIC_4009FN5_MULTI_PAL_FM 30     /* B/G, I and D/K autodetected (3X 8155, 8160, 8163) */
-#define TUNER_SHARP_2U5JF5540_NTSC  31
+#define TUNER_SHARP_2U5JF5540_NTSC      31
-#define TUNER_Samsung_PAL_TCPM9091PD27 32
+#define TUNER_Samsung_PAL_TCPM9091PD27  32
-#define TUNER_MT2032 33
+#define TUNER_MT2032                    33
-#define TUNER_TEMIC_4106FH5     34      /* 4106 FH5 (3X 7808, 7865)*/
+#define TUNER_TEMIC_4106FH5             34      /* 4106 FH5 (3X 7808, 7865) */
-#define TUNER_TEMIC_4012FY5     35      /* 4012 FY5 (3X 0971, 1099)*/
+#define TUNER_TEMIC_4012FY5             35      /* 4012 FY5 (3X 0971, 1099) */
-#define TUNER_TEMIC_4136FY5     36      /* 4136 FY5 (3X 7708, 7746)*/
+#define TUNER_TEMIC_4136FY5             36      /* 4136 FY5 (3X 7708, 7746) */
-#define TUNER_LG_PAL_NEW_TAPC   37
+#define TUNER_LG_PAL_NEW_TAPC           37
-#define TUNER_PHILIPS_FM1216ME_MK3  38
+#define TUNER_PHILIPS_FM1216ME_MK3      38
-#define TUNER_LG_NTSC_NEW_TAPC   39
+#define TUNER_LG_NTSC_NEW_TAPC          39
-#define TUNER_HITACHI_NTSC       40
+#define TUNER_HITACHI_NTSC              40
-#define TUNER_PHILIPS_PAL_MK     41
+#define TUNER_PHILIPS_PAL_MK            41
-#define TUNER_PHILIPS_ATSC       42
+#define TUNER_PHILIPS_ATSC              42
-#define TUNER_PHILIPS_FM1236_MK3 43
+#define TUNER_PHILIPS_FM1236_MK3        43
-#define TUNER_PHILIPS_4IN1       44     /* ATI TV Wonder Pro - Conexant */
+#define TUNER_PHILIPS_4IN1              44      /* ATI TV Wonder Pro - Conexant */
 /* Microtune mergeged with Temic 12/31/1999 partially financed by Alps - these may be similar to Temic */
-#define TUNER_MICROTUNE_4049FM5  45
+#define TUNER_MICROTUNE_4049FM5         45
-#define TUNER_LG_NTSC_TAPE       47
+#define TUNER_MICROTUNE_4042_FI5        46
+#define TUNER_LG_NTSC_TAPE              47
-#define TUNER_TNF_8831BGFF       48
-#define TUNER_MICROTUNE_4042FI5  49     /* DViCO FusionHDTV 3 Gold-Q - 4042 FI5 (3X 8147) */
+#define TUNER_TNF_8831BGFF              48
-#define TUNER_TCL_2002N          50
+#define TUNER_MICROTUNE_4042FI5         49      /* DViCO FusionHDTV 3 Gold-Q - 4042 FI5 (3X 8147) */
-#define TUNER_PHILIPS_FM1256_IH3   51
+#define TUNER_TCL_2002N                 50
+#define TUNER_PHILIPS_FM1256_IH3        51
-#define TUNER_THOMSON_DTT7610    52
-#define TUNER_PHILIPS_FQ1286     53
+#define TUNER_THOMSON_DTT7610           52
-#define TUNER_PHILIPS_TDA8290    54
+#define TUNER_PHILIPS_FQ1286            53
-#define TUNER_LG_PAL_TAPE        55    /* Hauppauge PVR-150 PAL */
+#define TUNER_PHILIPS_TDA8290           54
+#define TUNER_LG_PAL_TAPE               55      /* Hauppauge PVR-150 PAL */
-#define TUNER_PHILIPS_FQ1216AME_MK4 56 /* Hauppauge PVR-150 PAL */
-#define TUNER_PHILIPS_FQ1236A_MK4   57   /* Hauppauge PVR-500MCE NTSC */
+#define TUNER_PHILIPS_FQ1216AME_MK4     56      /* Hauppauge PVR-150 PAL */
+#define TUNER_PHILIPS_FQ1236A_MK4       57      /* Hauppauge PVR-500MCE NTSC */
-#define TUNER_YMEC_TVF_8531MF 58
+#define TUNER_YMEC_TVF_8531MF           58
-#define TUNER_YMEC_TVF_5533MF 59        /* Pixelview Pro Ultra NTSC */
+#define TUNER_YMEC_TVF_5533MF           59      /* Pixelview Pro Ultra NTSC */
-#define TUNER_THOMSON_DTT7611 60        /* DViCO FusionHDTV 3 Gold-T */
-#define TUNER_TENA_9533_DI    61
+#define TUNER_THOMSON_DTT7611           60      /* DViCO FusionHDTV 3 Gold-T */
+#define TUNER_TENA_9533_DI              61
-#define TUNER_TEA5767         62        /* Only FM Radio Tuner */
+#define TUNER_TEA5767                   62      /* Only FM Radio Tuner */
-#define TUNER_PHILIPS_FMD1216ME_MK3 63
+#define TUNER_PHILIPS_FMD1216ME_MK3     63
-#define TUNER_LG_TDVS_H062F   64        /* DViCO FusionHDTV 5 */
-#define TUNER_YMEC_TVF66T5_B_DFF 65     /* Acorp Y878F */
+#define TUNER_LG_TDVS_H062F             64      /* DViCO FusionHDTV 5 */
+#define TUNER_YMEC_TVF66T5_B_DFF        65      /* Acorp Y878F */
+#define TUNER_LG_NTSC_TALN_MINI         66
 #define NOTUNER 0
 #define PAL     1       /* PAL_BG */
@@ -117,7 +117,7 @@
 #define NTSC    3
 #define SECAM   4
 #define ATSC    5
-#define RADIO   6
+#define RADIO   6
 #define NoTuner 0
 #define Philips 1
@@ -134,6 +134,7 @@
 #define THOMSON 12
 #define TUNER_SET_TYPE_ADDR          _IOW('T',3,int)
+#define TUNER_SET_STANDBY            _IOW('T',4,int)
 #define TDA9887_SET_CONFIG           _IOW('t',5,int)
 /* tv card specific */
@@ -153,9 +154,6 @@
 #ifdef __KERNEL__
-#define I2C_ADDR_TDA8290        0x4b
-#define I2C_ADDR_TDA8275        0x61
 enum tuner_mode {
        T_UNINITIALIZED = 0,
        T_RADIO         = 1 << V4L2_TUNER_RADIO,
@@ -165,21 +163,21 @@ enum tuner_mode {
 };
 struct tuner_setup {
-        unsigned short          addr;
+        unsigned short  addr;
-        unsigned int            type;
+        unsigned int    type;
-        unsigned int            mode_mask;
+        unsigned int    mode_mask;
 };
 struct tuner {
        /* device */
        struct i2c_client i2c;
-        unsigned int type;            /* chip type */
+        unsigned int type;      /* chip type */
-        unsigned int          mode;
+        unsigned int mode;
-        unsigned int          mode_mask; /* Combination of allowable modes */
+        unsigned int mode_mask; /* Combination of allowable modes */
-        unsigned int freq;            /* keep track of the current settings */
+        unsigned int freq;      /* keep track of the current settings */
        unsigned int audmode;
        v4l2_std_id  std;
@@ -198,6 +196,7 @@ struct tuner {
        void (*radio_freq)(struct i2c_client *c, unsigned int freq);
        int  (*has_signal)(struct i2c_client *c);
        int  (*is_stereo)(struct i2c_client *c);
+        void (*standby)(struct i2c_client *c);
 };
 extern unsigned int tuner_debug;
@@ -209,16 +208,20 @@ 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);
-#define tuner_warn(fmt, arg...) \
+#define tuner_warn(fmt, arg...) do {\
-        dev_printk(KERN_WARNING , &t->i2c.dev , fmt , ## arg)
+        printk(KERN_WARNING "%s %d-%04x: " fmt, t->i2c.driver->name, \
-#define tuner_info(fmt, arg...) \
+                        t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0)
-        dev_printk(KERN_INFO , &t->i2c.dev , fmt , ## arg)
+#define tuner_info(fmt, arg...) do {\
-#define tuner_dbg(fmt, arg...) \
+        printk(KERN_INFO "%s %d-%04x: " fmt, t->i2c.driver->name, \
-        if (tuner_debug) dev_printk(KERN_DEBUG , &t->i2c.dev , fmt , ## arg)
+                        t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0)
+#define tuner_dbg(fmt, arg...) do {\
+        if (tuner_debug) \
+                printk(KERN_DEBUG "%s %d-%04x: " fmt, t->i2c.driver->name, \
+                        t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0)
 #endif /* __KERNEL__ */
-#endif
+#endif /* _TUNER_H */
 /*
 * Overrides for Emacs so that we follow Linus's tabbing style.

diff --git a/include/media/tuner.h b/include/media/tuner.h index eeaa15ddee85..4ad08e24a1aa 100644 --- a/include/media/tuner.h +++ b/include/media/tuner.h
@@ -1,6 +1,4 @@
1		1	/*
2	/* $Id: tuner.h,v 1.45 2005/07/28 18:41:21 mchehab Exp $
3	*
4	tuner.h - definition for different tuners	2	tuner.h - definition for different tuners
5		3
6	Copyright (C) 1997 Markus Schroeder (schroedm@uni-duesseldorf.de)	4	Copyright (C) 1997 Markus Schroeder (schroedm@uni-duesseldorf.de)
@@ -28,88 +26,90 @@
28		26
29	#define ADDR_UNSET (255)	27	#define ADDR_UNSET (255)
30		28
31	#define TUNER_TEMIC_PAL 0 /* 4002 FH5 (3X 7756, 9483) */	29	#define TUNER_TEMIC_PAL 0 /* 4002 FH5 (3X 7756, 9483) */
32	#define TUNER_PHILIPS_PAL_I 1	30	#define TUNER_PHILIPS_PAL_I 1
33	#define TUNER_PHILIPS_NTSC 2	31	#define TUNER_PHILIPS_NTSC 2
34	#define TUNER_PHILIPS_SECAM 3 /* you must actively select B/G, L, L` */	32	#define TUNER_PHILIPS_SECAM 3 /* you must actively select B/G, L, L` */
35		33
36	#define TUNER_ABSENT 4	34	#define TUNER_ABSENT 4
37	#define TUNER_PHILIPS_PAL 5	35	#define TUNER_PHILIPS_PAL 5
38	#define TUNER_TEMIC_NTSC 6 /* 4032 FY5 (3X 7004, 9498, 9789) */	36	#define TUNER_TEMIC_NTSC 6 /* 4032 FY5 (3X 7004, 9498, 9789) */
39	#define TUNER_TEMIC_PAL_I 7 /* 4062 FY5 (3X 8501, 9957) */	37	#define TUNER_TEMIC_PAL_I 7 /* 4062 FY5 (3X 8501, 9957) */
40		38
41	#define TUNER_TEMIC_4036FY5_NTSC 8 /* 4036 FY5 (3X 1223, 1981, 7686) */	39	#define TUNER_TEMIC_4036FY5_NTSC 8 /* 4036 FY5 (3X 1223, 1981, 7686) */
42	#define TUNER_ALPS_TSBH1_NTSC 9	40	#define TUNER_ALPS_TSBH1_NTSC 9
43	#define TUNER_ALPS_TSBE1_PAL 10	41	#define TUNER_ALPS_TSBE1_PAL 10
44	#define TUNER_ALPS_TSBB5_PAL_I 11	42	#define TUNER_ALPS_TSBB5_PAL_I 11
45		43
46	#define TUNER_ALPS_TSBE5_PAL 12	44	#define TUNER_ALPS_TSBE5_PAL 12
47	#define TUNER_ALPS_TSBC5_PAL 13	45	#define TUNER_ALPS_TSBC5_PAL 13
48	#define TUNER_TEMIC_4006FH5_PAL 14 /* 4006 FH5 (3X 9500, 9501, 7291) */	46	#define TUNER_TEMIC_4006FH5_PAL 14 /* 4006 FH5 (3X 9500, 9501, 7291) */
49	#define TUNER_ALPS_TSHC6_NTSC 15	47	#define TUNER_ALPS_TSHC6_NTSC 15
50		48
51	#define TUNER_TEMIC_PAL_DK 16 /* 4016 FY5 (3X 1392, 1393) */	49	#define TUNER_TEMIC_PAL_DK 16 /* 4016 FY5 (3X 1392, 1393) */
52	#define TUNER_PHILIPS_NTSC_M 17	50	#define TUNER_PHILIPS_NTSC_M 17
53	#define TUNER_TEMIC_4066FY5_PAL_I 18 /* 4066 FY5 (3X 7032, 7035) */	51	#define TUNER_TEMIC_4066FY5_PAL_I 18 /* 4066 FY5 (3X 7032, 7035) */
54	#define TUNER_TEMIC_4006FN5_MULTI_PAL 19 /* B/G, I and D/K autodetected (3X 7595, 7606, 7657)*/	52	#define TUNER_TEMIC_4006FN5_MULTI_PAL 19 /* B/G, I and D/K autodetected (3X 7595, 7606, 7657) */
55		53
56	#define TUNER_TEMIC_4009FR5_PAL 20 /* incl. FM radio (3X 7607, 7488, 7711)*/	54	#define TUNER_TEMIC_4009FR5_PAL 20 /* incl. FM radio (3X 7607, 7488, 7711) */
57	#define TUNER_TEMIC_4039FR5_NTSC 21 /* incl. FM radio (3X 7246, 7578, 7732)*/	55	#define TUNER_TEMIC_4039FR5_NTSC 21 /* incl. FM radio (3X 7246, 7578, 7732) */
58	#define TUNER_TEMIC_4046FM5 22 /* you must actively select B/G, D/K, I, L, L` ! (3X 7804, 7806, 8103, 8104)*/	56	#define TUNER_TEMIC_4046FM5 22 /* you must actively select B/G, D/K, I, L, L` ! (3X 7804, 7806, 8103, 8104) */
59	#define TUNER_PHILIPS_PAL_DK 23	57	#define TUNER_PHILIPS_PAL_DK 23
60		58
61	#define TUNER_PHILIPS_FQ1216ME 24 /* you must actively select B/G/D/K, I, L, L` */	59	#define TUNER_PHILIPS_FQ1216ME 24 /* you must actively select B/G/D/K, I, L, L` */
62	#define TUNER_LG_PAL_I_FM 25	60	#define TUNER_LG_PAL_I_FM 25
63	#define TUNER_LG_PAL_I 26	61	#define TUNER_LG_PAL_I 26
64	#define TUNER_LG_NTSC_FM 27	62	#define TUNER_LG_NTSC_FM 27
65		63
66	#define TUNER_LG_PAL_FM 28	64	#define TUNER_LG_PAL_FM 28
67	#define TUNER_LG_PAL 29	65	#define TUNER_LG_PAL 29
68	#define TUNER_TEMIC_4009FN5_MULTI_PAL_FM 30 /* B/G, I and D/K autodetected (3X 8155, 8160, 8163)*/	66	#define TUNER_TEMIC_4009FN5_MULTI_PAL_FM 30 /* B/G, I and D/K autodetected (3X 8155, 8160, 8163) */
69	#define TUNER_SHARP_2U5JF5540_NTSC 31	67	#define TUNER_SHARP_2U5JF5540_NTSC 31
70		68
71	#define TUNER_Samsung_PAL_TCPM9091PD27 32	69	#define TUNER_Samsung_PAL_TCPM9091PD27 32
72	#define TUNER_MT2032 33	70	#define TUNER_MT2032 33
73	#define TUNER_TEMIC_4106FH5 34 /* 4106 FH5 (3X 7808, 7865)*/	71	#define TUNER_TEMIC_4106FH5 34 /* 4106 FH5 (3X 7808, 7865) */
74	#define TUNER_TEMIC_4012FY5 35 /* 4012 FY5 (3X 0971, 1099)*/	72	#define TUNER_TEMIC_4012FY5 35 /* 4012 FY5 (3X 0971, 1099) */
75		73
76	#define TUNER_TEMIC_4136FY5 36 /* 4136 FY5 (3X 7708, 7746)*/	74	#define TUNER_TEMIC_4136FY5 36 /* 4136 FY5 (3X 7708, 7746) */
77	#define TUNER_LG_PAL_NEW_TAPC 37	75	#define TUNER_LG_PAL_NEW_TAPC 37
78	#define TUNER_PHILIPS_FM1216ME_MK3 38	76	#define TUNER_PHILIPS_FM1216ME_MK3 38
79	#define TUNER_LG_NTSC_NEW_TAPC 39	77	#define TUNER_LG_NTSC_NEW_TAPC 39
80		78
81	#define TUNER_HITACHI_NTSC 40	79	#define TUNER_HITACHI_NTSC 40
82	#define TUNER_PHILIPS_PAL_MK 41	80	#define TUNER_PHILIPS_PAL_MK 41
83	#define TUNER_PHILIPS_ATSC 42	81	#define TUNER_PHILIPS_ATSC 42
84	#define TUNER_PHILIPS_FM1236_MK3 43	82	#define TUNER_PHILIPS_FM1236_MK3 43
85		83
86	#define TUNER_PHILIPS_4IN1 44 /* ATI TV Wonder Pro - Conexant */	84	#define TUNER_PHILIPS_4IN1 44 /* ATI TV Wonder Pro - Conexant */
87	/* Microtune mergeged with Temic 12/31/1999 partially financed by Alps - these may be similar to Temic */	85	/* Microtune mergeged with Temic 12/31/1999 partially financed by Alps - these may be similar to Temic */
88	#define TUNER_MICROTUNE_4049FM5 45	86	#define TUNER_MICROTUNE_4049FM5 45
89	#define TUNER_LG_NTSC_TAPE 47	87	#define TUNER_MICROTUNE_4042_FI5 46
90		88	#define TUNER_LG_NTSC_TAPE 47
91	#define TUNER_TNF_8831BGFF 48	89
92	#define TUNER_MICROTUNE_4042FI5 49 /* DViCO FusionHDTV 3 Gold-Q - 4042 FI5 (3X 8147) */	90	#define TUNER_TNF_8831BGFF 48
93	#define TUNER_TCL_2002N 50	91	#define TUNER_MICROTUNE_4042FI5 49 /* DViCO FusionHDTV 3 Gold-Q - 4042 FI5 (3X 8147) */
94	#define TUNER_PHILIPS_FM1256_IH3 51	92	#define TUNER_TCL_2002N 50
95		93	#define TUNER_PHILIPS_FM1256_IH3 51
96	#define TUNER_THOMSON_DTT7610 52	94
97	#define TUNER_PHILIPS_FQ1286 53	95	#define TUNER_THOMSON_DTT7610 52
98	#define TUNER_PHILIPS_TDA8290 54	96	#define TUNER_PHILIPS_FQ1286 53
99	#define TUNER_LG_PAL_TAPE 55 /* Hauppauge PVR-150 PAL */	97	#define TUNER_PHILIPS_TDA8290 54
100		98	#define TUNER_LG_PAL_TAPE 55 /* Hauppauge PVR-150 PAL */
101	#define TUNER_PHILIPS_FQ1216AME_MK4 56 /* Hauppauge PVR-150 PAL */	99
102	#define TUNER_PHILIPS_FQ1236A_MK4 57 /* Hauppauge PVR-500MCE NTSC */	100	#define TUNER_PHILIPS_FQ1216AME_MK4 56 /* Hauppauge PVR-150 PAL */
103		101	#define TUNER_PHILIPS_FQ1236A_MK4 57 /* Hauppauge PVR-500MCE NTSC */
104	#define TUNER_YMEC_TVF_8531MF 58	102	#define TUNER_YMEC_TVF_8531MF 58
105	#define TUNER_YMEC_TVF_5533MF 59 /* Pixelview Pro Ultra NTSC */	103	#define TUNER_YMEC_TVF_5533MF 59 /* Pixelview Pro Ultra NTSC */
106	#define TUNER_THOMSON_DTT7611 60 /* DViCO FusionHDTV 3 Gold-T */	104
107	#define TUNER_TENA_9533_DI 61	105	#define TUNER_THOMSON_DTT7611 60 /* DViCO FusionHDTV 3 Gold-T */
108		106	#define TUNER_TENA_9533_DI 61
109	#define TUNER_TEA5767 62 /* Only FM Radio Tuner */	107	#define TUNER_TEA5767 62 /* Only FM Radio Tuner */
110	#define TUNER_PHILIPS_FMD1216ME_MK3 63	108	#define TUNER_PHILIPS_FMD1216ME_MK3 63
111	#define TUNER_LG_TDVS_H062F 64 /* DViCO FusionHDTV 5 */	109
112	#define TUNER_YMEC_TVF66T5_B_DFF 65 /* Acorp Y878F */	110	#define TUNER_LG_TDVS_H062F 64 /* DViCO FusionHDTV 5 */
		111	#define TUNER_YMEC_TVF66T5_B_DFF 65 /* Acorp Y878F */
		112	#define TUNER_LG_NTSC_TALN_MINI 66
113		113
114	#define NOTUNER 0	114	#define NOTUNER 0
115	#define PAL 1 /* PAL_BG */	115	#define PAL 1 /* PAL_BG */
@@ -117,7 +117,7 @@
117	#define NTSC 3	117	#define NTSC 3
118	#define SECAM 4	118	#define SECAM 4
119	#define ATSC 5	119	#define ATSC 5
120	#define RADIO 6	120	#define RADIO 6
121		121
122	#define NoTuner 0	122	#define NoTuner 0
123	#define Philips 1	123	#define Philips 1
@@ -134,6 +134,7 @@
134	#define THOMSON 12	134	#define THOMSON 12
135		135
136	#define TUNER_SET_TYPE_ADDR _IOW('T',3,int)	136	#define TUNER_SET_TYPE_ADDR _IOW('T',3,int)
		137	#define TUNER_SET_STANDBY _IOW('T',4,int)
137	#define TDA9887_SET_CONFIG _IOW('t',5,int)	138	#define TDA9887_SET_CONFIG _IOW('t',5,int)
138		139
139	/* tv card specific */	140	/* tv card specific */
@@ -153,9 +154,6 @@
153		154
154	#ifdef __KERNEL__	155	#ifdef __KERNEL__
155		156
156	#define I2C_ADDR_TDA8290 0x4b
157	#define I2C_ADDR_TDA8275 0x61
158
159	enum tuner_mode {	157	enum tuner_mode {
160	T_UNINITIALIZED = 0,	158	T_UNINITIALIZED = 0,
161	T_RADIO = 1 << V4L2_TUNER_RADIO,	159	T_RADIO = 1 << V4L2_TUNER_RADIO,
@@ -165,21 +163,21 @@ enum tuner_mode {
165	};	163	};
166		164
167	struct tuner_setup {	165	struct tuner_setup {
168	unsigned short addr;	166	unsigned short addr;
169	unsigned int type;	167	unsigned int type;
170	unsigned int mode_mask;	168	unsigned int mode_mask;
171	};	169	};
172		170
173	struct tuner {	171	struct tuner {
174	/* device */	172	/* device */
175	struct i2c_client i2c;	173	struct i2c_client i2c;
176		174
177	unsigned int type; /* chip type */	175	unsigned int type; /* chip type */
178		176
179	unsigned int mode;	177	unsigned int mode;
180	unsigned int mode_mask; /* Combination of allowable modes */	178	unsigned int mode_mask; /* Combination of allowable modes */
181		179
182	unsigned int freq; /* keep track of the current settings */	180	unsigned int freq; /* keep track of the current settings */
183	unsigned int audmode;	181	unsigned int audmode;
184	v4l2_std_id std;	182	v4l2_std_id std;
185		183
@@ -198,6 +196,7 @@ struct tuner {
198	void (radio_freq)(struct i2c_client c, unsigned int freq);	196	void (radio_freq)(struct i2c_client c, unsigned int freq);
199	int (has_signal)(struct i2c_client c);	197	int (has_signal)(struct i2c_client c);
200	int (is_stereo)(struct i2c_client c);	198	int (is_stereo)(struct i2c_client c);
		199	void (standby)(struct i2c_client c);
201	};	200	};
202		201
203	extern unsigned int tuner_debug;	202	extern unsigned int tuner_debug;
@@ -209,16 +208,20 @@ extern int tea5767_tuner_init(struct i2c_client *c);
209	extern int default_tuner_init(struct i2c_client *c);	208	extern int default_tuner_init(struct i2c_client *c);
210	extern int tea5767_autodetection(struct i2c_client *c);	209	extern int tea5767_autodetection(struct i2c_client *c);
211		210
212	#define tuner_warn(fmt, arg...) \	211	#define tuner_warn(fmt, arg...) do {\
213	dev_printk(KERN_WARNING , &t->i2c.dev , fmt , ## arg)	212	printk(KERN_WARNING "%s %d-%04x: " fmt, t->i2c.driver->name, \
214	#define tuner_info(fmt, arg...) \	213	t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0)
215	dev_printk(KERN_INFO , &t->i2c.dev , fmt , ## arg)	214	#define tuner_info(fmt, arg...) do {\
216	#define tuner_dbg(fmt, arg...) \	215	printk(KERN_INFO "%s %d-%04x: " fmt, t->i2c.driver->name, \
217	if (tuner_debug) dev_printk(KERN_DEBUG , &t->i2c.dev , fmt , ## arg)	216	t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0)
		217	#define tuner_dbg(fmt, arg...) do {\
		218	if (tuner_debug) \
		219	printk(KERN_DEBUG "%s %d-%04x: " fmt, t->i2c.driver->name, \
		220	t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0)
218		221
219	#endif /* __KERNEL__ */	222	#endif /* __KERNEL__ */
220		223
221	#endif	224	#endif /* _TUNER_H */
222		225
223	/*	226	/*
224	* Overrides for Emacs so that we follow Linus's tabbing style.	227	* Overrides for Emacs so that we follow Linus's tabbing style.