diff options
| author | pboettcher@dibcom68.dibcom.fr <pboettcher@dibcom68.dibcom.fr> | 2006-04-07 09:31:51 +0200 |
|---|---|---|
| committer | pboettcher@dibcom68.dibcom.fr <pboettcher@dibcom68.dibcom.fr> | 2006-04-07 09:31:51 +0200 |
| commit | f62b12acad6cf4c6e78bc2dd7e3e445f2d239d24 (patch) | |
| tree | a73819bc4ad336cafcf90648613eabd96cc23f7f /linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c | |
| parent | 3cdabc5516eb8974b43dc1febf8010d550c1de65 (diff) | |
| parent | 2fec184983c06bf36e79ddae3c2ddf2d8ab61f2d (diff) | |
| download | mediapointer-dvb-s2-f62b12acad6cf4c6e78bc2dd7e3e445f2d239d24.tar.gz mediapointer-dvb-s2-f62b12acad6cf4c6e78bc2dd7e3e445f2d239d24.tar.bz2 | |
merge: from main
From: Patrick Boettcher <pb@linuxtv.org>
merge: from main
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c | 30 |
1 files changed, 5 insertions, 25 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 000c26911..b3d2ce926 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c @@ -24,43 +24,23 @@ #include "pvrusb2-hdw-internal.h" #include "pvrusb2-debug.h" #include <linux/videodev.h> +#include <linux/videodev2.h> static void set_standard(struct pvr2_hdw *hdw) { - int cvstd = hdw->controls[PVR2_CID_VIDEOSTANDARD].value; v4l2_std_id vs; + vs = hdw->controls[PVR2_CID_STDCUR].value; pvr2_trace(PVR2_TRACE_CHIPS, - "i2c v4l2 set_standard(%d)",cvstd); - - switch (cvstd) { - default: - case PVR2_CVAL_VIDEOSTANDARD_NTSC_M: - vs = V4L2_STD_NTSC_M; - break; - case PVR2_CVAL_VIDEOSTANDARD_SECAM_L: - vs = V4L2_STD_SECAM; - break; - case PVR2_CVAL_VIDEOSTANDARD_PAL_BG: - vs = V4L2_STD_PAL_BG; - break; - case PVR2_CVAL_VIDEOSTANDARD_PAL_I: - vs = V4L2_STD_PAL_I; - break; - case PVR2_CVAL_VIDEOSTANDARD_PAL_DK: - vs = V4L2_STD_PAL_DK; - break; - case PVR2_CVAL_VIDEOSTANDARD_PAL_M: - vs = V4L2_STD_PAL_M; - break; - } + "i2c v4l2 set_standard(0x%llx)",(__u64)vs); + pvr2_i2c_core_cmd(hdw,VIDIOC_S_STD,&vs); } static int check_standard(struct pvr2_hdw *hdw) { - return hdw->controls[PVR2_CID_VIDEOSTANDARD].dirty != 0; + return hdw->controls[PVR2_CID_STDCUR].dirty != 0; } |