summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/zoran/zoran_driver.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-03-08 21:04:38 +0100
committerHans Verkuil <hverkuil@xs4all.nl>2009-03-08 21:04:38 +0100
commit70e434a0770289c85c4cf61a2956160e24d76bcf (patch)
tree2f032964393f33bfa47408fa4909aefbc836d504 /linux/drivers/media/video/zoran/zoran_driver.c
parent3d3fd89aabd81c1e33baf3dcf16329457cd82c77 (diff)
downloadmediapointer-dvb-s2-70e434a0770289c85c4cf61a2956160e24d76bcf.tar.gz
mediapointer-dvb-s2-70e434a0770289c85c4cf61a2956160e24d76bcf.tar.bz2
zoran/bt819: use new notify functionality.
From: Hans Verkuil <hverkuil@xs4all.nl> Bt819 needs the parent driver to drive a GPIO pin low and high in order to reset its fifo. Use the new notify callback for this. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/zoran/zoran_driver.c')
-rw-r--r--linux/drivers/media/video/zoran/zoran_driver.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/linux/drivers/media/video/zoran/zoran_driver.c b/linux/drivers/media/video/zoran/zoran_driver.c
index 8eda83b06..e7b0aba57 100644
--- a/linux/drivers/media/video/zoran/zoran_driver.c
+++ b/linux/drivers/media/video/zoran/zoran_driver.c
@@ -1525,7 +1525,7 @@ zoran_set_norm (struct zoran *zr,
v4l2_std_id std = 0;
decoder_call(zr, video, querystd, &std);
- decoder_s_std(zr, std);
+ decoder_call(zr, tuner, s_std, std);
/* let changes come into effect */
ssleep(2);
@@ -1537,7 +1537,7 @@ zoran_set_norm (struct zoran *zr,
"%s: set_norm() - no norm detected\n",
ZR_DEVNAME(zr));
/* reset norm */
- decoder_s_std(zr, zr->norm);
+ decoder_call(zr, tuner, s_std, zr->norm);
return -EIO;
}
@@ -1556,7 +1556,7 @@ zoran_set_norm (struct zoran *zr,
if (on)
zr36057_overlay(zr, 0);
- decoder_s_std(zr, norm);
+ decoder_call(zr, tuner, s_std, norm);
encoder_call(zr, video, s_std_output, norm);
if (on)
@@ -1598,7 +1598,7 @@ zoran_set_input (struct zoran *zr,
route.input = zr->card.input[input].muxsel;
zr->input = input;
- decoder_s_routing(zr, &route);
+ decoder_call(zr, video, s_routing, &route);
return 0;
}
@@ -1843,7 +1843,7 @@ jpgreqbuf_unlock_and_return:
goto gstat_unlock_and_return;
}
- decoder_s_routing(zr, &route);
+ decoder_call(zr, video, s_routing, &route);
/* sleep 1 second */
ssleep(1);
@@ -1854,7 +1854,7 @@ jpgreqbuf_unlock_and_return:
/* restore previous input and norm */
route.input = zr->card.input[zr->input].muxsel;
- decoder_s_routing(zr, &route);
+ decoder_call(zr, video, s_routing, &route);
gstat_unlock_and_return:
mutex_unlock(&zr->resource_lock);