diff options
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-driver.h')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-driver.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h index 06f3d78389bf..f767df943954 100644 --- a/drivers/media/video/ivtv/ivtv-driver.h +++ b/drivers/media/video/ivtv/ivtv-driver.h | |||
@@ -331,6 +331,7 @@ struct ivtv_stream { | |||
331 | struct ivtv *itv; /* for ease of use */ | 331 | struct ivtv *itv; /* for ease of use */ |
332 | const char *name; /* name of the stream */ | 332 | const char *name; /* name of the stream */ |
333 | int type; /* stream type */ | 333 | int type; /* stream type */ |
334 | u32 caps; /* V4L2 capabilities */ | ||
334 | 335 | ||
335 | struct v4l2_fh *fh; /* pointer to the streaming filehandle */ | 336 | struct v4l2_fh *fh; /* pointer to the streaming filehandle */ |
336 | spinlock_t qlock; /* locks access to the queues */ | 337 | spinlock_t qlock; /* locks access to the queues */ |
@@ -630,6 +631,16 @@ struct ivtv { | |||
630 | 631 | ||
631 | struct v4l2_device v4l2_dev; | 632 | struct v4l2_device v4l2_dev; |
632 | struct cx2341x_handler cxhdl; | 633 | struct cx2341x_handler cxhdl; |
634 | struct { | ||
635 | /* PTS/Frame count control cluster */ | ||
636 | struct v4l2_ctrl *ctrl_pts; | ||
637 | struct v4l2_ctrl *ctrl_frame; | ||
638 | }; | ||
639 | struct { | ||
640 | /* Audio Playback control cluster */ | ||
641 | struct v4l2_ctrl *ctrl_audio_playback; | ||
642 | struct v4l2_ctrl *ctrl_audio_multilingual_playback; | ||
643 | }; | ||
633 | struct v4l2_ctrl_handler hdl_gpio; | 644 | struct v4l2_ctrl_handler hdl_gpio; |
634 | struct v4l2_subdev sd_gpio; /* GPIO sub-device */ | 645 | struct v4l2_subdev sd_gpio; /* GPIO sub-device */ |
635 | u16 instance; | 646 | u16 instance; |
@@ -649,7 +660,6 @@ struct ivtv { | |||
649 | u8 audio_stereo_mode; /* decoder setting how to handle stereo MPEG audio */ | 660 | u8 audio_stereo_mode; /* decoder setting how to handle stereo MPEG audio */ |
650 | u8 audio_bilingual_mode; /* decoder setting how to handle bilingual MPEG audio */ | 661 | u8 audio_bilingual_mode; /* decoder setting how to handle bilingual MPEG audio */ |
651 | 662 | ||
652 | |||
653 | /* Locking */ | 663 | /* Locking */ |
654 | spinlock_t lock; /* lock access to this struct */ | 664 | spinlock_t lock; /* lock access to this struct */ |
655 | struct mutex serialize_lock; /* mutex used to serialize open/close/start/stop/ioctl operations */ | 665 | struct mutex serialize_lock; /* mutex used to serialize open/close/start/stop/ioctl operations */ |