diff options
Diffstat (limited to 'include/media/cx2341x.h')
-rw-r--r-- | include/media/cx2341x.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/media/cx2341x.h b/include/media/cx2341x.h index 51fb06b4c394..d91d88f93c8b 100644 --- a/include/media/cx2341x.h +++ b/include/media/cx2341x.h | |||
@@ -25,8 +25,13 @@ enum cx2341x_port { | |||
25 | CX2341X_PORT_SERIAL = 2 | 25 | CX2341X_PORT_SERIAL = 2 |
26 | }; | 26 | }; |
27 | 27 | ||
28 | enum cx2341x_cap { | ||
29 | CX2341X_CAP_HAS_SLICED_VBI = 1 << 0, | ||
30 | }; | ||
31 | |||
28 | struct cx2341x_mpeg_params { | 32 | struct cx2341x_mpeg_params { |
29 | /* misc */ | 33 | /* misc */ |
34 | u32 capabilities; | ||
30 | enum cx2341x_port port; | 35 | enum cx2341x_port port; |
31 | u16 width; | 36 | u16 width; |
32 | u16 height; | 37 | u16 height; |
@@ -34,6 +39,7 @@ struct cx2341x_mpeg_params { | |||
34 | 39 | ||
35 | /* stream */ | 40 | /* stream */ |
36 | enum v4l2_mpeg_stream_type stream_type; | 41 | enum v4l2_mpeg_stream_type stream_type; |
42 | enum v4l2_mpeg_stream_vbi_fmt stream_vbi_fmt; | ||
37 | 43 | ||
38 | /* audio */ | 44 | /* audio */ |
39 | enum v4l2_mpeg_audio_sampling_freq audio_sampling_freq; | 45 | enum v4l2_mpeg_audio_sampling_freq audio_sampling_freq; |
@@ -83,9 +89,9 @@ int cx2341x_ctrl_query(struct cx2341x_mpeg_params *params, | |||
83 | struct v4l2_queryctrl *qctrl); | 89 | struct v4l2_queryctrl *qctrl); |
84 | const char **cx2341x_ctrl_get_menu(u32 id); | 90 | const char **cx2341x_ctrl_get_menu(u32 id); |
85 | int cx2341x_ext_ctrls(struct cx2341x_mpeg_params *params, | 91 | int cx2341x_ext_ctrls(struct cx2341x_mpeg_params *params, |
86 | struct v4l2_ext_controls *ctrls, int cmd); | 92 | struct v4l2_ext_controls *ctrls, unsigned int cmd); |
87 | void cx2341x_fill_defaults(struct cx2341x_mpeg_params *p); | 93 | void cx2341x_fill_defaults(struct cx2341x_mpeg_params *p); |
88 | void cx2341x_log_status(struct cx2341x_mpeg_params *p, int cardid); | 94 | void cx2341x_log_status(struct cx2341x_mpeg_params *p, const char *prefix); |
89 | 95 | ||
90 | /* Firmware names */ | 96 | /* Firmware names */ |
91 | #define CX2341X_FIRM_ENC_FILENAME "v4l-cx2341x-enc.fw" | 97 | #define CX2341X_FIRM_ENC_FILENAME "v4l-cx2341x-enc.fw" |