Commit aa1b4da6 authored by Boris BREZILLON's avatar Boris BREZILLON Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: Forbid usage of V4L2_MBUS_FMT definitions inside the kernel 



Place v4l2_mbus_pixelcode in a #ifndef __KERNEL__ section so that kernel
users don't have access to these definitions.

We have to keep this definition for user-space users even though they're
encouraged to move to the new media_bus_format enum.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 3e47608f

include/uapi/linux/v4l2-mediabus.h

+28 −17
Original line number Diff line number Diff line
@@ -15,6 +15,33 @@ 
#include <linux/types.h>

#include <linux/videodev2.h>



/**

 * struct v4l2_mbus_framefmt - frame format on the media bus

 * @width:	frame width

 * @height:	frame height

 * @code:	data format code (from enum v4l2_mbus_pixelcode)

 * @field:	used interlacing type (from enum v4l2_field)

 * @colorspace:	colorspace of the data (from enum v4l2_colorspace)

 */

struct v4l2_mbus_framefmt {

	__u32			width;

	__u32			height;

	__u32			code;

	__u32			field;

	__u32			colorspace;

	__u32			reserved[7];

};



#ifndef __KERNEL__

/*

 * enum v4l2_mbus_pixelcode and its definitions are now deprecated, and

 * MEDIA_BUS_FMT_ definitions (defined in media-bus-format.h) should be

 * used instead.

 *

 * New defines should only be added to media-bus-format.h. The

 * v4l2_mbus_pixelcode enum is frozen.

 */



#define V4L2_MBUS_FROM_MEDIA_BUS_FMT(name)	\

	V4L2_MBUS_FMT_ ## name = MEDIA_BUS_FMT_ ## name
@@ -102,22 +129,6 @@ enum v4l2_mbus_pixelcode { 


	V4L2_MBUS_FROM_MEDIA_BUS_FMT(AHSV8888_1X32),

};



/**

 * struct v4l2_mbus_framefmt - frame format on the media bus

 * @width:	frame width

 * @height:	frame height

 * @code:	data format code (from enum v4l2_mbus_pixelcode)

 * @field:	used interlacing type (from enum v4l2_field)

 * @colorspace:	colorspace of the data (from enum v4l2_colorspace)

 */

struct v4l2_mbus_framefmt {

	__u32			width;

	__u32			height;

	__u32			code;

	__u32			field;

	__u32			colorspace;

	__u32			reserved[7];

};

#endif /* __KERNEL__ */



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE