diff options
author | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-09 12:25:00 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-09 12:25:00 -0500 |
commit | f3c5987a386300abea9854b32814d0eab7af7841 (patch) | |
tree | bcfb784dd25b6ef1ca02c4e6ddf5aed7e2a9375e /drivers/media/video | |
parent | 13d133bc66ea78cf2d60c78a41082c87432e0e94 (diff) |
V4L (0987): 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>
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/tda8290.c | 6 | ||||
-rw-r--r-- | drivers/media/video/tda9887.c | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/drivers/media/video/tda8290.c b/drivers/media/video/tda8290.c index 61d94ddaff4..2498b76df42 100644 --- a/drivers/media/video/tda8290.c +++ b/drivers/media/video/tda8290.c | |||
@@ -398,14 +398,8 @@ static int tda8290_tune(struct i2c_client *c, u16 ifc, unsigned int freq) | |||
398 | return 0; | 398 | return 0; |
399 | } | 399 | } |
400 | 400 | ||
401 | |||
402 | /*---------------------------------------------------------------------*/ | 401 | /*---------------------------------------------------------------------*/ |
403 | 402 | ||
404 | #define V4L2_STD_MN (V4L2_STD_PAL_M|V4L2_STD_PAL_N|V4L2_STD_PAL_Nc|V4L2_STD_NTSC) | ||
405 | #define V4L2_STD_B (V4L2_STD_PAL_B|V4L2_STD_PAL_B1|V4L2_STD_SECAM_B) | ||
406 | #define V4L2_STD_GH (V4L2_STD_PAL_G|V4L2_STD_PAL_H|V4L2_STD_SECAM_G|V4L2_STD_SECAM_H) | ||
407 | #define V4L2_STD_DK (V4L2_STD_PAL_DK|V4L2_STD_SECAM_DK) | ||
408 | |||
409 | static void set_audio(struct tuner *t) | 403 | static void set_audio(struct tuner *t) |
410 | { | 404 | { |
411 | char* mode; | 405 | char* mode; |
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c index 7165a1b9625..93bf10436b8 100644 --- a/drivers/media/video/tda9887.c +++ b/drivers/media/video/tda9887.c | |||
@@ -190,6 +190,15 @@ static struct tvnorm tvnorms[] = { | |||
190 | cAudioIF_6_5 | | 190 | cAudioIF_6_5 | |
191 | cVideoIF_38_90 ), | 191 | cVideoIF_38_90 ), |
192 | },{ | 192 | },{ |
193 | .std = V4L2_STD_SECAM_LC, | ||
194 | .name = "SECAM-L'", | ||
195 | .b = ( cOutputPort2Inactive | | ||
196 | cPositiveAmTV | | ||
197 | cQSS ), | ||
198 | .e = ( cGating_36 | | ||
199 | cAudioIF_6_5 | | ||
200 | cVideoIF_33_90 ), | ||
201 | },{ | ||
193 | .std = V4L2_STD_SECAM_DK, | 202 | .std = V4L2_STD_SECAM_DK, |
194 | .name = "SECAM-DK", | 203 | .name = "SECAM-DK", |
195 | .b = ( cNegativeFmTV | | 204 | .b = ( cNegativeFmTV | |