diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/videodev2.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 13f78ec4bf76..b2f5e864b397 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h | |||
@@ -642,6 +642,12 @@ typedef __u64 v4l2_std_id; | |||
642 | #define V4L2_STD_ATSC_8_VSB ((v4l2_std_id)0x01000000) | 642 | #define V4L2_STD_ATSC_8_VSB ((v4l2_std_id)0x01000000) |
643 | #define V4L2_STD_ATSC_16_VSB ((v4l2_std_id)0x02000000) | 643 | #define V4L2_STD_ATSC_16_VSB ((v4l2_std_id)0x02000000) |
644 | 644 | ||
645 | /* some merged standards */ | ||
646 | #define V4L2_STD_MN (V4L2_STD_PAL_M|V4L2_STD_PAL_N|V4L2_STD_PAL_Nc|V4L2_STD_NTSC) | ||
647 | #define V4L2_STD_B (V4L2_STD_PAL_B|V4L2_STD_PAL_B1|V4L2_STD_SECAM_B) | ||
648 | #define V4L2_STD_GH (V4L2_STD_PAL_G|V4L2_STD_PAL_H|V4L2_STD_SECAM_G|V4L2_STD_SECAM_H) | ||
649 | #define V4L2_STD_DK (V4L2_STD_PAL_DK|V4L2_STD_SECAM_DK) | ||
650 | |||
645 | /* some common needed stuff */ | 651 | /* some common needed stuff */ |
646 | #define V4L2_STD_PAL_BG (V4L2_STD_PAL_B |\ | 652 | #define V4L2_STD_PAL_BG (V4L2_STD_PAL_B |\ |
647 | V4L2_STD_PAL_B1 |\ | 653 | V4L2_STD_PAL_B1 |\ |
@@ -662,7 +668,8 @@ typedef __u64 v4l2_std_id; | |||
662 | V4L2_STD_SECAM_G |\ | 668 | V4L2_STD_SECAM_G |\ |
663 | V4L2_STD_SECAM_H |\ | 669 | V4L2_STD_SECAM_H |\ |
664 | V4L2_STD_SECAM_DK |\ | 670 | V4L2_STD_SECAM_DK |\ |
665 | V4L2_STD_SECAM_L) | 671 | V4L2_STD_SECAM_L |\ |
672 | V4L2_STD_SECAM_LC) | ||
666 | 673 | ||
667 | #define V4L2_STD_525_60 (V4L2_STD_PAL_M |\ | 674 | #define V4L2_STD_525_60 (V4L2_STD_PAL_M |\ |
668 | V4L2_STD_PAL_60 |\ | 675 | V4L2_STD_PAL_60 |\ |
@@ -1117,10 +1124,12 @@ typedef int (*v4l2_kioctl)(struct inode *inode, struct file *file, | |||
1117 | unsigned int cmd, void *arg); | 1124 | unsigned int cmd, void *arg); |
1118 | int v4l_compat_translate_ioctl(struct inode *inode, struct file *file, | 1125 | int v4l_compat_translate_ioctl(struct inode *inode, struct file *file, |
1119 | int cmd, void *arg, v4l2_kioctl driver_ioctl); | 1126 | int cmd, void *arg, v4l2_kioctl driver_ioctl); |
1127 | |||
1120 | /* 32 Bits compatibility layer for 64 bits processors */ | 1128 | /* 32 Bits compatibility layer for 64 bits processors */ |
1121 | extern long v4l_compat_ioctl32(struct file *file, unsigned int cmd, | 1129 | extern long v4l_compat_ioctl32(struct file *file, unsigned int cmd, |
1122 | unsigned long arg); | 1130 | unsigned long arg); |
1123 | 1131 | ||
1132 | |||
1124 | #endif /* __KERNEL__ */ | 1133 | #endif /* __KERNEL__ */ |
1125 | #endif /* __LINUX_VIDEODEV2_H */ | 1134 | #endif /* __LINUX_VIDEODEV2_H */ |
1126 | 1135 | ||