summaryrefslogtreecommitdiffstats
path: root/include/linux/v4l2-common.h
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@iki.fi>2012-06-13 16:01:10 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-07-06 20:17:46 -0300
commit563df3d0bc2ca103e5ddb76c8b7b3386ed2da0d6 (patch)
treebda561c54a3dd03a52bd8d714c8c354b146e8dc6 /include/linux/v4l2-common.h
parent64b9ce83a446277d3ffdb5e25e9aeb66442da2a9 (diff)
downloadlinux-stable-563df3d0bc2ca103e5ddb76c8b7b3386ed2da0d6.tar.gz
linux-stable-563df3d0bc2ca103e5ddb76c8b7b3386ed2da0d6.tar.bz2
linux-stable-563df3d0bc2ca103e5ddb76c8b7b3386ed2da0d6.zip
[media] v4l: Unify selection flags
Unify flags on the selection interfaces on V4L2 and V4L2 subdev. Flags are very similar to targets in this case: there are more similarities than differences between the two interfaces. 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/linux/v4l2-common.h')
-rw-r--r--include/linux/v4l2-common.h20
1 files changed, 17 insertions, 3 deletions
diff --git a/include/linux/v4l2-common.h b/include/linux/v4l2-common.h
index e85bf15b5994..0fa8b64c3cdb 100644
--- a/include/linux/v4l2-common.h
+++ b/include/linux/v4l2-common.h
@@ -29,7 +29,11 @@
#ifndef __V4L2_COMMON__
#define __V4L2_COMMON__
-/* Selection target definitions */
+/*
+ *
+ * Selection interface definitions
+ *
+ */
/* Current cropping area */
#define V4L2_SEL_TGT_CROP 0x0000
@@ -46,7 +50,7 @@
/* Current composing area plus all padding pixels */
#define V4L2_SEL_TGT_COMPOSE_PADDED 0x0103
-/* Backward compatibility definitions */
+/* Backward compatibility target definitions --- to be removed. */
#define V4L2_SEL_TGT_CROP_ACTIVE V4L2_SEL_TGT_CROP
#define V4L2_SEL_TGT_COMPOSE_ACTIVE V4L2_SEL_TGT_COMPOSE
#define V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL \
@@ -54,4 +58,14 @@
#define V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL \
V4L2_SEL_TGT_COMPOSE
-#endif /* __V4L2_COMMON__ */
+/* Selection flags */
+#define V4L2_SEL_FLAG_GE (1 << 0)
+#define V4L2_SEL_FLAG_LE (1 << 1)
+#define V4L2_SEL_FLAG_KEEP_CONFIG (1 << 2)
+
+/* Backward compatibility flag definitions --- to be removed. */
+#define V4L2_SUBDEV_SEL_FLAG_SIZE_GE V4L2_SEL_FLAG_GE
+#define V4L2_SUBDEV_SEL_FLAG_SIZE_LE V4L2_SEL_FLAG_LE
+#define V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG V4L2_SEL_FLAG_KEEP_CONFIG
+
+#endif /* __V4L2_COMMON__ */