diff options
| author | Mike Isely <devnull@localhost> | 2005-12-02 13:59:00 +0000 |
|---|---|---|
| committer | Mike Isely <devnull@localhost> | 2005-12-02 13:59:00 +0000 |
| commit | cdda4f559abb11c1249138a04534edc817c297e5 (patch) | |
| tree | 674aecbd256d5cde6e233791f43400d5ab97015b /v4l_experimental/pvrusb2 | |
| parent | 537bf70416f2d1a56e20b2555224adb623bb3082 (diff) | |
| download | mediapointer-dvb-s2-cdda4f559abb11c1249138a04534edc817c297e5.tar.gz mediapointer-dvb-s2-cdda4f559abb11c1249138a04534edc817c297e5.tar.bz2 | |
Fix various small issues introduced by earlier PAL-M enhancement
From: Mike Isely <isely@pobox.com>
Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'v4l_experimental/pvrusb2')
| -rw-r--r-- | v4l_experimental/pvrusb2/pvrusb2-hdw.c | 4 | ||||
| -rw-r--r-- | v4l_experimental/pvrusb2/pvrusb2-tuner.c | 4 | ||||
| -rw-r--r-- | v4l_experimental/pvrusb2/pvrusb2-v4l2.c | 3 | ||||
| -rw-r--r-- | v4l_experimental/pvrusb2/pvrusb2-video-v4l.c | 7 |
4 files changed, 11 insertions, 7 deletions
diff --git a/v4l_experimental/pvrusb2/pvrusb2-hdw.c b/v4l_experimental/pvrusb2/pvrusb2-hdw.c index 4bcb30b22..234617d31 100644 --- a/v4l_experimental/pvrusb2/pvrusb2-hdw.c +++ b/v4l_experimental/pvrusb2/pvrusb2-hdw.c @@ -1,6 +1,6 @@ /* * - * $Id: pvrusb2-hdw.c,v 1.4 2005/11/29 19:49:09 mchehab Exp $ + * $Id: pvrusb2-hdw.c,v 1.5 2005/12/02 13:59:00 mcisely Exp $ * * Copyright (C) 2005 Mike Isely <isely@pobox.com> * @@ -127,7 +127,7 @@ static const char *control_values_videostandard[] = { [PVR2_CVAL_VIDEOSTANDARD_PAL_BG] = "PAL-BG", [PVR2_CVAL_VIDEOSTANDARD_PAL_I] = "PAL-I", [PVR2_CVAL_VIDEOSTANDARD_PAL_DK] = "PAL-DK", - [PVR2_CVAL_VIDEOSTANDARD_PAL_M] = "PAL-M", + [PVR2_CVAL_VIDEOSTANDARD_PAL_M] = "PAL-M", }; diff --git a/v4l_experimental/pvrusb2/pvrusb2-tuner.c b/v4l_experimental/pvrusb2/pvrusb2-tuner.c index fe6f80cee..fcde1436a 100644 --- a/v4l_experimental/pvrusb2/pvrusb2-tuner.c +++ b/v4l_experimental/pvrusb2/pvrusb2-tuner.c @@ -1,6 +1,6 @@ /* * - * $Id: pvrusb2-tuner.c,v 1.3 2005/12/02 13:32:17 mcisely Exp $ + * $Id: pvrusb2-tuner.c,v 1.4 2005/12/02 13:59:00 mcisely Exp $ * * Copyright (C) 2005 Mike Isely <isely@pobox.com> * Copyright (C) 2004 Aurelien Alleaume <slts@free.fr> @@ -43,7 +43,7 @@ static u32 pvr_tbl_standard[] = { [PVR2_CVAL_VIDEOSTANDARD_PAL_DK] = 0x00d4700b, /* PVR_STD_PAL_DK */ [PVR2_CVAL_VIDEOSTANDARD_SECAM_L] = 0x00c4100b, /* PVR_STD_SECAM */ [PVR2_CVAL_VIDEOSTANDARD_NTSC_M] = 0x00163044, /* PVR_STD_NTSC */ - [PVR2_CVAL_VIDEOSTANDARD_PAL_M] = 0x00163044 /* PVR_STD_PAL_M */ + [PVR2_CVAL_VIDEOSTANDARD_PAL_M] = 0x00163044 /* PVR_STD_PAL_M */ }; #define trace_tuner(...) pvr2_trace(PVR2_TRACE_TUNER,__VA_ARGS__) diff --git a/v4l_experimental/pvrusb2/pvrusb2-v4l2.c b/v4l_experimental/pvrusb2/pvrusb2-v4l2.c index 119aed3f7..71590e400 100644 --- a/v4l_experimental/pvrusb2/pvrusb2-v4l2.c +++ b/v4l_experimental/pvrusb2/pvrusb2-v4l2.c @@ -1,6 +1,6 @@ /* * - * $Id: pvrusb2-v4l2.c,v 1.3 2005/12/02 13:32:17 mcisely Exp $ + * $Id: pvrusb2-v4l2.c,v 1.4 2005/12/02 13:59:00 mcisely Exp $ * * Copyright (C) 2005 Mike Isely <isely@pobox.com> * Copyright (C) 2004 Aurelien Alleaume <slts@free.fr> @@ -787,6 +787,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file, break; default: hf=576; + break; } hh = (int) (hf / 2); diff --git a/v4l_experimental/pvrusb2/pvrusb2-video-v4l.c b/v4l_experimental/pvrusb2/pvrusb2-video-v4l.c index 55c549478..c1702d990 100644 --- a/v4l_experimental/pvrusb2/pvrusb2-video-v4l.c +++ b/v4l_experimental/pvrusb2/pvrusb2-video-v4l.c @@ -1,6 +1,6 @@ /* * - * $Id: pvrusb2-video-v4l.c,v 1.3 2005/12/02 13:32:17 mcisely Exp $ + * $Id: pvrusb2-video-v4l.c,v 1.4 2005/12/02 13:59:00 mcisely Exp $ * * Copyright (C) 2005 Mike Isely <isely@pobox.com> * Copyright (C) 2004 Aurelien Alleaume <slts@free.fr> @@ -219,11 +219,14 @@ static int pvr2_decoder_v4l_set_norm(struct pvr2_decoder *dcp) case PVR2_CVAL_VIDEOSTANDARD_PAL_DK: std = V4L2_STD_PAL_DK; break; + case PVR2_CVAL_VIDEOSTANDARD_PAL_BG: + std = V4L2_STD_PAL_BG; + break; case PVR2_CVAL_VIDEOSTANDARD_PAL_M: std = V4L2_STD_PAL_M; break; } - status = pvr2_i2c_saa7115_cmd(hdw,VIDIOC_S_STD,&std); + status = pvr2_i2c_saa7115_cmd(hdw,VIDIOC_S_STD,&std); if (status) return status; hdw->subsys_enabled_mask |= PVR2_SUBSYS_DIGITIZER_CFG_NORM; return 0; |