tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
media: v4l2-common.h: put backwards compat defines under #ifndef __KERNEL__
This ensures that they won't be used in kernel code.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Tested-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
authored by
Hans Verkuil
and committed by
Mauro Carvalho Chehab
177bbc67
5b79da06
+15
-13
+15
-13
include/uapi/linux/v4l2-common.h
+15
-13
include/uapi/linux/v4l2-common.h
···
79
79
/* Current composing area plus all padding pixels */
80
80
#define V4L2_SEL_TGT_COMPOSE_PADDED 0x0103
81
81
82
-
/* Backward compatibility target definitions --- to be removed. */
83
-
#define V4L2_SEL_TGT_CROP_ACTIVE V4L2_SEL_TGT_CROP
84
-
#define V4L2_SEL_TGT_COMPOSE_ACTIVE V4L2_SEL_TGT_COMPOSE
85
-
#define V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL V4L2_SEL_TGT_CROP
86
-
#define V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL V4L2_SEL_TGT_COMPOSE
87
-
#define V4L2_SUBDEV_SEL_TGT_CROP_BOUNDS V4L2_SEL_TGT_CROP_BOUNDS
88
-
#define V4L2_SUBDEV_SEL_TGT_COMPOSE_BOUNDS V4L2_SEL_TGT_COMPOSE_BOUNDS
89
-
90
82
/* Selection flags */
91
83
#define V4L2_SEL_FLAG_GE (1 << 0)
92
84
#define V4L2_SEL_FLAG_LE (1 << 1)
93
85
#define V4L2_SEL_FLAG_KEEP_CONFIG (1 << 2)
94
-
95
-
/* Backward compatibility flag definitions --- to be removed. */
96
-
#define V4L2_SUBDEV_SEL_FLAG_SIZE_GE V4L2_SEL_FLAG_GE
97
-
#define V4L2_SUBDEV_SEL_FLAG_SIZE_LE V4L2_SEL_FLAG_LE
98
-
#define V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG V4L2_SEL_FLAG_KEEP_CONFIG
99
86
100
87
struct v4l2_edid {
101
88
__u32 pad;
···
91
104
__u32 reserved[5];
92
105
__u8 *edid;
93
106
};
107
+
108
+
#ifndef __KERNEL__
109
+
/* Backward compatibility target definitions --- to be removed. */
110
+
#define V4L2_SEL_TGT_CROP_ACTIVE V4L2_SEL_TGT_CROP
111
+
#define V4L2_SEL_TGT_COMPOSE_ACTIVE V4L2_SEL_TGT_COMPOSE
112
+
#define V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL V4L2_SEL_TGT_CROP
113
+
#define V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL V4L2_SEL_TGT_COMPOSE
114
+
#define V4L2_SUBDEV_SEL_TGT_CROP_BOUNDS V4L2_SEL_TGT_CROP_BOUNDS
115
+
#define V4L2_SUBDEV_SEL_TGT_COMPOSE_BOUNDS V4L2_SEL_TGT_COMPOSE_BOUNDS
116
+
117
+
/* Backward compatibility flag definitions --- to be removed. */
118
+
#define V4L2_SUBDEV_SEL_FLAG_SIZE_GE V4L2_SEL_FLAG_GE
119
+
#define V4L2_SUBDEV_SEL_FLAG_SIZE_LE V4L2_SEL_FLAG_LE
120
+
#define V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG V4L2_SEL_FLAG_KEEP_CONFIG
121
+
#endif
94
122
95
123
#endif /* __V4L2_COMMON__ */