aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@iki.fi>2012-05-17 16:50:45 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-07-06 19:14:39 -0400
commit1ec0ed083988ae433305d7f4158fda8c3a1a23b9 (patch)
treeaad35d1ee8bed6a1851fdffa7a4ffd9570f17787 /include
parentc133482300113b3b71fa4a1fd2118531e765b36a (diff)
[media] v4l: Remove "_ACTUAL" from subdev selection API target definition names
The string "_ACTUAL" does not say anything more about the target names. Drop it. V4L2 selection API was changed by "V4L: Remove "_ACTIVE" from the selection target name definitions" by Sylwester Nawrocki. This patch does the same for the V4L2 subdev API. Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/v4l2-subdev.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/include/linux/v4l2-subdev.h b/include/linux/v4l2-subdev.h
index 812019ee1e06..3cbe6889fcb5 100644
--- a/include/linux/v4l2-subdev.h
+++ b/include/linux/v4l2-subdev.h
@@ -128,14 +128,19 @@ struct v4l2_subdev_frame_interval_enum {
128#define V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG (1 << 2) 128#define V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG (1 << 2)
129 129
130/* active cropping area */ 130/* active cropping area */
131#define V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL 0x0000 131#define V4L2_SUBDEV_SEL_TGT_CROP 0x0000
132/* cropping bounds */ 132/* cropping bounds */
133#define V4L2_SUBDEV_SEL_TGT_CROP_BOUNDS 0x0002 133#define V4L2_SUBDEV_SEL_TGT_CROP_BOUNDS 0x0002
134/* current composing area */ 134/* current composing area */
135#define V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL 0x0100 135#define V4L2_SUBDEV_SEL_TGT_COMPOSE 0x0100
136/* composing bounds */ 136/* composing bounds */
137#define V4L2_SUBDEV_SEL_TGT_COMPOSE_BOUNDS 0x0102 137#define V4L2_SUBDEV_SEL_TGT_COMPOSE_BOUNDS 0x0102
138 138
139/* backward compatibility definitions */
140#define V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL \
141 V4L2_SUBDEV_SEL_TGT_CROP
142#define V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL \
143 V4L2_SUBDEV_SEL_TGT_COMPOSE
139 144
140/** 145/**
141 * struct v4l2_subdev_selection - selection info 146 * struct v4l2_subdev_selection - selection info