diff options
| author | Mike Isely <isely@pobox.com> | 2006-03-25 16:47:08 -0600 |
|---|---|---|
| committer | Mike Isely <isely@pobox.com> | 2006-03-25 16:47:08 -0600 |
| commit | 8b44741ac5b22de76954864b0db14a8d4ed5db07 (patch) | |
| tree | e01c8a8f0ca2faab8756c457a76e42391a5decdb | |
| parent | 23fb60e03b25fa009ed530d83c5cb7463b96bdc9 (diff) | |
| download | mediapointer-dvb-s2-8b44741ac5b22de76954864b0db14a8d4ed5db07.tar.gz mediapointer-dvb-s2-8b44741ac5b22de76954864b0db14a8d4ed5db07.tar.bz2 | |
Adjust pvrusb2 stream on/off control handling
From: Mike Isely <isely@pobox.com>
Code in pvrusb2 which issues stream on/off commands was previously in
a place specific to the saa7115. This change moves that function to a
place where it can be used for other things (like controlling a future
cx25840).
Signed-off-by: Mike Isely <isely@pobox.com>
3 files changed, 11 insertions, 2 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c index 69864782b..7721e405e 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c @@ -239,6 +239,13 @@ const struct pvr2_i2c_op pvr2_i2c_op_v4l2_log = { }; +void pvr2_v4l2_cmd_stream(struct pvr2_i2c_client *cp,int fl) +{ + pvr2_i2c_client_cmd(cp, + (fl ? VIDIOC_STREAMON : VIDIOC_STREAMOFF),0); +} + + /* Stuff for Emacs to see, in order to encourage consistent editing style: *** Local Variables: *** diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h index fa0a3af7e..1666a3287 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h @@ -33,6 +33,8 @@ extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_frequency; extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_size; extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_log; +void pvr2_v4l2_cmd_stream(struct pvr2_i2c_client *,int); + #endif /* __PVRUSB2_CMD_V4L2_H */ /* diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c b/linux/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c index d0bc3682b..7078ac3ad 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c @@ -29,6 +29,7 @@ */ #include "pvrusb2-video-v4l.h" +#include "pvrusb2-i2c-cmd-v4l2.h" #include "pvrusb2-hdw-internal.h" @@ -173,8 +174,7 @@ static int decoder_detect(struct pvr2_i2c_client *cp) static void decoder_enable(struct pvr2_v4l_decoder *ctxt,int fl) { pvr2_trace(PVR2_TRACE_CHIPS,"i2c v4l2 decoder_enable(%d)",fl); - pvr2_i2c_client_cmd(ctxt->client, - (fl ? VIDIOC_STREAMON : VIDIOC_STREAMOFF),0); + pvr2_v4l2_cmd_stream(ctxt->client,fl); } |