Change all uses of V4L2_STD_NTSC to V4L2_STD_NTSC_M in pvrusb2

From: Mike Isely <isely@pobox.com>
Signed-off-by: Mike Isely <isely@pobox.com>

5 files changed, 25 insertions, 10 deletions

diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index aaf4f9d41..abbbdd109 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,18 @@
+2005-12-02 13:27  mcisely
+
+	* ../v4l_experimental/pvrusb2/pvrusb2-eeprom.c:
+	* ../v4l_experimental/pvrusb2/pvrusb2-tuner.c:
+	(pvr2_tuner_set_standard):
+	* ../v4l_experimental/pvrusb2/pvrusb2-v4l2.c: (pvr2_v4l2_do_ioctl):
+	* ../v4l_experimental/pvrusb2/pvrusb2-video-v4l.c:
+	(pvr2_decoder_v4l_set_norm):
+
+	- Change all uses of V4L2_STD_NTSC to V4L2_STD_NTSC_M, which is
+	needed to compensate for a change in tuner-simple.c that causes it
+	to be sensitive to the precise video standard in use.
+
+	Signed-off-by: Mike Isely <isely@pobox.com>
+
 2005-12-02 10:57  mchehab
 
 	* ../README:
diff --git a/v4l_experimental/pvrusb2/pvrusb2-eeprom.c b/v4l_experimental/pvrusb2/pvrusb2-eeprom.c
index 07d1a239d..e963cf480 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-eeprom.c
+++ b/v4l_experimental/pvrusb2/pvrusb2-eeprom.c
@@ -1,6 +1,6 @@
 /*
  *
- *  $Id: pvrusb2-eeprom.c,v 1.3 2005/11/29 19:49:09 mchehab Exp $
+ *  $Id: pvrusb2-eeprom.c,v 1.4 2005/12/02 13:32:17 mcisely Exp $
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
@@ -363,7 +363,7 @@ int pvr2_eeprom_analyze(struct pvr2_hdw *hdw)
 
 
 static v4l2_std_id std_choices[] = {
-	[PVR2_CVAL_VIDEOSTANDARD_NTSC_M]  = V4L2_STD_NTSC,
+	[PVR2_CVAL_VIDEOSTANDARD_NTSC_M]  = V4L2_STD_NTSC_M,
 	[PVR2_CVAL_VIDEOSTANDARD_PAL_BG]  = V4L2_STD_PAL_BG,
 	[PVR2_CVAL_VIDEOSTANDARD_PAL_I]   = V4L2_STD_PAL_I,
 	[PVR2_CVAL_VIDEOSTANDARD_PAL_DK]  = V4L2_STD_PAL_DK,
diff --git a/v4l_experimental/pvrusb2/pvrusb2-tuner.c b/v4l_experimental/pvrusb2/pvrusb2-tuner.c
index 2dba9e8f8..fe6f80cee 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.2 2005/11/29 14:10:44 mchehab Exp $
+ *  $Id: pvrusb2-tuner.c,v 1.3 2005/12/02 13:32:17 mcisely Exp $
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
@@ -123,7 +123,7 @@ int pvr2_tuner_set_standard(struct pvr2_hdw *hdw)
 	switch (cvstd) {
 	default:
 	case PVR2_CVAL_VIDEOSTANDARD_NTSC_M:
-		vs = V4L2_STD_NTSC;
+		vs = V4L2_STD_NTSC_M;
 		break;
 	case PVR2_CVAL_VIDEOSTANDARD_SECAM_L:
 		vs = V4L2_STD_SECAM;
diff --git a/v4l_experimental/pvrusb2/pvrusb2-v4l2.c b/v4l_experimental/pvrusb2/pvrusb2-v4l2.c
index 0c9719bfb..119aed3f7 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.2 2005/11/29 14:10:44 mchehab Exp $
+ *  $Id: pvrusb2-v4l2.c,v 1.3 2005/12/02 13:32:17 mcisely Exp $
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
@@ -183,7 +183,7 @@ struct v4l2_standard pvr_standards[] = {
 		.reserved       = {0,0,0,0}
 	},
 	[PVR2_CVAL_VIDEOSTANDARD_NTSC_M] = {
-		.id             = V4L2_STD_NTSC,
+		.id             = V4L2_STD_NTSC_M,
 		.frameperiod    =
 		{
 			.numerator =  1001,
@@ -501,7 +501,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
 		switch (pvr2_hdw_get_ctl_value(hdw,PVR2_CID_VIDEOSTANDARD)) {
 		default:
 		case PVR2_CVAL_VIDEOSTANDARD_NTSC_M:
-			*vs = V4L2_STD_NTSC;
+			*vs = V4L2_STD_NTSC_M;
 			break;
 		case PVR2_CVAL_VIDEOSTANDARD_PAL_M:
 			*vs = V4L2_STD_PAL_M;
@@ -528,7 +528,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
 		v4l2_std_id *vs = (v4l2_std_id *)arg;
 		int val = PVR2_CVAL_VIDEOSTANDARD_NTSC_M;
 
-		if (*vs & V4L2_STD_NTSC){
+		if (*vs & V4L2_STD_NTSC_M){
 			val = PVR2_CVAL_VIDEOSTANDARD_NTSC_M;
 		} else if (*vs & V4L2_STD_PAL_BG){
 			val = PVR2_CVAL_VIDEOSTANDARD_PAL_BG;
diff --git a/v4l_experimental/pvrusb2/pvrusb2-video-v4l.c b/v4l_experimental/pvrusb2/pvrusb2-video-v4l.c
index c87567b4d..55c549478 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.2 2005/11/29 14:10:44 mchehab Exp $
+ *  $Id: pvrusb2-video-v4l.c,v 1.3 2005/12/02 13:32:17 mcisely Exp $
  *
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
@@ -208,7 +208,7 @@ static int pvr2_decoder_v4l_set_norm(struct pvr2_decoder *dcp)
 	switch (hdw->controls[PVR2_CID_VIDEOSTANDARD].value) {
 	default:
 	case PVR2_CVAL_VIDEOSTANDARD_NTSC_M:
-		std = V4L2_STD_NTSC;
+		std = V4L2_STD_NTSC_M;
 		break;
 	case PVR2_CVAL_VIDEOSTANDARD_SECAM_L:
 		std = V4L2_STD_SECAM;