aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h')
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
index da29ae2fb05..b9df52c882a 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
@@ -214,7 +214,6 @@ struct pvr2_hdw {
214 /* Frequency table */ 214 /* Frequency table */
215 unsigned int freqTable[FREQTABLE_SIZE]; 215 unsigned int freqTable[FREQTABLE_SIZE];
216 unsigned int freqProgSlot; 216 unsigned int freqProgSlot;
217 unsigned int freqSlot;
218 217
219 /* Stuff for handling low level control interaction with device */ 218 /* Stuff for handling low level control interaction with device */
220 struct mutex ctl_lock_mutex; 219 struct mutex ctl_lock_mutex;
@@ -260,7 +259,11 @@ struct pvr2_hdw {
260 /* Tuner / frequency control stuff */ 259 /* Tuner / frequency control stuff */
261 unsigned int tuner_type; 260 unsigned int tuner_type;
262 int tuner_updated; 261 int tuner_updated;
263 unsigned int freqVal; 262 unsigned int freqValTelevision; /* Current freq for tv mode */
263 unsigned int freqValRadio; /* Current freq for radio mode */
264 unsigned int freqSlotTelevision; /* Current slot for tv mode */
265 unsigned int freqSlotRadio; /* Current slot for radio mode */
266 unsigned int freqSelector; /* 0=radio 1=television */
264 int freqDirty; 267 int freqDirty;
265 268
266 /* Video standard handling */ 269 /* Video standard handling */
@@ -323,6 +326,7 @@ struct pvr2_hdw {
323 VCREATE_DATA(res_hor); 326 VCREATE_DATA(res_hor);
324 VCREATE_DATA(res_ver); 327 VCREATE_DATA(res_ver);
325 VCREATE_DATA(srate); 328 VCREATE_DATA(srate);
329 VCREATE_DATA(automodeswitch);
326#undef VCREATE_DATA 330#undef VCREATE_DATA
327 331
328 struct pvr2_ctld_info *mpeg_ctrl_info; 332 struct pvr2_ctld_info *mpeg_ctrl_info;
@@ -331,6 +335,9 @@ struct pvr2_hdw {
331 unsigned int control_cnt; 335 unsigned int control_cnt;
332}; 336};
333 337
338/* This function gets the current frequency */
339unsigned long pvr2_hdw_get_cur_freq(struct pvr2_hdw *);
340
334#endif /* __PVRUSB2_HDW_INTERNAL_H */ 341#endif /* __PVRUSB2_HDW_INTERNAL_H */
335 342
336/* 343/*