aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/davinci/vpif_capture.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/platform/davinci/vpif_capture.h')
-rw-r--r--drivers/media/platform/davinci/vpif_capture.h16
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/media/platform/davinci/vpif_capture.h b/drivers/media/platform/davinci/vpif_capture.h
index d24efc17e4c8..3d3c1e5cd5d4 100644
--- a/drivers/media/platform/davinci/vpif_capture.h
+++ b/drivers/media/platform/davinci/vpif_capture.h
@@ -54,8 +54,6 @@ struct video_obj {
54 /* Currently selected or default standard */ 54 /* Currently selected or default standard */
55 v4l2_std_id stdid; 55 v4l2_std_id stdid;
56 struct v4l2_dv_timings dv_timings; 56 struct v4l2_dv_timings dv_timings;
57 /* This is to track the last input that is passed to application */
58 u32 input_idx;
59}; 57};
60 58
61struct vpif_cap_buffer { 59struct vpif_cap_buffer {
@@ -119,10 +117,10 @@ struct channel_obj {
119 u8 initialized; 117 u8 initialized;
120 /* Identifies channel */ 118 /* Identifies channel */
121 enum vpif_channel_id channel_id; 119 enum vpif_channel_id channel_id;
122 /* index into sd table */ 120 /* Current input */
123 int curr_sd_index; 121 u32 input_idx;
124 /* ptr to current sub device information */ 122 /* subdev corresponding to the current input, may be NULL */
125 struct vpif_subdev_info *curr_subdev_info; 123 struct v4l2_subdev *sd;
126 /* vpif configuration params */ 124 /* vpif configuration params */
127 struct vpif_params vpifparams; 125 struct vpif_params vpifparams;
128 /* common object array */ 126 /* common object array */
@@ -159,10 +157,6 @@ struct vpif_config_params {
159 u32 video_limit[VPIF_CAPTURE_NUM_CHANNELS]; 157 u32 video_limit[VPIF_CAPTURE_NUM_CHANNELS];
160 u8 max_device_type; 158 u8 max_device_type;
161}; 159};
162/* Struct which keeps track of the line numbers for the sliced vbi service */ 160
163struct vpif_service_line {
164 u16 service_id;
165 u16 service_line[2];
166};
167#endif /* End of __KERNEL__ */ 161#endif /* End of __KERNEL__ */
168#endif /* VPIF_CAPTURE_H */ 162#endif /* VPIF_CAPTURE_H */