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

Commit 4376679a authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] media.h: don't use legacy entity macros at Kernel 



Put the legacy MEDIA_ENT_* macros under a #ifndef __KERNEL__,
in order to be sure that none of those old symbols are used
inside the Kernel.

Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 687b4209

include/uapi/linux/media.h

+2 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ struct media_device_info { 
#define MEDIA_ENT_T_DVB_CA		(MEDIA_ENT_T_DVB_BASE + 4)

#define MEDIA_ENT_T_DVB_NET_DECAP	(MEDIA_ENT_T_DVB_BASE + 5)



#ifndef __KERNEL__

/* Legacy symbols used to avoid userspace compilation breakages */

#define MEDIA_ENT_TYPE_SHIFT		16

#define MEDIA_ENT_TYPE_MASK		0x00ff0000
@@ -118,6 +119,7 @@ struct media_device_info { 
#define MEDIA_ENT_T_DEVNODE_FB		(MEDIA_ENT_T_DEVNODE + 2)

#define MEDIA_ENT_T_DEVNODE_ALSA	(MEDIA_ENT_T_DEVNODE + 3)

#define MEDIA_ENT_T_DEVNODE_DVB		(MEDIA_ENT_T_DEVNODE + 4)

#endif



/* Entity types */