diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-11-16 20:00:58 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-11-16 20:00:58 +0000 |
| commit | 35d6fefe132bd4190969450782a4cf2bda1773f8 (patch) | |
| tree | 23a94d43f413c36d952121b7659c6a0cbc3a83dd | |
| parent | 2a143756fb26da430caa226e758a124467dd2fe9 (diff) | |
| download | mediapointer-dvb-s2-35d6fefe132bd4190969450782a4cf2bda1773f8.tar.gz mediapointer-dvb-s2-35d6fefe132bd4190969450782a4cf2bda1773f8.tar.bz2 | |
Added Secam L' std on tda9887 and common macros moved to videodev2.h
- Added SECAM L' video standard
- Common std macros moved to videodev2.h
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| -rw-r--r-- | linux/drivers/media/video/tda8290.c | 8 | ||||
| -rw-r--r-- | linux/drivers/media/video/tda9887.c | 9 | ||||
| -rw-r--r-- | linux/include/linux/videodev2.h | 9 | ||||
| -rw-r--r-- | v4l/ChangeLog | 11 |
4 files changed, 29 insertions, 8 deletions
diff --git a/linux/drivers/media/video/tda8290.c b/linux/drivers/media/video/tda8290.c index 20624eb36..80538b4d2 100644 --- a/linux/drivers/media/video/tda8290.c +++ b/linux/drivers/media/video/tda8290.c @@ -1,5 +1,5 @@ /* - $Id: tda8290.c,v 1.29 2005/11/09 02:36:43 mchehab Exp $ + $Id: tda8290.c,v 1.30 2005/11/16 20:00:59 mchehab Exp $ i2c tv tuner chip device driver controls the philips tda8290+75 tuner chip combo. @@ -400,14 +400,8 @@ static int tda8290_tune(struct i2c_client *c, u16 ifc, unsigned int freq) 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 --git a/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c index ca76ad9c9..e918216ff 100644 --- a/linux/drivers/media/video/tda9887.c +++ b/linux/drivers/media/video/tda9887.c @@ -197,6 +197,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 --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index 8a2bddc0b..5f5c30740 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -668,6 +668,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 |\ @@ -688,7 +694,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 |\ diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 6ff40faef..dc1acb158 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,14 @@ +2005-11-16 19:56 mchehab + + * ../linux/drivers/media/video/tda9887.c: + - Added SECAM L' video standard + + * ../linux/drivers/media/video/tda8290.c: + * ../linux/include/linux/videodev2.h: + - Common std macros moved to videodev2.h + + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2005-11-16 19:48 mchehab * ../linux/drivers/media/video/bttv-driver.c: (bttv_common_ioctls): |