Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c4f3c98 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] Rename V4L2_(IN|OUT)_CAP_CUSTOM_TIMINGS 



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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a5338190

Documentation/DocBook/media/v4l/vidioc-enuminput.xml

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ input/output interface to linux-media@vger.kernel.org on 19 Oct 2009. 
	    <entry>This input supports setting DV presets by using VIDIOC_S_DV_PRESET.</entry>

	  </row>

	  <row>

	    <entry><constant>V4L2_IN_CAP_CUSTOM_TIMINGS</constant></entry>

	    <entry><constant>V4L2_IN_CAP_DV_TIMINGS</constant></entry>

	    <entry>0x00000002</entry>

	    <entry>This input supports setting video timings by using VIDIOC_S_DV_TIMINGS.</entry>

	  </row>

Documentation/DocBook/media/v4l/vidioc-enumoutput.xml

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ input/output interface to linux-media@vger.kernel.org on 19 Oct 2009. 
	    <entry>This output supports setting DV presets by using VIDIOC_S_DV_PRESET.</entry>

	  </row>

	  <row>

	    <entry><constant>V4L2_OUT_CAP_CUSTOM_TIMINGS</constant></entry>

	    <entry><constant>V4L2_OUT_CAP_DV_TIMINGS</constant></entry>

	    <entry>0x00000002</entry>

	    <entry>This output supports setting video timings by using VIDIOC_S_DV_TIMINGS.</entry>

	  </row>

Documentation/DocBook/media/v4l/vidioc-g-dv-timings.xml

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ or the timing values are not correct, the driver returns &EINVAL;.</para> 
<para>The <filename>linux/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 <constant>V4L2_IN_CAP_CUSTOM_TIMINGS</constant> flag), then

&VIDIOC-ENUMINPUT; does not set the <constant>V4L2_IN_CAP_DV_TIMINGS</constant> flag), then

&ENODATA; is returned.</para>

  </refsect1>

drivers/media/v4l2-core/v4l2-ioctl.c

+4 −4
Original line number Diff line number Diff line
@@ -984,7 +984,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.
@@ -994,7 +994,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);

}
@@ -1005,7 +1005,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.
@@ -1015,7 +1015,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);

}

include/linux/videodev2.h

+4 −2
Original line number Diff line number Diff line
@@ -1191,7 +1191,8 @@ struct v4l2_input { 


/* capabilities flags */

#define V4L2_IN_CAP_PRESETS		0x00000001 /* Supports S_DV_PRESET */

#define V4L2_IN_CAP_CUSTOM_TIMINGS	0x00000002 /* Supports S_DV_TIMINGS */

#define V4L2_IN_CAP_DV_TIMINGS		0x00000002 /* Supports S_DV_TIMINGS */

#define V4L2_IN_CAP_CUSTOM_TIMINGS	V4L2_IN_CAP_DV_TIMINGS /* For compatibility */

#define V4L2_IN_CAP_STD			0x00000004 /* Supports S_STD */



/*
@@ -1214,7 +1215,8 @@ struct v4l2_output { 


/* capabilities flags */

#define V4L2_OUT_CAP_PRESETS		0x00000001 /* Supports S_DV_PRESET */

#define V4L2_OUT_CAP_CUSTOM_TIMINGS	0x00000002 /* Supports S_DV_TIMINGS */

#define V4L2_OUT_CAP_DV_TIMINGS		0x00000002 /* Supports S_DV_TIMINGS */

#define V4L2_OUT_CAP_CUSTOM_TIMINGS	V4L2_OUT_CAP_DV_TIMINGS /* For compatibility */

#define V4L2_OUT_CAP_STD		0x00000004 /* Supports S_STD */



/*