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

Commit 32fdc0e1 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] uapi/media.h: Fix entity namespace 



Now that interfaces got created, we need to fix the entity
namespace.

So, let's create a consistent new namespace and add backward
compatibility macros to keep the old namespace preserved.

Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 8ddb90d2

drivers/media/dvb-core/dvbdev.c

+13 −13
Original line number Diff line number Diff line
@@ -230,17 +230,17 @@ static void dvb_create_media_entity(struct dvb_device *dvbdev, 


	switch (type) {

	case DVB_DEVICE_FRONTEND:

		dvbdev->entity->type = MEDIA_ENT_T_DEVNODE_DVB_FE;

		dvbdev->entity->type = MEDIA_ENT_T_DVB_DEMOD;

		dvbdev->pads[0].flags = MEDIA_PAD_FL_SINK;

		dvbdev->pads[1].flags = MEDIA_PAD_FL_SOURCE;

		break;

	case DVB_DEVICE_DEMUX:

		dvbdev->entity->type = MEDIA_ENT_T_DEVNODE_DVB_DEMUX;

		dvbdev->entity->type = MEDIA_ENT_T_DVB_DEMUX;

		dvbdev->pads[0].flags = MEDIA_PAD_FL_SINK;

		dvbdev->pads[1].flags = MEDIA_PAD_FL_SOURCE;

		break;

	case DVB_DEVICE_CA:

		dvbdev->entity->type = MEDIA_ENT_T_DEVNODE_DVB_CA;

		dvbdev->entity->type = MEDIA_ENT_T_DVB_CA;

		dvbdev->pads[0].flags = MEDIA_PAD_FL_SINK;

		dvbdev->pads[1].flags = MEDIA_PAD_FL_SOURCE;

		break;
@@ -439,7 +439,7 @@ EXPORT_SYMBOL(dvb_unregister_device); 
void dvb_create_media_graph(struct dvb_adapter *adap)

{

	struct media_device *mdev = adap->mdev;

	struct media_entity *entity, *tuner = NULL, *fe = NULL;

	struct media_entity *entity, *tuner = NULL, *demod = NULL;

	struct media_entity *demux = NULL, *dvr = NULL, *ca = NULL;

	struct media_interface *intf;
@@ -451,26 +451,26 @@ void dvb_create_media_graph(struct dvb_adapter *adap) 
		case MEDIA_ENT_T_V4L2_SUBDEV_TUNER:

			tuner = entity;

			break;

		case MEDIA_ENT_T_DEVNODE_DVB_FE:

			fe = entity;

		case MEDIA_ENT_T_DVB_DEMOD:

			demod = entity;

			break;

		case MEDIA_ENT_T_DEVNODE_DVB_DEMUX:

		case MEDIA_ENT_T_DVB_DEMUX:

			demux = entity;

			break;

		case MEDIA_ENT_T_DEVNODE_DVB_DVR:

		case MEDIA_ENT_T_DVB_TSOUT:

			dvr = entity;

			break;

		case MEDIA_ENT_T_DEVNODE_DVB_CA:

		case MEDIA_ENT_T_DVB_CA:

			ca = entity;

			break;

		}

	}



	if (tuner && fe)

		media_create_pad_link(tuner, 0, fe, 0, 0);

	if (tuner && demod)

		media_create_pad_link(tuner, 0, demod, 0, 0);



	if (fe && demux)

		media_create_pad_link(fe, 1, demux, 0, MEDIA_LNK_FL_ENABLED);

	if (demod && demux)

		media_create_pad_link(demod, 1, demux, 0, MEDIA_LNK_FL_ENABLED);



	if (demux && dvr)

		media_create_pad_link(demux, 1, dvr, 0, MEDIA_LNK_FL_ENABLED);

include/uapi/linux/media.h

+57 −19
Original line number Diff line number Diff line
@@ -42,31 +42,69 @@ struct media_device_info { 


#define MEDIA_ENT_ID_FLAG_NEXT		(1 << 31)



/*

 * Base numbers for entity types

 *

 * Please notice that the huge gap of 16 bits for each base is overkill!

 * 8 bits is more than enough to avoid starving entity types for each

 * subsystem.

 *

 * However, It is kept this way just to avoid binary breakages with the

 * namespace provided on legacy versions of this header.

 */

#define MEDIA_ENT_T_DVB_BASE		0x00000000

#define MEDIA_ENT_T_V4L2_BASE		0x00010000

#define MEDIA_ENT_T_V4L2_SUBDEV_BASE	0x00020000



/*

 * V4L2 entities - Those are used for DMA (mmap/DMABUF) and

 *	read()/write() data I/O associated with the V4L2 devnodes.

 */

#define MEDIA_ENT_T_V4L2_VIDEO		(MEDIA_ENT_T_V4L2_BASE + 1)

	/*

	 * Please notice that numbers between MEDIA_ENT_T_V4L2_BASE + 2 and

	 * MEDIA_ENT_T_V4L2_BASE + 4 can't be used, as those values used

	 * to be declared for FB, ALSA and DVB entities.

	 * As those values were never actually used in practice, we're just

	 * adding them as backward compatibility macros and keeping the

	 * numberspace clean here. This way, we avoid breaking compilation,

	 * in the case of having some userspace application using the old

	 * symbols.

	 */

#define MEDIA_ENT_T_V4L2_VBI		(MEDIA_ENT_T_V4L2_BASE + 5)

#define MEDIA_ENT_T_V4L2_SWRADIO	(MEDIA_ENT_T_V4L2_BASE + 6)



/* V4L2 Sub-device entities */

#define MEDIA_ENT_T_V4L2_SUBDEV_SENSOR	(MEDIA_ENT_T_V4L2_SUBDEV_BASE + 1)

#define MEDIA_ENT_T_V4L2_SUBDEV_FLASH	(MEDIA_ENT_T_V4L2_SUBDEV_BASE + 2)

#define MEDIA_ENT_T_V4L2_SUBDEV_LENS	(MEDIA_ENT_T_V4L2_SUBDEV_BASE + 3)

	/* A converter of analogue video to its digital representation. */

#define MEDIA_ENT_T_V4L2_SUBDEV_DECODER	(MEDIA_ENT_T_V4L2_SUBDEV_BASE + 4)

	/* Tuner entity is actually both V4L2 and DVB subdev */

#define MEDIA_ENT_T_V4L2_SUBDEV_TUNER	(MEDIA_ENT_T_V4L2_SUBDEV_BASE + 5)



/* DVB entities */

#define MEDIA_ENT_T_DVB_DEMOD		(MEDIA_ENT_T_DVB_BASE + 1)

#define MEDIA_ENT_T_DVB_DEMUX		(MEDIA_ENT_T_DVB_BASE + 2)

#define MEDIA_ENT_T_DVB_TSOUT		(MEDIA_ENT_T_DVB_BASE + 3)

#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)



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

#define MEDIA_ENT_TYPE_SHIFT		16

#define MEDIA_ENT_TYPE_MASK		0x00ff0000

#define MEDIA_ENT_SUBTYPE_MASK		0x0000ffff



#define MEDIA_ENT_T_DEVNODE		(1 << MEDIA_ENT_TYPE_SHIFT)

#define MEDIA_ENT_T_DEVNODE_V4L		(MEDIA_ENT_T_DEVNODE + 1)

#define MEDIA_ENT_T_DEVNODE		MEDIA_ENT_T_V4L2_BASE

#define MEDIA_ENT_T_V4L2_SUBDEV		MEDIA_ENT_T_V4L2_SUBDEV_BASE



#define MEDIA_ENT_T_DEVNODE_V4L		MEDIA_ENT_T_V4L2_VIDEO



#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_FE	(MEDIA_ENT_T_DEVNODE + 4)

#define MEDIA_ENT_T_DEVNODE_DVB_DEMUX	(MEDIA_ENT_T_DEVNODE + 5)

#define MEDIA_ENT_T_DEVNODE_DVB_DVR	(MEDIA_ENT_T_DEVNODE + 6)

#define MEDIA_ENT_T_DEVNODE_DVB_CA	(MEDIA_ENT_T_DEVNODE + 7)

#define MEDIA_ENT_T_DEVNODE_DVB_NET	(MEDIA_ENT_T_DEVNODE + 8)



/* Legacy symbol. Use it to avoid userspace compilation breakages */

#define MEDIA_ENT_T_DEVNODE_DVB		MEDIA_ENT_T_DEVNODE_DVB_FE



#define MEDIA_ENT_T_V4L2_SUBDEV		(2 << MEDIA_ENT_TYPE_SHIFT)

#define MEDIA_ENT_T_V4L2_SUBDEV_SENSOR	(MEDIA_ENT_T_V4L2_SUBDEV + 1)

#define MEDIA_ENT_T_V4L2_SUBDEV_FLASH	(MEDIA_ENT_T_V4L2_SUBDEV + 2)

#define MEDIA_ENT_T_V4L2_SUBDEV_LENS	(MEDIA_ENT_T_V4L2_SUBDEV + 3)

/* A converter of analogue video to its digital representation. */

#define MEDIA_ENT_T_V4L2_SUBDEV_DECODER	(MEDIA_ENT_T_V4L2_SUBDEV + 4)

#define MEDIA_ENT_T_DEVNODE_DVB		(MEDIA_ENT_T_DEVNODE + 4)



#define MEDIA_ENT_T_V4L2_SUBDEV_TUNER	(MEDIA_ENT_T_V4L2_SUBDEV + 5)

/* Entity types */



#define MEDIA_ENT_FL_DEFAULT		(1 << 0)