This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: media.h: synchronize the devices with their new values Author: Mauro Carvalho Chehab <[email protected]> Date: Tue Feb 16 09:24:39 2016 -0200 As we added more space at the media entities numberspace, we need to update it, otherwise, those entities won't be properly detected. Also, one entity type was removed. Drop it from mc_nextgen_test. Signed-off-by: Mauro Carvalho Chehab <[email protected]> contrib/test/mc_nextgen_test.c | 2 -- include/linux/media.h | 28 +++++++++++++--------------- 2 files changed, 13 insertions(+), 17 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=00245e5c6fc44e09824d636c961be38acd241067 diff --git a/contrib/test/mc_nextgen_test.c b/contrib/test/mc_nextgen_test.c index 210044dd7334..5ead8e0b3744 100644 --- a/contrib/test/mc_nextgen_test.c +++ b/contrib/test/mc_nextgen_test.c @@ -220,8 +220,6 @@ static inline const char *ent_function(uint32_t function) return "S-Video connector"; case MEDIA_ENT_F_CONN_COMPOSITE: return "Composite connector"; - case MEDIA_ENT_F_CONN_TEST: - return "Test connector"; case MEDIA_ENT_F_IO_V4L: return "V4L I/O"; case MEDIA_ENT_F_IO_DTV: diff --git a/include/linux/media.h b/include/linux/media.h index 49a93fde8efe..d599f67bc02b 100644 --- a/include/linux/media.h +++ b/include/linux/media.h @@ -70,21 +70,11 @@ struct media_device_info { #define MEDIA_ENT_F_DTV_NET_DECAP (MEDIA_ENT_F_BASE + 4) /* - * Connectors - */ -/* It is a responsibility of the entity drivers to add connectors and links */ -#define MEDIA_ENT_F_CONN_RF (MEDIA_ENT_F_BASE + 21) -#define MEDIA_ENT_F_CONN_SVIDEO (MEDIA_ENT_F_BASE + 22) -#define MEDIA_ENT_F_CONN_COMPOSITE (MEDIA_ENT_F_BASE + 23) -/* For internal test signal generators and other debug connectors */ -#define MEDIA_ENT_F_CONN_TEST (MEDIA_ENT_F_BASE + 24) - -/* * I/O entities */ -#define MEDIA_ENT_F_IO_DTV (MEDIA_ENT_F_BASE + 31) -#define MEDIA_ENT_F_IO_VBI (MEDIA_ENT_F_BASE + 32) -#define MEDIA_ENT_F_IO_SWRADIO (MEDIA_ENT_F_BASE + 33) +#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) /* * Analog TV IF-PLL decoders @@ -92,8 +82,16 @@ struct media_device_info { * It is a responsibility of the master/bridge drivers to create links * for MEDIA_ENT_F_IF_VID_DECODER and MEDIA_ENT_F_IF_AUD_DECODER. */ -#define MEDIA_ENT_F_IF_VID_DECODER (MEDIA_ENT_F_BASE + 41) -#define MEDIA_ENT_F_IF_AUD_DECODER (MEDIA_ENT_F_BASE + 42) +#define MEDIA_ENT_F_IF_VID_DECODER (MEDIA_ENT_F_BASE + 2001) +#define MEDIA_ENT_F_IF_AUD_DECODER (MEDIA_ENT_F_BASE + 2002) + +/* + * 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) /* * Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
