From: Hans Verkuil hans.verk...@cisco.com
The 'custom' timings are no longer just for custom timings, but also for
standard
CEA/VESA timings. So rename to V4L2_IN/OUT_CAP_DV_TIMINGS.
The old define is still kept for backwards compatibility.
This decision was taken during the 2012 Media Workshop.
Signed-off-by: Hans Verkuil hans.verk...@cisco.com
---
Documentation/DocBook/media/v4l/vidioc-enuminput.xml|2 +-
Documentation/DocBook/media/v4l/vidioc-enumoutput.xml |2 +-
Documentation/DocBook/media/v4l/vidioc-g-dv-timings.xml |2 +-
drivers/media/v4l2-core/v4l2-ioctl.c|8
include/linux/videodev2.h |6 --
5 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/Documentation/DocBook/media/v4l/vidioc-enuminput.xml
b/Documentation/DocBook/media/v4l/vidioc-enuminput.xml
index 46d5a04..3c9a813 100644
--- a/Documentation/DocBook/media/v4l/vidioc-enuminput.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-enuminput.xml
@@ -283,7 +283,7 @@ input/output interface to linux-media@vger.kernel.org on 19
Oct 2009.
entryThis input supports setting DV presets by using
VIDIOC_S_DV_PRESET./entry
/row
row
- entryconstantV4L2_IN_CAP_CUSTOM_TIMINGS/constant/entry
+ entryconstantV4L2_IN_CAP_DV_TIMINGS/constant/entry
entry0x0002/entry
entryThis input supports setting video timings by using
VIDIOC_S_DV_TIMINGS./entry
/row
diff --git a/Documentation/DocBook/media/v4l/vidioc-enumoutput.xml
b/Documentation/DocBook/media/v4l/vidioc-enumoutput.xml
index 4280200..f4ab079 100644
--- a/Documentation/DocBook/media/v4l/vidioc-enumoutput.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-enumoutput.xml
@@ -168,7 +168,7 @@ input/output interface to linux-media@vger.kernel.org on 19
Oct 2009.
entryThis output supports setting DV presets by using
VIDIOC_S_DV_PRESET./entry
/row
row
- entryconstantV4L2_OUT_CAP_CUSTOM_TIMINGS/constant/entry
+ entryconstantV4L2_OUT_CAP_DV_TIMINGS/constant/entry
entry0x0002/entry
entryThis output supports setting video timings by using
VIDIOC_S_DV_TIMINGS./entry
/row
diff --git a/Documentation/DocBook/media/v4l/vidioc-g-dv-timings.xml
b/Documentation/DocBook/media/v4l/vidioc-g-dv-timings.xml
index feaa180..7236970 100644
--- a/Documentation/DocBook/media/v4l/vidioc-g-dv-timings.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-g-dv-timings.xml
@@ -57,7 +57,7 @@ or the timing values are not correct, the driver returns
EINVAL;./para
paraThe filenamelinux/v4l2-dv-timings.h/filename header can be used to
get the
timings of the formats in the xref linkend=cea861 / and xref
linkend=vesadmt /
standards. If the current input or output does not support DV timings (e.g. if
-VIDIOC-ENUMINPUT; does not set the
constantV4L2_IN_CAP_CUSTOM_TIMINGS/constant flag), then
+VIDIOC-ENUMINPUT; does not set the
constantV4L2_IN_CAP_DV_TIMINGS/constant flag), then
ENODATA; is returned./para
/refsect1
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c
b/drivers/media/v4l2-core/v4l2-ioctl.c
index 473ebea..99a8ad7 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -982,7 +982,7 @@ static int v4l_enuminput(const struct v4l2_ioctl_ops *ops,
struct v4l2_input *p = arg;
/*
-* We set the flags for CAP_PRESETS, CAP_CUSTOM_TIMINGS
+* We set the flags for CAP_PRESETS, CAP_DV_TIMINGS
* CAP_STD here based on ioctl handler provided by the
* driver. If the driver doesn't support these
* for a specific input, it must override these flags.
@@ -992,7 +992,7 @@ static int v4l_enuminput(const struct v4l2_ioctl_ops *ops,
if (ops-vidioc_s_dv_preset)
p-capabilities |= V4L2_IN_CAP_PRESETS;
if (ops-vidioc_s_dv_timings)
- p-capabilities |= V4L2_IN_CAP_CUSTOM_TIMINGS;
+ p-capabilities |= V4L2_IN_CAP_DV_TIMINGS;
return ops-vidioc_enum_input(file, fh, p);
}
@@ -1003,7 +1003,7 @@ static int v4l_enumoutput(const struct v4l2_ioctl_ops
*ops,
struct v4l2_output *p = arg;
/*
-* We set the flags for CAP_PRESETS, CAP_CUSTOM_TIMINGS
+* We set the flags for CAP_PRESETS, CAP_DV_TIMINGS
* CAP_STD here based on ioctl handler provided by the
* driver. If the driver doesn't support these
* for a specific output, it must override these flags.
@@ -1013,7 +1013,7 @@ static int v4l_enumoutput(const struct v4l2_ioctl_ops
*ops,
if (ops-vidioc_s_dv_preset)
p-capabilities |= V4L2_OUT_CAP_PRESETS;
if (ops-vidioc_s_dv_timings)
- p-capabilities |= V4L2_OUT_CAP_CUSTOM_TIMINGS;
+ p-capabilities |= V4L2_OUT_CAP_DV_TIMINGS;
return ops-vidioc_enum_output(file, fh, p);
}
diff --git
