diff options
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h index 217bbe5d5c80..4fd5ca2f6fc9 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h +++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | |||
@@ -39,6 +39,7 @@ | |||
39 | #include <linux/mutex.h> | 39 | #include <linux/mutex.h> |
40 | #include "pvrusb2-hdw.h" | 40 | #include "pvrusb2-hdw.h" |
41 | #include "pvrusb2-io.h" | 41 | #include "pvrusb2-io.h" |
42 | #include <media/cx2341x.h> | ||
42 | 43 | ||
43 | /* Legal values for the SRATE state variable */ | 44 | /* Legal values for the SRATE state variable */ |
44 | #define PVR2_CVAL_SRATE_48 0 | 45 | #define PVR2_CVAL_SRATE_48 0 |
@@ -144,6 +145,13 @@ struct pvr2_ctl_info { | |||
144 | }; | 145 | }; |
145 | 146 | ||
146 | 147 | ||
148 | /* Same as pvr2_ctl_info, but includes storage for the control description */ | ||
149 | #define PVR2_CTLD_INFO_DESC_SIZE 32 | ||
150 | struct pvr2_ctld_info { | ||
151 | struct pvr2_ctl_info info; | ||
152 | char desc[PVR2_CTLD_INFO_DESC_SIZE]; | ||
153 | }; | ||
154 | |||
147 | struct pvr2_ctrl { | 155 | struct pvr2_ctrl { |
148 | const struct pvr2_ctl_info *info; | 156 | const struct pvr2_ctl_info *info; |
149 | struct pvr2_hdw *hdw; | 157 | struct pvr2_hdw *hdw; |
@@ -312,6 +320,7 @@ struct pvr2_hdw { | |||
312 | int flag_bilingual; | 320 | int flag_bilingual; |
313 | struct pvr2_audio_stat *audio_stat; | 321 | struct pvr2_audio_stat *audio_stat; |
314 | 322 | ||
323 | |||
315 | /* Control state */ | 324 | /* Control state */ |
316 | #define VCREATE_DATA(lab) int lab##_val; int lab##_dirty | 325 | #define VCREATE_DATA(lab) int lab##_val; int lab##_dirty |
317 | VCREATE_DATA(brightness); | 326 | VCREATE_DATA(brightness); |
@@ -323,6 +332,10 @@ struct pvr2_hdw { | |||
323 | VCREATE_DATA(bass); | 332 | VCREATE_DATA(bass); |
324 | VCREATE_DATA(treble); | 333 | VCREATE_DATA(treble); |
325 | VCREATE_DATA(mute); | 334 | VCREATE_DATA(mute); |
335 | VCREATE_DATA(input); | ||
336 | VCREATE_DATA(audiomode); | ||
337 | VCREATE_DATA(res_hor); | ||
338 | VCREATE_DATA(res_ver); | ||
326 | VCREATE_DATA(srate); | 339 | VCREATE_DATA(srate); |
327 | VCREATE_DATA(audiobitrate); | 340 | VCREATE_DATA(audiobitrate); |
328 | VCREATE_DATA(audiocrc); | 341 | VCREATE_DATA(audiocrc); |
@@ -330,15 +343,13 @@ struct pvr2_hdw { | |||
330 | VCREATE_DATA(vbr); | 343 | VCREATE_DATA(vbr); |
331 | VCREATE_DATA(videobitrate); | 344 | VCREATE_DATA(videobitrate); |
332 | VCREATE_DATA(videopeak); | 345 | VCREATE_DATA(videopeak); |
333 | VCREATE_DATA(input); | ||
334 | VCREATE_DATA(audiomode); | ||
335 | VCREATE_DATA(res_hor); | ||
336 | VCREATE_DATA(res_ver); | ||
337 | VCREATE_DATA(interlace); | 346 | VCREATE_DATA(interlace); |
338 | VCREATE_DATA(audiolayer); | 347 | VCREATE_DATA(audiolayer); |
339 | #undef VCREATE_DATA | 348 | #undef VCREATE_DATA |
340 | 349 | ||
350 | |||
341 | struct pvr2_ctrl *controls; | 351 | struct pvr2_ctrl *controls; |
352 | unsigned int control_cnt; | ||
342 | }; | 353 | }; |
343 | 354 | ||
344 | int pvr2_hdw_commit_ctl_internal(struct pvr2_hdw *hdw); | 355 | int pvr2_hdw_commit_ctl_internal(struct pvr2_hdw *hdw); |