Merge git://oss.sgi.com:8090/xfs-2.6

[linux-2.6-omap-h63xx.git] / include / linux / videodev2.h

diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 2275bfec5b687e3c7545fc848346cc14a16d2ccc..ad7fa9c86c1008157211021ce5f23829368d6ff0 100644 (file)
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -75,7 +75,7 @@ struct video_device
        int minor;
 
        /* device ops + callbacks */
-       struct file_operations *fops;
+       const struct file_operations *fops;
        void (*release)(struct video_device *vfd);
 
 
@@ -966,66 +966,17 @@ struct v4l2_sliced_vbi_format
 
 /* Teletext World System Teletext
    (WST), defined on ITU-R BT.653-2 */
-#define V4L2_SLICED_TELETEXT_PAL_B      (0x000001)
-#define V4L2_SLICED_TELETEXT_PAL_C      (0x000002)
-#define V4L2_SLICED_TELETEXT_NTSC_B     (0x000010)
-#define V4L2_SLICED_TELETEXT_SECAM      (0x000020)
-
-/* Teletext North American Broadcast Teletext Specification
-   (NABTS), defined on ITU-R BT.653-2 */
-#define V4L2_SLICED_TELETEXT_NTSC_C     (0x000040)
-#define V4L2_SLICED_TELETEXT_NTSC_D     (0x000080)
-
+#define V4L2_SLICED_TELETEXT_B          (0x0001)
 /* Video Program System, defined on ETS 300 231*/
-#define V4L2_SLICED_VPS                 (0x000400)
-
+#define V4L2_SLICED_VPS                 (0x0400)
 /* Closed Caption, defined on EIA-608 */
-#define V4L2_SLICED_CAPTION_525         (0x001000)
-#define V4L2_SLICED_CAPTION_625         (0x002000)
-
+#define V4L2_SLICED_CAPTION_525         (0x1000)
 /* Wide Screen System, defined on ITU-R BT1119.1 */
-#define V4L2_SLICED_WSS_625             (0x004000)
-
-/* Wide Screen System, defined on IEC 61880 */
-#define V4L2_SLICED_WSS_525             (0x008000)
-
-/* Vertical Interval Timecode (VITC), defined on SMPTE 12M */
-#define V4l2_SLICED_VITC_625           (0x010000)
-#define V4l2_SLICED_VITC_525           (0x020000)
-
-#define V4L2_SLICED_TELETEXT_B         (V4L2_SLICED_TELETEXT_PAL_B  |\
-                                        V4L2_SLICED_TELETEXT_NTSC_B)
+#define V4L2_SLICED_WSS_625             (0x4000)
 
-#define V4L2_SLICED_TELETEXT           (V4L2_SLICED_TELETEXT_PAL_B  |\
-                                        V4L2_SLICED_TELETEXT_PAL_C  |\
-                                        V4L2_SLICED_TELETEXT_SECAM  |\
-                                        V4L2_SLICED_TELETEXT_NTSC_B |\
-                                        V4L2_SLICED_TELETEXT_NTSC_C |\
-                                        V4L2_SLICED_TELETEXT_NTSC_D)
+#define V4L2_SLICED_VBI_525             (V4L2_SLICED_CAPTION_525)
+#define V4L2_SLICED_VBI_625             (V4L2_SLICED_TELETEXT_B | V4L2_SLICED_VPS | V4L2_SLICED_WSS_625)
 
-#define V4L2_SLICED_CAPTION            (V4L2_SLICED_CAPTION_525     |\
-                                        V4L2_SLICED_CAPTION_625)
-
-#define V4L2_SLICED_WSS                        (V4L2_SLICED_WSS_525         |\
-                                        V4L2_SLICED_WSS_625)
-
-#define V4L2_SLICED_VITC               (V4L2_SLICED_VITC_525        |\
-                                        V4L2_SLICED_VITC_625)
-
-#define V4L2_SLICED_VBI_525             (V4L2_SLICED_TELETEXT_NTSC_B |\
-                                        V4L2_SLICED_TELETEXT_NTSC_C |\
-                                        V4L2_SLICED_TELETEXT_NTSC_D |\
-                                        V4L2_SLICED_CAPTION_525     |\
-                                        V4L2_SLICED_WSS_525         |\
-                                        V4l2_SLICED_VITC_525)
-
-#define V4L2_SLICED_VBI_625             (V4L2_SLICED_TELETEXT_PAL_B  |\
-                                        V4L2_SLICED_TELETEXT_PAL_C  |\
-                                        V4L2_SLICED_TELETEXT_SECAM  |\
-                                        V4L2_SLICED_VPS             |\
-                                        V4L2_SLICED_CAPTION_625     |\
-                                        V4L2_SLICED_WSS_625         |\
-                                        V4l2_SLICED_VITC_625)
 
 struct v4l2_sliced_vbi_cap
 {
@@ -1190,8 +1141,13 @@ extern char *v4l2_type_names[];
 /*  Compatibility layer interface  --  v4l1-compat module */
 typedef int (*v4l2_kioctl)(struct inode *inode, struct file *file,
                           unsigned int cmd, void *arg);
+
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
 int v4l_compat_translate_ioctl(struct inode *inode, struct file *file,
                               int cmd, void *arg, v4l2_kioctl driver_ioctl);
+#else
+#define v4l_compat_translate_ioctl(inode,file,cmd,arg,ioctl) -EINVAL
+#endif
 
 /* 32 Bits compatibility layer for 64 bits processors */
 extern long v4l_compat_ioctl32(struct file *file, unsigned int cmd,