diff options
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/cx2341x.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/media/cx2341x.h b/include/media/cx2341x.h index 5f4608e88476..9ec4d5889ef5 100644 --- a/include/media/cx2341x.h +++ b/include/media/cx2341x.h | |||
@@ -27,6 +27,7 @@ enum cx2341x_port { | |||
27 | 27 | ||
28 | enum cx2341x_cap { | 28 | enum cx2341x_cap { |
29 | CX2341X_CAP_HAS_SLICED_VBI = 1 << 0, | 29 | CX2341X_CAP_HAS_SLICED_VBI = 1 << 0, |
30 | CX2341X_CAP_HAS_TS = 1 << 1, | ||
30 | }; | 31 | }; |
31 | 32 | ||
32 | struct cx2341x_mpeg_params { | 33 | struct cx2341x_mpeg_params { |
@@ -88,13 +89,13 @@ typedef int (*cx2341x_mbox_func)(void *priv, u32 cmd, int in, int out, | |||
88 | int cx2341x_update(void *priv, cx2341x_mbox_func func, | 89 | int cx2341x_update(void *priv, cx2341x_mbox_func func, |
89 | const struct cx2341x_mpeg_params *old, | 90 | const struct cx2341x_mpeg_params *old, |
90 | const struct cx2341x_mpeg_params *new); | 91 | const struct cx2341x_mpeg_params *new); |
91 | int cx2341x_ctrl_query(struct cx2341x_mpeg_params *params, | 92 | int cx2341x_ctrl_query(const struct cx2341x_mpeg_params *params, |
92 | struct v4l2_queryctrl *qctrl); | 93 | struct v4l2_queryctrl *qctrl); |
93 | const char **cx2341x_ctrl_get_menu(u32 id); | 94 | const char **cx2341x_ctrl_get_menu(const struct cx2341x_mpeg_params *p, u32 id); |
94 | int cx2341x_ext_ctrls(struct cx2341x_mpeg_params *params, int busy, | 95 | int cx2341x_ext_ctrls(struct cx2341x_mpeg_params *params, int busy, |
95 | struct v4l2_ext_controls *ctrls, unsigned int cmd); | 96 | struct v4l2_ext_controls *ctrls, unsigned int cmd); |
96 | void cx2341x_fill_defaults(struct cx2341x_mpeg_params *p); | 97 | void cx2341x_fill_defaults(struct cx2341x_mpeg_params *p); |
97 | void cx2341x_log_status(struct cx2341x_mpeg_params *p, const char *prefix); | 98 | void cx2341x_log_status(const struct cx2341x_mpeg_params *p, const char *prefix); |
98 | 99 | ||
99 | /* Firmware names */ | 100 | /* Firmware names */ |
100 | #define CX2341X_FIRM_ENC_FILENAME "v4l-cx2341x-enc.fw" | 101 | #define CX2341X_FIRM_ENC_FILENAME "v4l-cx2341x-enc.fw" |