diff options
Diffstat (limited to 'include/media/tuner.h')
-rw-r--r-- | include/media/tuner.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/media/tuner.h b/include/media/tuner.h index 27cbf08c931..a5beeac495c 100644 --- a/include/media/tuner.h +++ b/include/media/tuner.h | |||
@@ -23,6 +23,7 @@ | |||
23 | #define _TUNER_H | 23 | #define _TUNER_H |
24 | 24 | ||
25 | #include <linux/videodev2.h> | 25 | #include <linux/videodev2.h> |
26 | #include <media/tuner-types.h> | ||
26 | 27 | ||
27 | #define ADDR_UNSET (255) | 28 | #define ADDR_UNSET (255) |
28 | 29 | ||
@@ -114,6 +115,7 @@ | |||
114 | 115 | ||
115 | #define TUNER_PHILIPS_TUV1236D 68 /* ATI HDTV Wonder */ | 116 | #define TUNER_PHILIPS_TUV1236D 68 /* ATI HDTV Wonder */ |
116 | #define TUNER_TNF_5335MF 69 /* Sabrent Bt848 */ | 117 | #define TUNER_TNF_5335MF 69 /* Sabrent Bt848 */ |
118 | #define TUNER_SAMSUNG_TCPN_2121P30A 70 /* Hauppauge PVR-500MCE NTSC */ | ||
117 | 119 | ||
118 | /* tv card specific */ | 120 | /* tv card specific */ |
119 | #define TDA9887_PRESENT (1<<0) | 121 | #define TDA9887_PRESENT (1<<0) |
@@ -177,7 +179,9 @@ struct tuner { | |||
177 | unsigned int mode; | 179 | unsigned int mode; |
178 | unsigned int mode_mask; /* Combination of allowable modes */ | 180 | unsigned int mode_mask; /* Combination of allowable modes */ |
179 | 181 | ||
180 | unsigned int freq; /* keep track of the current settings */ | 182 | unsigned int tv_freq; /* keep track of the current settings */ |
183 | unsigned int radio_freq; | ||
184 | u16 last_div; | ||
181 | unsigned int audmode; | 185 | unsigned int audmode; |
182 | v4l2_std_id std; | 186 | v4l2_std_id std; |
183 | 187 | ||
@@ -195,8 +199,8 @@ struct tuner { | |||
195 | unsigned int sgIF; | 199 | unsigned int sgIF; |
196 | 200 | ||
197 | /* function ptrs */ | 201 | /* function ptrs */ |
198 | void (*tv_freq)(struct i2c_client *c, unsigned int freq); | 202 | void (*set_tv_freq)(struct i2c_client *c, unsigned int freq); |
199 | void (*radio_freq)(struct i2c_client *c, unsigned int freq); | 203 | void (*set_radio_freq)(struct i2c_client *c, unsigned int freq); |
200 | int (*has_signal)(struct i2c_client *c); | 204 | int (*has_signal)(struct i2c_client *c); |
201 | int (*is_stereo)(struct i2c_client *c); | 205 | int (*is_stereo)(struct i2c_client *c); |
202 | void (*standby)(struct i2c_client *c); | 206 | void (*standby)(struct i2c_client *c); |