aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx18/cx18-ioctl.h
diff options
context:
space:
mode:
authorAndy Walls <awalls@radix.net>2008-06-21 07:36:31 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 06:10:43 -0400
commit3b6fe58f0f18880200969e813d0181d1bdab0966 (patch)
treee059efc521b5eeb2b0f022f7c7e56d3a8f3b7a86 /drivers/media/video/cx18/cx18-ioctl.h
parent1a05221bc45ccb1b5c583a87dc3639bfc10c4f10 (diff)
V4L/DVB (8082): cx18: convert to video_ioctl2()
cx18: convert driver to use video_ioctl2(). Pushed down ioctl debug messages and priority checks as well. Still left serialization lock in place for now. #if 0'ed out sliced vbi ioctl code for now. Patch heavily based on similar changes made to ivtv by Hans Verkuil. Signed-off-by: Andy Walls <awalls@radix.net> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx18/cx18-ioctl.h')
-rw-r--r--drivers/media/video/cx18/cx18-ioctl.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/cx18/cx18-ioctl.h b/drivers/media/video/cx18/cx18-ioctl.h
index 9f4c7eb2897f..2222f679d86d 100644
--- a/drivers/media/video/cx18/cx18-ioctl.h
+++ b/drivers/media/video/cx18/cx18-ioctl.h
@@ -24,7 +24,9 @@
24u16 cx18_service2vbi(int type); 24u16 cx18_service2vbi(int type);
25void cx18_expand_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal); 25void cx18_expand_service_set(struct v4l2_sliced_vbi_format *fmt, int is_pal);
26u16 cx18_get_service_set(struct v4l2_sliced_vbi_format *fmt); 26u16 cx18_get_service_set(struct v4l2_sliced_vbi_format *fmt);
27void cx18_set_funcs(struct video_device *vdev);
28int cx18_s_std(struct file *file, void *fh, v4l2_std_id *std);
29int cx18_s_frequency(struct file *file, void *fh, struct v4l2_frequency *vf);
30int cx18_s_input(struct file *file, void *fh, unsigned int inp);
27int cx18_v4l2_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, 31int cx18_v4l2_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
28 unsigned long arg); 32 unsigned long arg);
29int cx18_v4l2_ioctls(struct cx18 *cx, struct file *filp, unsigned cmd,
30 void *arg);