From: Mauro Carvalho Chehab - Added SECAM L' video standard - Common std macros moved to videodev2.h Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton --- drivers/media/video/tda8290.c | 6 ------ drivers/media/video/tda9887.c | 9 +++++++++ include/linux/videodev2.h | 11 ++++++++++- 3 files changed, 19 insertions(+), 7 deletions(-) diff -puN drivers/media/video/tda8290.c~v4l-0987-added-secam-l-std-on-tda9887-and-common drivers/media/video/tda8290.c --- devel/drivers/media/video/tda8290.c~v4l-0987-added-secam-l-std-on-tda9887-and-common 2005-12-09 22:50:04.000000000 -0800 +++ devel-akpm/drivers/media/video/tda8290.c 2005-12-09 22:50:04.000000000 -0800 @@ -398,14 +398,8 @@ static int tda8290_tune(struct i2c_clien return 0; } - /*---------------------------------------------------------------------*/ -#define V4L2_STD_MN (V4L2_STD_PAL_M|V4L2_STD_PAL_N|V4L2_STD_PAL_Nc|V4L2_STD_NTSC) -#define V4L2_STD_B (V4L2_STD_PAL_B|V4L2_STD_PAL_B1|V4L2_STD_SECAM_B) -#define V4L2_STD_GH (V4L2_STD_PAL_G|V4L2_STD_PAL_H|V4L2_STD_SECAM_G|V4L2_STD_SECAM_H) -#define V4L2_STD_DK (V4L2_STD_PAL_DK|V4L2_STD_SECAM_DK) - static void set_audio(struct tuner *t) { char* mode; diff -puN drivers/media/video/tda9887.c~v4l-0987-added-secam-l-std-on-tda9887-and-common drivers/media/video/tda9887.c --- devel/drivers/media/video/tda9887.c~v4l-0987-added-secam-l-std-on-tda9887-and-common 2005-12-09 22:50:04.000000000 -0800 +++ devel-akpm/drivers/media/video/tda9887.c 2005-12-09 22:50:04.000000000 -0800 @@ -190,6 +190,15 @@ static struct tvnorm tvnorms[] = { cAudioIF_6_5 | cVideoIF_38_90 ), },{ + .std = V4L2_STD_SECAM_LC, + .name = "SECAM-L'", + .b = ( cOutputPort2Inactive | + cPositiveAmTV | + cQSS ), + .e = ( cGating_36 | + cAudioIF_6_5 | + cVideoIF_33_90 ), + },{ .std = V4L2_STD_SECAM_DK, .name = "SECAM-DK", .b = ( cNegativeFmTV | diff -puN include/linux/videodev2.h~v4l-0987-added-secam-l-std-on-tda9887-and-common include/linux/videodev2.h --- devel/include/linux/videodev2.h~v4l-0987-added-secam-l-std-on-tda9887-and-common 2005-12-09 22:50:04.000000000 -0800 +++ devel-akpm/include/linux/videodev2.h 2005-12-09 22:50:04.000000000 -0800 @@ -642,6 +642,12 @@ typedef __u64 v4l2_std_id; #define V4L2_STD_ATSC_8_VSB ((v4l2_std_id)0x01000000) #define V4L2_STD_ATSC_16_VSB ((v4l2_std_id)0x02000000) +/* some merged standards */ +#define V4L2_STD_MN (V4L2_STD_PAL_M|V4L2_STD_PAL_N|V4L2_STD_PAL_Nc|V4L2_STD_NTSC) +#define V4L2_STD_B (V4L2_STD_PAL_B|V4L2_STD_PAL_B1|V4L2_STD_SECAM_B) +#define V4L2_STD_GH (V4L2_STD_PAL_G|V4L2_STD_PAL_H|V4L2_STD_SECAM_G|V4L2_STD_SECAM_H) +#define V4L2_STD_DK (V4L2_STD_PAL_DK|V4L2_STD_SECAM_DK) + /* some common needed stuff */ #define V4L2_STD_PAL_BG (V4L2_STD_PAL_B |\ V4L2_STD_PAL_B1 |\ @@ -662,7 +668,8 @@ typedef __u64 v4l2_std_id; V4L2_STD_SECAM_G |\ V4L2_STD_SECAM_H |\ V4L2_STD_SECAM_DK |\ - V4L2_STD_SECAM_L) + V4L2_STD_SECAM_L |\ + V4L2_STD_SECAM_LC) #define V4L2_STD_525_60 (V4L2_STD_PAL_M |\ V4L2_STD_PAL_60 |\ @@ -1117,10 +1124,12 @@ typedef int (*v4l2_kioctl)(struct inode unsigned int cmd, void *arg); int v4l_compat_translate_ioctl(struct inode *inode, struct file *file, int cmd, void *arg, v4l2_kioctl driver_ioctl); + /* 32 Bits compatibility layer for 64 bits processors */ extern long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg); + #endif /* __KERNEL__ */ #endif /* __LINUX_VIDEODEV2_H */ _