Commit 177bbc67 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Tested-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 5b79da06

include/uapi/linux/v4l2-common.h

+15 −13
Original line number Diff line number Diff line
@@ -79,24 +79,11 @@ 
/* Current composing area plus all padding pixels */

#define V4L2_SEL_TGT_COMPOSE_PADDED	0x0103



/* 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	V4L2_SEL_TGT_CROP

#define V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL V4L2_SEL_TGT_COMPOSE

#define V4L2_SUBDEV_SEL_TGT_CROP_BOUNDS	V4L2_SEL_TGT_CROP_BOUNDS

#define V4L2_SUBDEV_SEL_TGT_COMPOSE_BOUNDS V4L2_SEL_TGT_COMPOSE_BOUNDS



/* 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



struct v4l2_edid {

	__u32 pad;

	__u32 start_block;
@@ -105,4 +92,19 @@ struct v4l2_edid { 
	__u8  *edid;

};



#ifndef __KERNEL__

/* 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	V4L2_SEL_TGT_CROP

#define V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL V4L2_SEL_TGT_COMPOSE

#define V4L2_SUBDEV_SEL_TGT_CROP_BOUNDS	V4L2_SEL_TGT_CROP_BOUNDS

#define V4L2_SUBDEV_SEL_TGT_COMPOSE_BOUNDS V4L2_SEL_TGT_COMPOSE_BOUNDS



/* 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



#endif /* __V4L2_COMMON__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE