Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32b32ce8 authored by Boris Brezillon's avatar Boris Brezillon Committed by Mauro Carvalho Chehab
Browse files

[media] Make use of the new media_bus_format definitions 



Replace references to the v4l2_mbus_pixelcode enum with the new
media_bus_format enum in all common headers.

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

include/media/v4l2-mediabus.h

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static inline void v4l2_fill_pix_format(struct v4l2_pix_format *pix_fmt, 


static inline void v4l2_fill_mbus_format(struct v4l2_mbus_framefmt *mbus_fmt,

			   const struct v4l2_pix_format *pix_fmt,

			   enum v4l2_mbus_pixelcode code)

			   u32 code)

{

	mbus_fmt->width = pix_fmt->width;

	mbus_fmt->height = pix_fmt->height;

include/media/v4l2-subdev.h

+1 −1
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ struct v4l2_subdev_video_ops { 
	int (*query_dv_timings)(struct v4l2_subdev *sd,

			struct v4l2_dv_timings *timings);

	int (*enum_mbus_fmt)(struct v4l2_subdev *sd, unsigned int index,

			     enum v4l2_mbus_pixelcode *code);

			     u32 *code);

	int (*enum_mbus_fsizes)(struct v4l2_subdev *sd,

			     struct v4l2_frmsizeenum *fsize);

	int (*g_mbus_fmt)(struct v4l2_subdev *sd,

include/uapi/linux/v4l2-subdev.h

+3 −3
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ struct v4l2_subdev_crop { 
 * struct v4l2_subdev_mbus_code_enum - Media bus format enumeration

 * @pad: pad number, as reported by the media API

 * @index: format index during enumeration

 * @code: format code (from enum v4l2_mbus_pixelcode)

 * @code: format code (MEDIA_BUS_FMT_ definitions)

 */

struct v4l2_subdev_mbus_code_enum {

	__u32 pad;
@@ -81,7 +81,7 @@ struct v4l2_subdev_mbus_code_enum { 
 * struct v4l2_subdev_frame_size_enum - Media bus format enumeration

 * @pad: pad number, as reported by the media API

 * @index: format index during enumeration

 * @code: format code (from enum v4l2_mbus_pixelcode)

 * @code: format code (MEDIA_BUS_FMT_ definitions)

 */

struct v4l2_subdev_frame_size_enum {

	__u32 index;
@@ -109,7 +109,7 @@ struct v4l2_subdev_frame_interval { 
 * struct v4l2_subdev_frame_interval_enum - Frame interval enumeration

 * @pad: pad number, as reported by the media API

 * @index: frame interval index during enumeration

 * @code: format code (from enum v4l2_mbus_pixelcode)

 * @code: format code (MEDIA_BUS_FMT_ definitions)

 * @width: frame width in pixels

 * @height: frame height in pixels

 * @interval: frame interval in seconds