aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/davinci/vpif_display.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/platform/davinci/vpif_display.h')
-rw-r--r--drivers/media/platform/davinci/vpif_display.h18
1 files changed, 2 insertions, 16 deletions
diff --git a/drivers/media/platform/davinci/vpif_display.h b/drivers/media/platform/davinci/vpif_display.h
index f628ebcf3674..a5a18f74395c 100644
--- a/drivers/media/platform/davinci/vpif_display.h
+++ b/drivers/media/platform/davinci/vpif_display.h
@@ -62,13 +62,6 @@ struct video_obj {
62 v4l2_std_id stdid; /* Currently selected or default 62 v4l2_std_id stdid; /* Currently selected or default
63 * standard */ 63 * standard */
64 struct v4l2_dv_timings dv_timings; 64 struct v4l2_dv_timings dv_timings;
65 u32 output_id; /* Current output id */
66};
67
68struct vbi_obj {
69 int num_services;
70 struct vpif_vbi_params vbiparams; /* vpif parameters for the raw
71 * vbi data */
72}; 65};
73 66
74struct vpif_disp_buffer { 67struct vpif_disp_buffer {
@@ -131,12 +124,13 @@ struct channel_obj {
131 * which is being displayed */ 124 * which is being displayed */
132 u8 initialized; /* flag to indicate whether 125 u8 initialized; /* flag to indicate whether
133 * encoder is initialized */ 126 * encoder is initialized */
127 u32 output_idx; /* Current output index */
128 struct v4l2_subdev *sd; /* Current output subdev(may be NULL) */
134 129
135 enum vpif_channel_id channel_id;/* Identifies channel */ 130 enum vpif_channel_id channel_id;/* Identifies channel */
136 struct vpif_params vpifparams; 131 struct vpif_params vpifparams;
137 struct common_obj common[VPIF_NUMOBJECTS]; 132 struct common_obj common[VPIF_NUMOBJECTS];
138 struct video_obj video; 133 struct video_obj video;
139 struct vbi_obj vbi;
140}; 134};
141 135
142/* File handle structure */ 136/* File handle structure */
@@ -168,12 +162,4 @@ struct vpif_config_params {
168 u8 min_numbuffers; 162 u8 min_numbuffers;
169}; 163};
170 164
171/* Struct which keeps track of the line numbers for the sliced vbi service */
172struct vpif_service_line {
173 u16 service_id;
174 u16 service_line[2];
175 u16 enc_service_id;
176 u8 bytestowrite;
177};
178
179#endif /* DAVINCIHD_DISPLAY_H */ 165#endif /* DAVINCIHD_DISPLAY_H */