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: Revert "libmediactl: add support for the new DVB devnodes" Author: Mauro Carvalho Chehab <[email protected]> Date: Sun Aug 23 16:33:25 2015 -0300 We ended by discontinuing devnode support at entity, and decided to use a different mapping for DVB. Also, the change added at libmediactl is for the current MC DVB stuff, marked as BROKEN on the Kernel, as we decided in favor of remanufacturing the entire Media Controller support using a different approach ("MC next generation"), with makes the changes there obsolete. As we're about to release a version 1.8.0 of v4l-utils, revert this patch. A latter change, at 1.9.x series, will be adding support for MC next generation. Please notice that the changes at libmediactl to get the /dev from the sysfs information for DVB is independent, and it is OK with the next gen. So, it won't be reverted. This reverts commit 59c3c11afef4e4a14fb559529dc4456dec17d2ee. Signed-off-by: Mauro Carvalho Chehab <[email protected]> utils/media-ctl/libmediactl.c | 18 +++--------------- utils/media-ctl/media-ctl.c | 6 +----- utils/media-ctl/mediactl.h | 6 +----- 3 files changed, 5 insertions(+), 25 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=38cc1d30bacf48322ce55a99b445b2bcfbeac176 diff --git a/utils/media-ctl/libmediactl.c b/utils/media-ctl/libmediactl.c index dce8eeb..4a82d24 100644 --- a/utils/media-ctl/libmediactl.c +++ b/utils/media-ctl/libmediactl.c @@ -155,11 +155,7 @@ struct media_entity *media_get_default_entity(struct media_device *media, return media->def.fb; case MEDIA_ENT_T_DEVNODE_ALSA: return media->def.alsa; - case MEDIA_ENT_T_DEVNODE_DVB_FE: - case MEDIA_ENT_T_DEVNODE_DVB_DEMUX: - case MEDIA_ENT_T_DEVNODE_DVB_DVR: - case MEDIA_ENT_T_DEVNODE_DVB_CA: - case MEDIA_ENT_T_DEVNODE_DVB_NET: + case MEDIA_ENT_T_DEVNODE_DVB: return media->def.dvb; } @@ -565,11 +561,7 @@ static int media_enum_entities(struct media_device *media) case MEDIA_ENT_T_DEVNODE_ALSA: media->def.alsa = entity; break; - case MEDIA_ENT_T_DEVNODE_DVB_FE: - case MEDIA_ENT_T_DEVNODE_DVB_DEMUX: - case MEDIA_ENT_T_DEVNODE_DVB_DVR: - case MEDIA_ENT_T_DEVNODE_DVB_CA: - case MEDIA_ENT_T_DEVNODE_DVB_NET: + case MEDIA_ENT_T_DEVNODE_DVB: media->def.dvb = entity; break; } @@ -778,11 +770,7 @@ int media_device_add_entity(struct media_device *media, defent = &media->def.alsa; entity->info.alsa = desc->alsa; break; - case MEDIA_ENT_T_DEVNODE_DVB_FE: - case MEDIA_ENT_T_DEVNODE_DVB_DEMUX: - case MEDIA_ENT_T_DEVNODE_DVB_DVR: - case MEDIA_ENT_T_DEVNODE_DVB_CA: - case MEDIA_ENT_T_DEVNODE_DVB_NET: + case MEDIA_ENT_T_DEVNODE_DVB: defent = &media->def.dvb; entity->info.dvb = desc->dvb; break; diff --git a/utils/media-ctl/media-ctl.c b/utils/media-ctl/media-ctl.c index 602486f..d3f6e04 100644 --- a/utils/media-ctl/media-ctl.c +++ b/utils/media-ctl/media-ctl.c @@ -285,11 +285,7 @@ static const char *media_entity_subtype_to_string(unsigned type) "V4L", "FB", "ALSA", - "DVB FE", - "DVB DEMUX", - "DVB DVR", - "DVB CA", - "DVB NET", + "DVB", }; static const char *subdev_types[] = { "Unknown", diff --git a/utils/media-ctl/mediactl.h b/utils/media-ctl/mediactl.h index 03d9f70..77ac182 100644 --- a/utils/media-ctl/mediactl.h +++ b/utils/media-ctl/mediactl.h @@ -306,11 +306,7 @@ struct media_entity *media_get_entity(struct media_device *media, unsigned int i * MEDIA_ENT_T_DEVNODE_V4L * MEDIA_ENT_T_DEVNODE_FB * MEDIA_ENT_T_DEVNODE_ALSA - * MEDIA_ENT_T_DEVNODE_DVB_FE - * MEDIA_ENT_T_DEVNODE_DVB_DEMUX - * MEDIA_ENT_T_DEVNODE_DVB_DVR - * MEDIA_ENT_T_DEVNODE_DVB_CA - * MEDIA_ENT_T_DEVNODE_DVB_NET + * MEDIA_ENT_T_DEVNODE_DVB * * @return A pointer to the default entity for the type if it exists, or NULL * otherwise. _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
