diff options
Diffstat (limited to 'drivers/media/video/cx88/cx88.h')
-rw-r--r-- | drivers/media/video/cx88/cx88.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h index f4240965be32..20649b25f7ba 100644 --- a/drivers/media/video/cx88/cx88.h +++ b/drivers/media/video/cx88/cx88.h | |||
@@ -53,12 +53,11 @@ | |||
53 | /* ----------------------------------------------------------- */ | 53 | /* ----------------------------------------------------------- */ |
54 | /* defines and enums */ | 54 | /* defines and enums */ |
55 | 55 | ||
56 | /* Currently unsupported by the driver: PAL/H, NTSC/Kr, SECAM B/G/H/LC */ | 56 | /* Currently unsupported by the driver: PAL/H, NTSC/Kr, SECAM/LC */ |
57 | #define CX88_NORMS (\ | 57 | #define CX88_NORMS (V4L2_STD_ALL \ |
58 | V4L2_STD_NTSC_M| V4L2_STD_NTSC_M_JP| V4L2_STD_NTSC_443 | \ | 58 | & ~V4L2_STD_PAL_H \ |
59 | V4L2_STD_PAL_BG| V4L2_STD_PAL_DK | V4L2_STD_PAL_I | \ | 59 | & ~V4L2_STD_NTSC_M_KR \ |
60 | V4L2_STD_PAL_M | V4L2_STD_PAL_N | V4L2_STD_PAL_Nc | \ | 60 | & ~V4L2_STD_SECAM_LC) |
61 | V4L2_STD_PAL_60| V4L2_STD_SECAM_L | V4L2_STD_SECAM_DK ) | ||
62 | 61 | ||
63 | #define FORMAT_FLAGS_PACKED 0x01 | 62 | #define FORMAT_FLAGS_PACKED 0x01 |
64 | #define FORMAT_FLAGS_PLANAR 0x02 | 63 | #define FORMAT_FLAGS_PLANAR 0x02 |
@@ -229,6 +228,9 @@ extern struct sram_channel cx88_sram_channels[]; | |||
229 | #define CX88_BOARD_TEVII_S420 73 | 228 | #define CX88_BOARD_TEVII_S420 73 |
230 | #define CX88_BOARD_PROLINK_PV_GLOBAL_XTREME 74 | 229 | #define CX88_BOARD_PROLINK_PV_GLOBAL_XTREME 74 |
231 | #define CX88_BOARD_PROF_7300 75 | 230 | #define CX88_BOARD_PROF_7300 75 |
231 | #define CX88_BOARD_SATTRADE_ST4200 76 | ||
232 | #define CX88_BOARD_TBS_8910 77 | ||
233 | #define CX88_BOARD_PROF_6200 78 | ||
232 | 234 | ||
233 | enum cx88_itype { | 235 | enum cx88_itype { |
234 | CX88_VMUX_COMPOSITE1 = 1, | 236 | CX88_VMUX_COMPOSITE1 = 1, |