aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/v4l2-core
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2012-09-03 09:38:41 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-09-26 08:49:37 -0400
commit1c4f3c987f44a6653ac49f93d8cbd3adb539be10 (patch)
tree0e5579dfed92068bf07b7882e1fa026e4fb2ac55 /drivers/media/v4l2-core
parenta5338190efc7cfa8c99a6856342a77d21c9a05cf (diff)
[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: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/v4l2-core')
-rw-r--r--drivers/media/v4l2-core/v4l2-ioctl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index f3ced2513b2f..7336363984c1 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -984,7 +984,7 @@ static int v4l_enuminput(const struct v4l2_ioctl_ops *ops,
984 struct v4l2_input *p = arg; 984 struct v4l2_input *p = arg;
985 985
986 /* 986 /*
987 * We set the flags for CAP_PRESETS, CAP_CUSTOM_TIMINGS & 987 * We set the flags for CAP_PRESETS, CAP_DV_TIMINGS &
988 * CAP_STD here based on ioctl handler provided by the 988 * CAP_STD here based on ioctl handler provided by the
989 * driver. If the driver doesn't support these 989 * driver. If the driver doesn't support these
990 * for a specific input, it must override these flags. 990 * for a specific input, it must override these flags.
@@ -994,7 +994,7 @@ static int v4l_enuminput(const struct v4l2_ioctl_ops *ops,
994 if (ops->vidioc_s_dv_preset) 994 if (ops->vidioc_s_dv_preset)
995 p->capabilities |= V4L2_IN_CAP_PRESETS; 995 p->capabilities |= V4L2_IN_CAP_PRESETS;
996 if (ops->vidioc_s_dv_timings) 996 if (ops->vidioc_s_dv_timings)
997 p->capabilities |= V4L2_IN_CAP_CUSTOM_TIMINGS; 997 p->capabilities |= V4L2_IN_CAP_DV_TIMINGS;
998 998
999 return ops->vidioc_enum_input(file, fh, p); 999 return ops->vidioc_enum_input(file, fh, p);
1000} 1000}
@@ -1005,7 +1005,7 @@ static int v4l_enumoutput(const struct v4l2_ioctl_ops *ops,
1005 struct v4l2_output *p = arg; 1005 struct v4l2_output *p = arg;
1006 1006
1007 /* 1007 /*
1008 * We set the flags for CAP_PRESETS, CAP_CUSTOM_TIMINGS & 1008 * We set the flags for CAP_PRESETS, CAP_DV_TIMINGS &
1009 * CAP_STD here based on ioctl handler provided by the 1009 * CAP_STD here based on ioctl handler provided by the
1010 * driver. If the driver doesn't support these 1010 * driver. If the driver doesn't support these
1011 * for a specific output, it must override these flags. 1011 * for a specific output, it must override these flags.
@@ -1015,7 +1015,7 @@ static int v4l_enumoutput(const struct v4l2_ioctl_ops *ops,
1015 if (ops->vidioc_s_dv_preset) 1015 if (ops->vidioc_s_dv_preset)
1016 p->capabilities |= V4L2_OUT_CAP_PRESETS; 1016 p->capabilities |= V4L2_OUT_CAP_PRESETS;
1017 if (ops->vidioc_s_dv_timings) 1017 if (ops->vidioc_s_dv_timings)
1018 p->capabilities |= V4L2_OUT_CAP_CUSTOM_TIMINGS; 1018 p->capabilities |= V4L2_OUT_CAP_DV_TIMINGS;
1019 1019
1020 return ops->vidioc_enum_output(file, fh, p); 1020 return ops->vidioc_enum_output(file, fh, p);
1021} 1021}