From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from lists.s-osg.org ([54.187.51.154]:57955 "EHLO lists.s-osg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751097AbbEHM43 (ORCPT ); Fri, 8 May 2015 08:56:29 -0400 Date: Fri, 8 May 2015 09:56:24 -0300 From: Mauro Carvalho Chehab To: Hans Verkuil Cc: Linux Media Mailing List , Mauro Carvalho Chehab , Jonathan Corbet , linux-doc@vger.kernel.org, linux-api@vger.kernel.org Subject: Re: [PATCH 05/18] media controller: rename MEDIA_ENT_T_DEVNODE_DVB entities Message-ID: <20150508095624.4b3783d0@recife.lan> In-Reply-To: <554CA7C8.20505@xs4all.nl> References: <554CA7C8.20505@xs4all.nl> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-media-owner@vger.kernel.org List-ID: Em Fri, 08 May 2015 14:10:48 +0200 Hans Verkuil escreveu: > On 05/08/2015 03:12 AM, Mauro Carvalho Chehab wrote: > > In order to reflect that the entities are actually the hardware > > (or firmware, or in-kernel software), and are not associated > > with the DVB API, let's remove DEVNODE_ from the entity names > > and use DTV (Digital TV) for the entities. > > > > The frontend is an special case: the frontend devnode actually > > talks directly with the DTV demodulator. It may or may not also > > talk with the SEC (Satellite Equipment Control) and with the > > tuner. For the sake of unifying the nomenclature, let's call it > > as MEDIA_ENT_T_DTV_DEMOD, because this component is always > > there. > > > > So: > > > > MEDIA_ENT_T_DEVNODE_DVB_FE -> MEDIA_ENT_T_DTV_DEMOD > > MEDIA_ENT_T_DEVNODE_DVB_DEMUX -> MEDIA_ENT_T_DTV_DEMUX > > MEDIA_ENT_T_DEVNODE_DVB_DVR -> MEDIA_ENT_T_DTV_DVR > > MEDIA_ENT_T_DEVNODE_DVB_CA -> MEDIA_ENT_T_DTV_CA > > MEDIA_ENT_T_DEVNODE_DVB_NET -> MEDIA_ENT_T_DTV_NET > > I'm happy with the new names. > > > > > PS.: we could actually not keep this define: > > #define MEDIA_ENT_T_DEVNODE_DVB_FE MEDIA_ENT_T_DTV_DEMOD > > > > As MEDIA_ENT_T_DEVNODE_DVB_FE symbol will not arrive any Kernel > > version (being present only at the 4.1-rc kernels), but keeping > > it helps to show that the DVB frontend node is actually associated > > with the DTV demodulator. So, keeping it for now helps to better > > document. Also, it avoids to break experimental versions of v4l-utils. > > So, better to remove this only when we remove the remaining legacy > > stuff. > > I disagree with that. Let's not introduce defines that are not going to > be used. And v4l-utils is easily fixed. > > Instead of keeping an unused define, why not... We agree to disagree here ;) > > > > > Signed-off-by: Mauro Carvalho Chehab > > > > diff --git a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml > > index 759604e3529f..27082b07f4c2 100644 > > --- a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml > > +++ b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml > > @@ -195,23 +195,23 @@ > > ALSA card > > > > > > - MEDIA_ENT_T_DEVNODE_DVB_FE > > + MEDIA_ENT_T_DTV_DEMOD > > DVB frontend devnode > > ... explain what is going on here? I.e. that this frontend always controls a demod > and optionally also a tuner and/or SEC. I'm actually doing just the renames on those initial patches. There are some adjustments to be done at the documentation, not just that. So, I opted to do such adjustment on the last patch of this series. > > Regards, > > Hans > > > > > > > - MEDIA_ENT_T_DEVNODE_DVB_DEMUX > > + MEDIA_ENT_T_DTV_DEMUX > > DVB demux devnode > > > > > > - MEDIA_ENT_T_DEVNODE_DVB_DVR > > + MEDIA_ENT_T_DTV_DVR > > DVB DVR devnode > > > > > > - MEDIA_ENT_T_DEVNODE_DVB_CA > > + MEDIA_ENT_T_DTV_CA > > DVB CAM devnode > > > > > > - MEDIA_ENT_T_DEVNODE_DVB_NET > > + MEDIA_ENT_T_DTV_NET > > DVB network devnode > > > > > > diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c > > index 13bb57f0457f..39846077045e 100644 > > --- a/drivers/media/dvb-core/dvbdev.c > > +++ b/drivers/media/dvb-core/dvbdev.c > > @@ -221,26 +221,26 @@ static void dvb_register_media_device(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_DTV_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_DTV_DEMUX; > > dvbdev->pads[0].flags = MEDIA_PAD_FL_SINK; > > dvbdev->pads[1].flags = MEDIA_PAD_FL_SOURCE; > > break; > > case DVB_DEVICE_DVR: > > - dvbdev->entity->type = MEDIA_ENT_T_DEVNODE_DVB_DVR; > > + dvbdev->entity->type = MEDIA_ENT_T_DTV_DVR; > > dvbdev->pads[0].flags = MEDIA_PAD_FL_SINK; > > break; > > case DVB_DEVICE_CA: > > - dvbdev->entity->type = MEDIA_ENT_T_DEVNODE_DVB_CA; > > + dvbdev->entity->type = MEDIA_ENT_T_DTV_CA; > > dvbdev->pads[0].flags = MEDIA_PAD_FL_SINK; > > dvbdev->pads[1].flags = MEDIA_PAD_FL_SOURCE; > > break; > > case DVB_DEVICE_NET: > > - dvbdev->entity->type = MEDIA_ENT_T_DEVNODE_DVB_NET; > > + dvbdev->entity->type = MEDIA_ENT_T_DTV_NET; > > break; > > default: > > kfree(dvbdev->entity); > > @@ -396,16 +396,16 @@ 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: > > + case MEDIA_ENT_T_DTV_DEMOD: > > fe = entity; > > break; > > - case MEDIA_ENT_T_DEVNODE_DVB_DEMUX: > > + case MEDIA_ENT_T_DTV_DEMUX: > > demux = entity; > > break; > > - case MEDIA_ENT_T_DEVNODE_DVB_DVR: > > + case MEDIA_ENT_T_DTV_DVR: > > dvr = entity; > > break; > > - case MEDIA_ENT_T_DEVNODE_DVB_CA: > > + case MEDIA_ENT_T_DTV_CA: > > ca = entity; > > break; > > } > > diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h > > index 2e465ba087ba..0de9912411c5 100644 > > --- a/include/uapi/linux/media.h > > +++ b/include/uapi/linux/media.h > > @@ -45,11 +45,11 @@ struct media_device_info { > > /* Used values for media_entity_desc::type */ > > > > #define MEDIA_ENT_T_AV_DMA (((1 << 16)) + 1) > > -#define MEDIA_ENT_T_DEVNODE_DVB_FE (MEDIA_ENT_T_AV_DMA + 3) > > -#define MEDIA_ENT_T_DEVNODE_DVB_DEMUX (MEDIA_ENT_T_AV_DMA + 4) > > -#define MEDIA_ENT_T_DEVNODE_DVB_DVR (MEDIA_ENT_T_AV_DMA + 5) > > -#define MEDIA_ENT_T_DEVNODE_DVB_CA (MEDIA_ENT_T_AV_DMA + 6) > > -#define MEDIA_ENT_T_DEVNODE_DVB_NET (MEDIA_ENT_T_AV_DMA + 7) > > +#define MEDIA_ENT_T_DTV_DEMOD (MEDIA_ENT_T_AV_DMA + 3) > > +#define MEDIA_ENT_T_DTV_DEMUX (MEDIA_ENT_T_AV_DMA + 4) > > +#define MEDIA_ENT_T_DTV_DVR (MEDIA_ENT_T_AV_DMA + 5) > > +#define MEDIA_ENT_T_DTV_CA (MEDIA_ENT_T_AV_DMA + 6) > > +#define MEDIA_ENT_T_DTV_NET (MEDIA_ENT_T_AV_DMA + 7) > > > > #define MEDIA_ENT_T_CAM_SENSOR ((2 << 16) + 1) > > #define MEDIA_ENT_T_CAM_FLASH (MEDIA_ENT_T_CAM_SENSOR + 1) > > @@ -76,7 +76,13 @@ 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_DVB_FE > > +#define MEDIA_ENT_T_DEVNODE_DVB MEDIA_ENT_T_DTV_DEMOD > > +#define MEDIA_ENT_T_DEVNODE_DVB_FE MEDIA_ENT_T_DTV_DEMOD > > +#define MEDIA_ENT_T_DEVNODE_DVB_DEMUX MEDIA_ENT_T_DTV_DEMUX > > +#define MEDIA_ENT_T_DEVNODE_DVB_DVR MEDIA_ENT_T_DTV_DVR > > +#define MEDIA_ENT_T_DEVNODE_DVB_CA MEDIA_ENT_T_DTV_CA > > +#define MEDIA_ENT_T_DEVNODE_DVB_NET MEDIA_ENT_T_DTV_NET > > + > > #define MEDIA_ENT_T_V4L2_SUBDEV_SENSOR MEDIA_ENT_T_CAM_SENSOR > > #define MEDIA_ENT_T_V4L2_SUBDEV_FLASH MEDIA_ENT_T_CAM_FLASH > > #define MEDIA_ENT_T_V4L2_SUBDEV_LENS MEDIA_ENT_T_CAM_LENS > > >