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

[media] media.h: use hex values for range offsets, move connectors base up. 



Make the base offset hexadecimal to simplify debugging since the base
addresses are hex too.

The offsets for connectors is also changed to start after the 'reserved'
range 0x10000-0x2ffff.

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

include/uapi/linux/media.h

+10 −10
Original line number Diff line number Diff line
@@ -66,25 +66,25 @@ struct media_device_info { 
/*

 * DVB entities

 */

#define MEDIA_ENT_F_DTV_DEMOD		(MEDIA_ENT_F_BASE + 1)

#define MEDIA_ENT_F_TS_DEMUX		(MEDIA_ENT_F_BASE + 2)

#define MEDIA_ENT_F_DTV_CA		(MEDIA_ENT_F_BASE + 3)

#define MEDIA_ENT_F_DTV_NET_DECAP	(MEDIA_ENT_F_BASE + 4)

#define MEDIA_ENT_F_DTV_DEMOD		(MEDIA_ENT_F_BASE + 0x00001)

#define MEDIA_ENT_F_TS_DEMUX		(MEDIA_ENT_F_BASE + 0x00002)

#define MEDIA_ENT_F_DTV_CA		(MEDIA_ENT_F_BASE + 0x00003)

#define MEDIA_ENT_F_DTV_NET_DECAP	(MEDIA_ENT_F_BASE + 0x00004)



/*

 * I/O entities

 */

#define MEDIA_ENT_F_IO_DTV		(MEDIA_ENT_F_BASE + 1001)

#define MEDIA_ENT_F_IO_VBI		(MEDIA_ENT_F_BASE + 1002)

#define MEDIA_ENT_F_IO_SWRADIO		(MEDIA_ENT_F_BASE + 1003)

#define MEDIA_ENT_F_IO_DTV		(MEDIA_ENT_F_BASE + 0x01001)

#define MEDIA_ENT_F_IO_VBI		(MEDIA_ENT_F_BASE + 0x01002)

#define MEDIA_ENT_F_IO_SWRADIO		(MEDIA_ENT_F_BASE + 0x01003)



/*

 * Connectors

 */

/* It is a responsibility of the entity drivers to add connectors and links */

#define MEDIA_ENT_F_CONN_RF		(MEDIA_ENT_F_BASE + 10001)

#define MEDIA_ENT_F_CONN_SVIDEO		(MEDIA_ENT_F_BASE + 10002)

#define MEDIA_ENT_F_CONN_COMPOSITE	(MEDIA_ENT_F_BASE + 10003)

#define MEDIA_ENT_F_CONN_RF		(MEDIA_ENT_F_BASE + 0x30001)

#define MEDIA_ENT_F_CONN_SVIDEO		(MEDIA_ENT_F_BASE + 0x30002)

#define MEDIA_ENT_F_CONN_COMPOSITE	(MEDIA_ENT_F_BASE + 0x30003)



/*

 * Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and