diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-01 07:36:31 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-01 07:36:31 -0300 |
| commit | e149dc20dba1c192f28fbeab92aac7f004a41273 (patch) | |
| tree | 18aaa82ffabd3790e47ef35e2f631932ef5c46e8 /linux/drivers/media/video/cx18/cx18-av-core.h | |
| parent | fdab553be22b01acd8124650ed75da649169596f (diff) | |
| parent | e8b1f94e600957e27366e37a729126388c705c7d (diff) | |
| download | mediapointer-dvb-s2-e149dc20dba1c192f28fbeab92aac7f004a41273.tar.gz mediapointer-dvb-s2-e149dc20dba1c192f28fbeab92aac7f004a41273.tar.bz2 | |
merge: http://linuxtv.org/hg/~anttip/af9015/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-av-core.h')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-av-core.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-av-core.h b/linux/drivers/media/video/cx18/cx18-av-core.h index 2687a2c91..c458120e8 100644 --- a/linux/drivers/media/video/cx18/cx18-av-core.h +++ b/linux/drivers/media/video/cx18/cx18-av-core.h @@ -355,11 +355,16 @@ int cx18_av_loadfw(struct cx18 *cx); /* ----------------------------------------------------------------------- */ /* cx18_av-audio.c */ -int cx18_av_audio(struct cx18 *cx, unsigned int cmd, void *arg); +int cx18_av_audio_g_ctrl(struct cx18 *cx, struct v4l2_control *ctrl); +int cx18_av_audio_s_ctrl(struct cx18 *cx, struct v4l2_control *ctrl); +int cx18_av_s_clock_freq(struct v4l2_subdev *sd, u32 freq); void cx18_av_audio_set_path(struct cx18 *cx); /* ----------------------------------------------------------------------- */ /* cx18_av-vbi.c */ -int cx18_av_vbi(struct cx18 *cx, unsigned int cmd, void *arg); +int cx18_av_decode_vbi_line(struct v4l2_subdev *sd, + struct v4l2_decode_vbi_line *vbi); +int cx18_av_vbi_g_fmt(struct cx18 *cx, struct v4l2_format *fmt); +int cx18_av_vbi_s_fmt(struct cx18 *cx, struct v4l2_format *fmt); #endif |