diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-06-21 10:36:31 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-06-21 10:36:31 +0200 |
| commit | b851841e48464de8b2e00d37754a09a2d0d4aec5 (patch) | |
| tree | 829a1640fbf1f789c6d6a1855558a3a12ec0732a /linux/drivers/media/video/cx18/cx18-driver.c | |
| parent | 905ca81b4dec5e26659c1316091470e4f0f25eda (diff) | |
| download | mediapointer-dvb-s2-b851841e48464de8b2e00d37754a09a2d0d4aec5.tar.gz mediapointer-dvb-s2-b851841e48464de8b2e00d37754a09a2d0d4aec5.tar.bz2 | |
cx18: convert to video_ioctl2()
From: Andy Walls <awalls@radix.net>
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>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-driver.c')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-driver.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-driver.c b/linux/drivers/media/video/cx18/cx18-driver.c index d9178843e..e9c7e07b9 100644 --- a/linux/drivers/media/video/cx18/cx18-driver.c +++ b/linux/drivers/media/video/cx18/cx18-driver.c @@ -818,6 +818,9 @@ int cx18_init_on_first_open(struct cx18 *cx) int video_input; int fw_retry_count = 3; struct v4l2_frequency vf; + struct cx18_open_id fh; + + fh.cx = cx; if (test_bit(CX18_F_I_FAILED, &cx->i_flags)) return -ENXIO; @@ -869,13 +872,13 @@ int cx18_init_on_first_open(struct cx18 *cx) video_input = cx->active_input; cx->active_input++; /* Force update of input */ - cx18_v4l2_ioctls(cx, NULL, VIDIOC_S_INPUT, &video_input); + cx18_s_input(NULL, &fh, video_input); /* Let the VIDIOC_S_STD ioctl do all the work, keeps the code in one place. */ cx->std++; /* Force full standard initialization */ - cx18_v4l2_ioctls(cx, NULL, VIDIOC_S_STD, &cx->tuner_std); - cx18_v4l2_ioctls(cx, NULL, VIDIOC_S_FREQUENCY, &vf); + cx18_s_std(NULL, &fh, &cx->tuner_std); + cx18_s_frequency(NULL, &fh, &vf); return 0; } |