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

media: media.h: reorder video en/decoder functions 



Keep the function defines in numerical order: 0x6000 comes after
0x2000, so move it back.

Signed-off-by: default avatarHans Verkuil <hansverk@cisco.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 7c8362c4

include/uapi/linux/media.h

+7 −7
Original line number Diff line number Diff line
@@ -89,13 +89,6 @@ struct media_device_info { 
#define MEDIA_ENT_F_FLASH			(MEDIA_ENT_F_OLD_SUBDEV_BASE + 2)

#define MEDIA_ENT_F_LENS			(MEDIA_ENT_F_OLD_SUBDEV_BASE + 3)



/*

 * Video decoder/encoder functions

 */

#define MEDIA_ENT_F_ATV_DECODER			(MEDIA_ENT_F_OLD_SUBDEV_BASE + 4)

#define MEDIA_ENT_F_DV_DECODER			(MEDIA_ENT_F_BASE + 0x6001)

#define MEDIA_ENT_F_DV_ENCODER			(MEDIA_ENT_F_BASE + 0x6002)



/*

 * Digital TV, analog TV, radio and/or software defined radio tuner functions.

 *
@@ -140,6 +133,13 @@ struct media_device_info { 
#define MEDIA_ENT_F_VID_MUX			(MEDIA_ENT_F_BASE + 0x5001)

#define MEDIA_ENT_F_VID_IF_BRIDGE		(MEDIA_ENT_F_BASE + 0x5002)



/*

 * Video decoder/encoder functions

 */

#define MEDIA_ENT_F_ATV_DECODER			(MEDIA_ENT_F_OLD_SUBDEV_BASE + 4)

#define MEDIA_ENT_F_DV_DECODER			(MEDIA_ENT_F_BASE + 0x6001)

#define MEDIA_ENT_F_DV_ENCODER			(MEDIA_ENT_F_BASE + 0x6002)



/* Entity flags */

#define MEDIA_ENT_FL_DEFAULT			(1 << 0)

#define MEDIA_ENT_FL_CONNECTOR			(1 << 1)