This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/v4l-utils.git tree:
Subject: Synced with latest kernel. Author: Hans Verkuil <[email protected]> Date: Mon May 26 08:42:24 2014 +0200 This syncs changes to VIDIOC_DV_TIMINGS_CAP and VIDIOC_DV_ENUM_TIMINGS. Signed-off-by: Hans Verkuil <[email protected]> contrib/freebsd/include/linux/videodev2.h | 10 ++++++- contrib/test/ioctl-test.h | 5 +++ contrib/test/ioctl_32.h | 5 +++ contrib/test/ioctl_64.h | 5 +++ include/linux/v4l2-subdev.h | 40 +++++++++++++--------------- include/linux/videodev2.h | 10 ++++++- 6 files changed, 50 insertions(+), 25 deletions(-) --- http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=586104505d0ffd192cd54a049a04efa0816e2615 diff --git a/contrib/freebsd/include/linux/videodev2.h b/contrib/freebsd/include/linux/videodev2.h index 06da346..9458583 100644 --- a/contrib/freebsd/include/linux/videodev2.h +++ b/contrib/freebsd/include/linux/videodev2.h @@ -1140,12 +1140,15 @@ struct v4l2_dv_timings { /** struct v4l2_enum_dv_timings - DV timings enumeration * @index: enumeration index + * @pad: the pad number for which to enumerate timings (used with + * v4l-subdev nodes only) * @reserved: must be zeroed * @timings: the timings for the given index */ struct v4l2_enum_dv_timings { uint32_t index; - uint32_t reserved[3]; + uint32_t pad; + uint32_t reserved[2]; struct v4l2_dv_timings timings; }; @@ -1183,11 +1186,14 @@ struct v4l2_bt_timings_cap { /** struct v4l2_dv_timings_cap - DV timings capabilities * @type: the type of the timings (same as in struct v4l2_dv_timings) + * @pad: the pad number for which to query capabilities (used with + * v4l-subdev nodes only) * @bt: the BT656/1120 timings capabilities */ struct v4l2_dv_timings_cap { uint32_t type; - uint32_t reserved[3]; + uint32_t pad; + uint32_t reserved[2]; union { struct v4l2_bt_timings_cap bt; uint32_t raw_data[32]; diff --git a/contrib/test/ioctl-test.h b/contrib/test/ioctl-test.h index f2cecb7..a2b6b07 100644 --- a/contrib/test/ioctl-test.h +++ b/contrib/test/ioctl-test.h @@ -171,15 +171,20 @@ static const struct { ioc(video, VIDIOC_RESERVED), /* void */ ioc(video, VIDIOC_STREAMOFF), /* int */ ioc(video, VIDIOC_STREAMON), /* int */ + ioc(subdev, VIDIOC_SUBDEV_DV_TIMINGS_CAP), /* struct v4l2_dv_timings_cap */ + ioc(subdev, VIDIOC_SUBDEV_ENUM_DV_TIMINGS), /* struct v4l2_enum_dv_timings */ ioc(subdev, VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL), /* struct v4l2_subdev_frame_interval_enum */ ioc(subdev, VIDIOC_SUBDEV_ENUM_FRAME_SIZE), /* struct v4l2_subdev_frame_size_enum */ ioc(subdev, VIDIOC_SUBDEV_ENUM_MBUS_CODE), /* struct v4l2_subdev_mbus_code_enum */ ioc(subdev, VIDIOC_SUBDEV_G_CROP), /* struct v4l2_subdev_crop */ + ioc(subdev, VIDIOC_SUBDEV_G_DV_TIMINGS), /* struct v4l2_dv_timings */ ioc(subdev, VIDIOC_SUBDEV_G_EDID), /* struct v4l2_edid */ ioc(subdev, VIDIOC_SUBDEV_G_FMT), /* struct v4l2_subdev_format */ ioc(subdev, VIDIOC_SUBDEV_G_FRAME_INTERVAL), /* struct v4l2_subdev_frame_interval */ ioc(subdev, VIDIOC_SUBDEV_G_SELECTION), /* struct v4l2_subdev_selection */ + ioc(subdev, VIDIOC_SUBDEV_QUERY_DV_TIMINGS), /* struct v4l2_dv_timings */ ioc(subdev, VIDIOC_SUBDEV_S_CROP), /* struct v4l2_subdev_crop */ + ioc(subdev, VIDIOC_SUBDEV_S_DV_TIMINGS), /* struct v4l2_dv_timings */ ioc(subdev, VIDIOC_SUBDEV_S_EDID), /* struct v4l2_edid */ ioc(subdev, VIDIOC_SUBDEV_S_FMT), /* struct v4l2_subdev_format */ ioc(subdev, VIDIOC_SUBDEV_S_FRAME_INTERVAL), /* struct v4l2_subdev_frame_interval */ diff --git a/contrib/test/ioctl_32.h b/contrib/test/ioctl_32.h index b090768..2a5c70e 100644 --- a/contrib/test/ioctl_32.h +++ b/contrib/test/ioctl_32.h @@ -87,15 +87,20 @@ #define CMD32_VIDIOC_RESERVED 0x5601 #define CMD32_VIDIOC_STREAMOFF 0x40045613 #define CMD32_VIDIOC_STREAMON 0x40045612 +#define CMD32_VIDIOC_SUBDEV_DV_TIMINGS_CAP 0xc0905664 +#define CMD32_VIDIOC_SUBDEV_ENUM_DV_TIMINGS 0xc0945662 #define CMD32_VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL 0xc040564b #define CMD32_VIDIOC_SUBDEV_ENUM_FRAME_SIZE 0xc040564a #define CMD32_VIDIOC_SUBDEV_ENUM_MBUS_CODE 0xc0305602 #define CMD32_VIDIOC_SUBDEV_G_CROP 0xc038563b +#define CMD32_VIDIOC_SUBDEV_G_DV_TIMINGS 0xc0845658 #define CMD32_VIDIOC_SUBDEV_G_EDID 0xc0245628 #define CMD32_VIDIOC_SUBDEV_G_FMT 0xc0585604 #define CMD32_VIDIOC_SUBDEV_G_FRAME_INTERVAL 0xc0305615 #define CMD32_VIDIOC_SUBDEV_G_SELECTION 0xc040563d +#define CMD32_VIDIOC_SUBDEV_QUERY_DV_TIMINGS 0x80845663 #define CMD32_VIDIOC_SUBDEV_S_CROP 0xc038563c +#define CMD32_VIDIOC_SUBDEV_S_DV_TIMINGS 0xc0845657 #define CMD32_VIDIOC_SUBDEV_S_EDID 0xc0245629 #define CMD32_VIDIOC_SUBDEV_S_FMT 0xc0585605 #define CMD32_VIDIOC_SUBDEV_S_FRAME_INTERVAL 0xc0305616 diff --git a/contrib/test/ioctl_64.h b/contrib/test/ioctl_64.h index 975dbdc..6487ea3 100644 --- a/contrib/test/ioctl_64.h +++ b/contrib/test/ioctl_64.h @@ -87,15 +87,20 @@ #define CMD64_VIDIOC_RESERVED 0x5601 #define CMD64_VIDIOC_STREAMOFF 0x40045613 #define CMD64_VIDIOC_STREAMON 0x40045612 +#define CMD64_VIDIOC_SUBDEV_DV_TIMINGS_CAP 0xc0905664 +#define CMD64_VIDIOC_SUBDEV_ENUM_DV_TIMINGS 0xc0945662 #define CMD64_VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL 0xc040564b #define CMD64_VIDIOC_SUBDEV_ENUM_FRAME_SIZE 0xc040564a #define CMD64_VIDIOC_SUBDEV_ENUM_MBUS_CODE 0xc0305602 #define CMD64_VIDIOC_SUBDEV_G_CROP 0xc038563b +#define CMD64_VIDIOC_SUBDEV_G_DV_TIMINGS 0xc0845658 #define CMD64_VIDIOC_SUBDEV_G_EDID 0xc0285628 #define CMD64_VIDIOC_SUBDEV_G_FMT 0xc0585604 #define CMD64_VIDIOC_SUBDEV_G_FRAME_INTERVAL 0xc0305615 #define CMD64_VIDIOC_SUBDEV_G_SELECTION 0xc040563d +#define CMD64_VIDIOC_SUBDEV_QUERY_DV_TIMINGS 0x80845663 #define CMD64_VIDIOC_SUBDEV_S_CROP 0xc038563c +#define CMD64_VIDIOC_SUBDEV_S_DV_TIMINGS 0xc0845657 #define CMD64_VIDIOC_SUBDEV_S_EDID 0xc0285629 #define CMD64_VIDIOC_SUBDEV_S_FMT 0xc0585605 #define CMD64_VIDIOC_SUBDEV_S_FRAME_INTERVAL 0xc0305616 diff --git a/include/linux/v4l2-subdev.h b/include/linux/v4l2-subdev.h index 87e0515..a619cdd 100644 --- a/include/linux/v4l2-subdev.h +++ b/include/linux/v4l2-subdev.h @@ -151,26 +151,24 @@ struct v4l2_subdev_selection { /* Backwards compatibility define --- to be removed */ #define v4l2_subdev_edid v4l2_edid -#define VIDIOC_SUBDEV_G_FMT _IOWR('V', 4, struct v4l2_subdev_format) -#define VIDIOC_SUBDEV_S_FMT _IOWR('V', 5, struct v4l2_subdev_format) -#define VIDIOC_SUBDEV_G_FRAME_INTERVAL \ - _IOWR('V', 21, struct v4l2_subdev_frame_interval) -#define VIDIOC_SUBDEV_S_FRAME_INTERVAL \ - _IOWR('V', 22, struct v4l2_subdev_frame_interval) -#define VIDIOC_SUBDEV_ENUM_MBUS_CODE \ - _IOWR('V', 2, struct v4l2_subdev_mbus_code_enum) -#define VIDIOC_SUBDEV_ENUM_FRAME_SIZE \ - _IOWR('V', 74, struct v4l2_subdev_frame_size_enum) -#define VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL \ - _IOWR('V', 75, struct v4l2_subdev_frame_interval_enum) -#define VIDIOC_SUBDEV_G_CROP _IOWR('V', 59, struct v4l2_subdev_crop) -#define VIDIOC_SUBDEV_S_CROP _IOWR('V', 60, struct v4l2_subdev_crop) -#define VIDIOC_SUBDEV_G_SELECTION \ - _IOWR('V', 61, struct v4l2_subdev_selection) -#define VIDIOC_SUBDEV_S_SELECTION \ - _IOWR('V', 62, struct v4l2_subdev_selection) -/* These two G/S_EDID ioctls are identical to the ioctls in videodev2.h */ -#define VIDIOC_SUBDEV_G_EDID _IOWR('V', 40, struct v4l2_edid) -#define VIDIOC_SUBDEV_S_EDID _IOWR('V', 41, struct v4l2_edid) +#define VIDIOC_SUBDEV_G_FMT _IOWR('V', 4, struct v4l2_subdev_format) +#define VIDIOC_SUBDEV_S_FMT _IOWR('V', 5, struct v4l2_subdev_format) +#define VIDIOC_SUBDEV_G_FRAME_INTERVAL _IOWR('V', 21, struct v4l2_subdev_frame_interval) +#define VIDIOC_SUBDEV_S_FRAME_INTERVAL _IOWR('V', 22, struct v4l2_subdev_frame_interval) +#define VIDIOC_SUBDEV_ENUM_MBUS_CODE _IOWR('V', 2, struct v4l2_subdev_mbus_code_enum) +#define VIDIOC_SUBDEV_ENUM_FRAME_SIZE _IOWR('V', 74, struct v4l2_subdev_frame_size_enum) +#define VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL _IOWR('V', 75, struct v4l2_subdev_frame_interval_enum) +#define VIDIOC_SUBDEV_G_CROP _IOWR('V', 59, struct v4l2_subdev_crop) +#define VIDIOC_SUBDEV_S_CROP _IOWR('V', 60, struct v4l2_subdev_crop) +#define VIDIOC_SUBDEV_G_SELECTION _IOWR('V', 61, struct v4l2_subdev_selection) +#define VIDIOC_SUBDEV_S_SELECTION _IOWR('V', 62, struct v4l2_subdev_selection) +/* The following ioctls are identical to the ioctls in videodev2.h */ +#define VIDIOC_SUBDEV_G_EDID _IOWR('V', 40, struct v4l2_edid) +#define VIDIOC_SUBDEV_S_EDID _IOWR('V', 41, struct v4l2_edid) +#define VIDIOC_SUBDEV_S_DV_TIMINGS _IOWR('V', 87, struct v4l2_dv_timings) +#define VIDIOC_SUBDEV_G_DV_TIMINGS _IOWR('V', 88, struct v4l2_dv_timings) +#define VIDIOC_SUBDEV_ENUM_DV_TIMINGS _IOWR('V', 98, struct v4l2_enum_dv_timings) +#define VIDIOC_SUBDEV_QUERY_DV_TIMINGS _IOR('V', 99, struct v4l2_dv_timings) +#define VIDIOC_SUBDEV_DV_TIMINGS_CAP _IOWR('V', 100, struct v4l2_dv_timings_cap) #endif diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 00259d2..168ff50 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -1106,12 +1106,15 @@ struct v4l2_dv_timings { /** struct v4l2_enum_dv_timings - DV timings enumeration * @index: enumeration index + * @pad: the pad number for which to enumerate timings (used with + * v4l-subdev nodes only) * @reserved: must be zeroed * @timings: the timings for the given index */ struct v4l2_enum_dv_timings { __u32 index; - __u32 reserved[3]; + __u32 pad; + __u32 reserved[2]; struct v4l2_dv_timings timings; }; @@ -1149,11 +1152,14 @@ struct v4l2_bt_timings_cap { /** struct v4l2_dv_timings_cap - DV timings capabilities * @type: the type of the timings (same as in struct v4l2_dv_timings) + * @pad: the pad number for which to query capabilities (used with + * v4l-subdev nodes only) * @bt: the BT656/1120 timings capabilities */ struct v4l2_dv_timings_cap { __u32 type; - __u32 reserved[3]; + __u32 pad; + __u32 reserved[2]; union { struct v4l2_bt_timings_cap bt; __u32 raw_data[32]; _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
