Re: [PATCH v8 41/55] [media] DocBook: update descriptions for the media controller entities

[Mauro Carvalho Chehab]

Em Sun, 06 Dec 2015 03:00:57 +0200
Laurent Pinchart  escreveu:

> Hello,
> 
> On Friday 11 September 2015 15:13:30 Hans Verkuil wrote:
> > On 09/06/2015 02:03 PM, Mauro Carvalho Chehab wrote:
> > > Cleanup the media controller entities description:
> > > - remove MEDIA_ENT_T_DEVNODE and MEDIA_ENT_T_V4L2_SUBDEV entity
> > >   types, as they don't mean anything;
> > > - add MEDIA_ENT_T_UNKNOWN with a proper description;
> > > - remove ALSA and FB entity types. Those should not be used, as
> > >   the types are deprecated. We'll soon be adidng ALSA, but with
> > >   a different entity namespace;
> > > - improve the description of some entities.
> > > 
> > > 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
> > > 32a783635649..bc101516e372 100644
> > > --- a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
> > > +++ b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
> > > @@ -179,70 +179,65 @@
> > >  
> > >   
> > > 
> > > - MEDIA_ENT_T_DEVNODE
> > > - Unknown device node
> > > + MEDIA_ENT_T_UNKNOWN and
> > > MEDIA_ENT_T_V4L2_SUBDEV_UNKNOWN +   
> > > Unknown entity. That generally indicates that
> > > + a driver didn't initialize properly the entity, with is a Kernel
> > > bug> 
> > > 
> > 
> > I'm wondering: if userspace should never see an unknown entity, wouldn't it
> > be better to move these UNKNOWN defines out of the public header to a kernel
> > header and drop this from the documentation?
> 
> And shouldn't the bug be caught in kernelspace before it reaches the user ?

I don't like the idea of moving this to a Kernel header.

Yes, ideally, the user should never saw this, but IMHO, programs
should address this somehow, instead of simply crashing if such value
is found. Also, keeping this at documentation helps to inform developers
that this value is invalid and should never be present on any driver.

It should be noticed that getting rid of MEDIA_ENT_T_V4L2_SUBDEV_UNKNOWN
is not easy, and should be addressed on a separate patchset. It
requires each driver maintainer to check and fix the non-initialized
subdevices, and add new definitions at the public header. This will take
a while, and such work is independent on the actual MC next gen
patch series.

So, better to keep it documented there, at least while we're not
able to enforce the Kernel do do a BUG_ON() or something similar
if a driver doesn't fill the entity type/function.

> 
> > > 
> > >   MEDIA_ENT_T_V4L2_VIDEO
> > > - V4L video, radio or vbi device node
> > > + V4L video streaming input or output entity
> > > 
> > > -   
> > > - MEDIA_ENT_T_DEVNODE_FB
> > > - Frame buffer device node
> > > + MEDIA_ENT_T_V4L2_VBI
> > > + V4L VBI streaming input or output entity
> > > 
> > > -   
> > > - MEDIA_ENT_T_DEVNODE_ALSA
> > > - ALSA card
> > > + MEDIA_ENT_T_V4L2_SWRADIO
> > > + V4L Sofware Digital Radio (SDR) streaming input or output
> > > entity
> >
> > s/Sofware/Software/
> > 
> > > 
> > > 
> > >   MEDIA_ENT_T_DVB_DEMOD
> > > - DVB frontend devnode
> > > + DVB demodulator entity
> > > 
> > > 
> > >   MEDIA_ENT_T_DVB_DEMUX
> > > - DVB demux devnode
> > > + DVB demux entity. Could be implemented on hardware or in
> > > Kernelspace
> 
> s/Could be/Can be/
> 
> > s/on/in/
> > 
> > > 
> > > 
> > >   MEDIA_ENT_T_DVB_TSOUT
> > > - DVB DVR devnode
> > > + DVB Transport Stream output entity
> > > 
> > > 
> > >   MEDIA_ENT_T_DVB_CA
> > > - DVB CAM devnode
> > > + DVB Conditional Access module (CAM) entity
> > > 
> > > 
> > >   
> MEDIA_ENT_T_DVB_DEMOD_NET_DECAP
> > > - DVB network devnode
> > > -   
> > > -   
> > > - MEDIA_ENT_T_V4L2_SUBDEV
> > > - Unknown V4L sub-device
> > > + DVB network ULE/MLE desencapsulation entity. Could be
> > > implemented on hardware or in Kernelspace
> 
> s/Could be/Can be/
> 
> > s/on/in/
> > 
> > Hmm, is desencapsulation correct? Could it be 'de-encapsulation' instead? It
> > looks weird.
> >
> > > 
> > > 
> > >   
> MEDIA_ENT_T_V4L2_SUBDEV_SENSOR
> > > - Video sensor
> > > + Camera video sensor entity
> 
> s/video sensor/image sensor/
> 
> > > 
> > > 
> > >   MEDIA_ENT_T_V4L2_SUBDEV_FLASH
> > > - Flash controller
> > > + Flash controller entity
> > > 
> > > 
> > >   MEDIA_ENT_T_V4L2_SUBDEV_LENS
> > > - Lens controller
> > > + Lens controller entity
> > > 
> > > 
> > >   
> MEDIA_ENT_T_V4L2_SUBDEV_DECODER
> > > - Video decoder, the basic function of the video decoder is 
> to
> > > - accept analogue video from a wide variety of sources such as
> > > + Analog video decoder, the basic function of the video 
> decoder
> > > + 

Re: [PATCH v8 41/55] [media] DocBook: update descriptions for the media controller entities

[Laurent Pinchart]

Hello,

On Friday 11 September 2015 15:13:30 Hans Verkuil wrote:
> On 09/06/2015 02:03 PM, Mauro Carvalho Chehab wrote:
> > Cleanup the media controller entities description:
> > - remove MEDIA_ENT_T_DEVNODE and MEDIA_ENT_T_V4L2_SUBDEV entity
> >   types, as they don't mean anything;
> > - add MEDIA_ENT_T_UNKNOWN with a proper description;
> > - remove ALSA and FB entity types. Those should not be used, as
> >   the types are deprecated. We'll soon be adidng ALSA, but with
> >   a different entity namespace;
> > - improve the description of some entities.
> > 
> > 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
> > 32a783635649..bc101516e372 100644
> > --- a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
> > +++ b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
> > @@ -179,70 +179,65 @@
> >  
> > 
> >   
> > -   MEDIA_ENT_T_DEVNODE
> > -   Unknown device node
> > +   MEDIA_ENT_T_UNKNOWN and
> > MEDIA_ENT_T_V4L2_SUBDEV_UNKNOWN + 
> > Unknown entity. That generally indicates that
> > +   a driver didn't initialize properly the entity, with is a Kernel
> > bug> 
> >   
> 
> I'm wondering: if userspace should never see an unknown entity, wouldn't it
> be better to move these UNKNOWN defines out of the public header to a kernel
> header and drop this from the documentation?

And shouldn't the bug be caught in kernelspace before it reaches the user ?

> >   
> > MEDIA_ENT_T_V4L2_VIDEO
> > -   V4L video, radio or vbi device node
> > +   V4L video streaming input or output entity
> >   
> > - 
> > -   MEDIA_ENT_T_DEVNODE_FB
> > -   Frame buffer device node
> > +   MEDIA_ENT_T_V4L2_VBI
> > +   V4L VBI streaming input or output entity
> >   
> > - 
> > -   MEDIA_ENT_T_DEVNODE_ALSA
> > -   ALSA card
> > +   MEDIA_ENT_T_V4L2_SWRADIO
> > +   V4L Sofware Digital Radio (SDR) streaming input or output
> > entity
>
> s/Sofware/Software/
> 
> >   
> >   
> > MEDIA_ENT_T_DVB_DEMOD
> > -   DVB frontend devnode
> > +   DVB demodulator entity
> >   
> >   
> > MEDIA_ENT_T_DVB_DEMUX
> > -   DVB demux devnode
> > +   DVB demux entity. Could be implemented on hardware or in
> > Kernelspace

s/Could be/Can be/

> s/on/in/
> 
> >   
> >   
> > MEDIA_ENT_T_DVB_TSOUT
> > -   DVB DVR devnode
> > +   DVB Transport Stream output entity
> >   
> >   
> > MEDIA_ENT_T_DVB_CA
> > -   DVB CAM devnode
> > +   DVB Conditional Access module (CAM) entity
> >   
> >   
> > 
MEDIA_ENT_T_DVB_DEMOD_NET_DECAP
> > -   DVB network devnode
> > - 
> > - 
> > -   MEDIA_ENT_T_V4L2_SUBDEV
> > -   Unknown V4L sub-device
> > +   DVB network ULE/MLE desencapsulation entity. Could be
> > implemented on hardware or in Kernelspace

s/Could be/Can be/

> s/on/in/
> 
> Hmm, is desencapsulation correct? Could it be 'de-encapsulation' instead? It
> looks weird.
>
> >   
> >   
> > 
MEDIA_ENT_T_V4L2_SUBDEV_SENSOR
> > -   Video sensor
> > +   Camera video sensor entity

s/video sensor/image sensor/

> >   
> >   
> > MEDIA_ENT_T_V4L2_SUBDEV_FLASH
> > -   Flash controller
> > +   Flash controller entity
> >   
> >   
> > MEDIA_ENT_T_V4L2_SUBDEV_LENS
> > -   Lens controller
> > +   Lens controller entity
> >   
> >   
> > 
MEDIA_ENT_T_V4L2_SUBDEV_DECODER
> > -   Video decoder, the basic function of the video decoder is 
to
> > -   accept analogue video from a wide variety of sources such as
> > +   Analog video decoder, the basic function of the video 
decoder
> > +   is to accept analogue video from a wide variety of sources such 
as
> > broadcast, DVD players, cameras and video cassette recorders, in
> > -   either NTSC, PAL or HD format and still occasionally SECAM, 
separate
> > -   it into its component parts, luminance and chrominance, and 
output
> > +   either NTSC, PAL, SECAM or HD format, separating the stream
> > +   into its component parts, luminance and chrominance, and output
> > it in some digital video standard, with appropriate embedded 
timing
> > signals.

Does timing signals refer to synchronization signals ? They don't have to be 
embedded, do they ?

> >   
> >   
> > MEDIA_ENT_T_V4L2_SUBDEV_TUNER
> > -   TV and/or radio tuner
> > +   Digital TV, analog TV, radio and/or software radio
> > tuner> 
> >   
> > 
> >

-- 
Regards,

Laurent Pinchart

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  

Re: [PATCH v8 41/55] [media] DocBook: update descriptions for the media controller entities

[Hans Verkuil]

On 09/06/2015 02:03 PM, Mauro Carvalho Chehab wrote:
> Cleanup the media controller entities description:
> - remove MEDIA_ENT_T_DEVNODE and MEDIA_ENT_T_V4L2_SUBDEV entity
>   types, as they don't mean anything;
> - add MEDIA_ENT_T_UNKNOWN with a proper description;
> - remove ALSA and FB entity types. Those should not be used, as
>   the types are deprecated. We'll soon be adidng ALSA, but with
>   a different entity namespace;
> - improve the description of some entities.
> 
> 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 32a783635649..bc101516e372 100644
> --- a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
> +++ b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
> @@ -179,70 +179,65 @@
>  
>   
> 
> - MEDIA_ENT_T_DEVNODE
> - Unknown device node
> + MEDIA_ENT_T_UNKNOWN and 
> MEDIA_ENT_T_V4L2_SUBDEV_UNKNOWN
> + Unknown entity. That generally indicates that
> + a driver didn't initialize properly the entity, with is a Kernel 
> bug
> 

I'm wondering: if userspace should never see an unknown entity, wouldn't it
be better to move these UNKNOWN defines out of the public header to a kernel
header and drop this from the documentation?

> 
>   MEDIA_ENT_T_V4L2_VIDEO
> - V4L video, radio or vbi device node
> + V4L video streaming input or output entity
> 
> -   
> - MEDIA_ENT_T_DEVNODE_FB
> - Frame buffer device node
> + MEDIA_ENT_T_V4L2_VBI
> + V4L VBI streaming input or output entity
> 
> -   
> - MEDIA_ENT_T_DEVNODE_ALSA
> - ALSA card
> + MEDIA_ENT_T_V4L2_SWRADIO
> + V4L Sofware Digital Radio (SDR) streaming input or output 
> entity

s/Sofware/Software/

> 
> 
>   MEDIA_ENT_T_DVB_DEMOD
> - DVB frontend devnode
> + DVB demodulator entity
> 
> 
>   MEDIA_ENT_T_DVB_DEMUX
> - DVB demux devnode
> + DVB demux entity. Could be implemented on hardware or in 
> Kernelspace

s/on/in/

> 
> 
>   MEDIA_ENT_T_DVB_TSOUT
> - DVB DVR devnode
> + DVB Transport Stream output entity
> 
> 
>   MEDIA_ENT_T_DVB_CA
> - DVB CAM devnode
> + DVB Conditional Access module (CAM) entity
> 
> 
>   MEDIA_ENT_T_DVB_DEMOD_NET_DECAP
> - DVB network devnode
> -   
> -   
> - MEDIA_ENT_T_V4L2_SUBDEV
> - Unknown V4L sub-device
> + DVB network ULE/MLE desencapsulation entity. Could be 
> implemented on hardware or in Kernelspace

s/on/in/

Hmm, is desencapsulation correct? Could it be 'de-encapsulation' instead? It 
looks weird.

> 
> 
>   MEDIA_ENT_T_V4L2_SUBDEV_SENSOR
> - Video sensor
> + Camera video sensor entity
> 
> 
>   MEDIA_ENT_T_V4L2_SUBDEV_FLASH
> - Flash controller
> + Flash controller entity
> 
> 
>   MEDIA_ENT_T_V4L2_SUBDEV_LENS
> - Lens controller
> + Lens controller entity
> 
> 
>   MEDIA_ENT_T_V4L2_SUBDEV_DECODER
> - Video decoder, the basic function of the video decoder is to
> - accept analogue video from a wide variety of sources such as
> + Analog video decoder, the basic function of the video decoder
> + is to accept analogue video from a wide variety of sources such as
>   broadcast, DVD players, cameras and video cassette recorders, in
> - either NTSC, PAL or HD format and still occasionally SECAM, separate
> - it into its component parts, luminance and chrominance, and output
> + either NTSC, PAL, SECAM or HD format, separating the stream
> + into its component parts, luminance and chrominance, and output
>   it in some digital video standard, with appropriate embedded timing
>   signals.
> 
> 
>   MEDIA_ENT_T_V4L2_SUBDEV_TUNER
> - TV and/or radio tuner
> + Digital TV, analog TV, radio and/or software radio 
> tuner
> 
>   
>
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v8 41/55] [media] DocBook: update descriptions for the media controller entities

[Mauro Carvalho Chehab]

Cleanup the media controller entities description:
- remove MEDIA_ENT_T_DEVNODE and MEDIA_ENT_T_V4L2_SUBDEV entity
  types, as they don't mean anything;
- add MEDIA_ENT_T_UNKNOWN with a proper description;
- remove ALSA and FB entity types. Those should not be used, as
  the types are deprecated. We'll soon be adidng ALSA, but with
  a different entity namespace;
- improve the description of some entities.

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 32a783635649..bc101516e372 100644
--- a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
+++ b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
@@ -179,70 +179,65 @@
 

  
-   MEDIA_ENT_T_DEVNODE
-   Unknown device node
+   MEDIA_ENT_T_UNKNOWN and 
MEDIA_ENT_T_V4L2_SUBDEV_UNKNOWN
+   Unknown entity. That generally indicates that
+   a driver didn't initialize properly the entity, with is a Kernel 
bug
  
  
MEDIA_ENT_T_V4L2_VIDEO
-   V4L video, radio or vbi device node
+   V4L video streaming input or output entity
  
- 
-   MEDIA_ENT_T_DEVNODE_FB
-   Frame buffer device node
+   MEDIA_ENT_T_V4L2_VBI
+   V4L VBI streaming input or output entity
  
- 
-   MEDIA_ENT_T_DEVNODE_ALSA
-   ALSA card
+   MEDIA_ENT_T_V4L2_SWRADIO
+   V4L Sofware Digital Radio (SDR) streaming input or output 
entity
  
  
MEDIA_ENT_T_DVB_DEMOD
-   DVB frontend devnode
+   DVB demodulator entity
  
  
MEDIA_ENT_T_DVB_DEMUX
-   DVB demux devnode
+   DVB demux entity. Could be implemented on hardware or in 
Kernelspace
  
  
MEDIA_ENT_T_DVB_TSOUT
-   DVB DVR devnode
+   DVB Transport Stream output entity
  
  
MEDIA_ENT_T_DVB_CA
-   DVB CAM devnode
+   DVB Conditional Access module (CAM) entity
  
  
MEDIA_ENT_T_DVB_DEMOD_NET_DECAP
-   DVB network devnode
- 
- 
-   MEDIA_ENT_T_V4L2_SUBDEV
-   Unknown V4L sub-device
+   DVB network ULE/MLE desencapsulation entity. Could be 
implemented on hardware or in Kernelspace
  
  
MEDIA_ENT_T_V4L2_SUBDEV_SENSOR
-   Video sensor
+   Camera video sensor entity
  
  
MEDIA_ENT_T_V4L2_SUBDEV_FLASH
-   Flash controller
+   Flash controller entity
  
  
MEDIA_ENT_T_V4L2_SUBDEV_LENS
-   Lens controller
+   Lens controller entity
  
  
MEDIA_ENT_T_V4L2_SUBDEV_DECODER
-   Video decoder, the basic function of the video decoder is to
-   accept analogue video from a wide variety of sources such as
+   Analog video decoder, the basic function of the video decoder
+   is to accept analogue video from a wide variety of sources such as
broadcast, DVD players, cameras and video cassette recorders, in
-   either NTSC, PAL or HD format and still occasionally SECAM, separate
-   it into its component parts, luminance and chrominance, and output
+   either NTSC, PAL, SECAM or HD format, separating the stream
+   into its component parts, luminance and chrominance, and output
it in some digital video standard, with appropriate embedded timing
signals.
  
  
MEDIA_ENT_T_V4L2_SUBDEV_TUNER
-   TV and/or radio tuner
+   Digital TV, analog TV, radio and/or software radio 
tuner
  

   
-- 
2.4.3


--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v8 41/55] [media] DocBook: update descriptions for the media controller entities

[Hans Verkuil]

On 08/30/2015 05:06 AM, Mauro Carvalho Chehab wrote:
> Cleanup the media controller entities description:
> - remove MEDIA_ENT_T_DEVNODE and MEDIA_ENT_T_V4L2_SUBDEV entity
>   types, as they don't mean anything;

Shouldn't this add MEDIA_ENT_T_V4L2_VBI and _SWRADIO descriptions?

Regards,

Hans

> - add MEDIA_ENT_T_UNKNOWN with a proper description;
> - remove ALSA and FB entity types. Those should not be used, as
>   the types are deprecated. We'll soon be adidng ALSA, but with
>   a different entity namespace;
> - improve the description of some entities.
> 
> 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 32a783635649..bd90dde54416 100644
> --- a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
> +++ b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
> @@ -179,70 +179,59 @@
>  
>   
> 
> - MEDIA_ENT_T_DEVNODE
> - Unknown device node
> + MEDIA_ENT_T_UNKNOWN and 
> MEDIA_ENT_T_V4L2_SUBDEV_UNKNOWN
> + Unknown entity. That generally indicates that
> + a driver didn't initialize properly the entity, with is a Kernel 
> bug
> 
> 
>   MEDIA_ENT_T_V4L2_VIDEO
> - V4L video, radio or vbi device node
> -   
> -   
> - MEDIA_ENT_T_DEVNODE_FB
> - Frame buffer device node
> -   
> -   
> - MEDIA_ENT_T_DEVNODE_ALSA
> - ALSA card
> + V4L video streaming input or output entity
> 
> 
>   MEDIA_ENT_T_DVB_DEMOD
> - DVB frontend devnode
> + DVB demodulator entity
> 
> 
>   MEDIA_ENT_T_DVB_DEMUX
> - DVB demux devnode
> + DVB demux entity. Could be implemented on hardware or in 
> Kernelspace
> 
> 
>   MEDIA_ENT_T_DVB_TSOUT
> - DVB DVR devnode
> + DVB Transport Stream output entity
> 
> 
>   MEDIA_ENT_T_DVB_CA
> - DVB CAM devnode
> + DVB Conditional Access module (CAM) entity
> 
> 
>   MEDIA_ENT_T_DVB_DEMOD_NET_DECAP
> - DVB network devnode
> -   
> -   
> - MEDIA_ENT_T_V4L2_SUBDEV
> - Unknown V4L sub-device
> + DVB network ULE/MLE desencapsulation entity. Could be 
> implemented on hardware or in Kernelspace
> 
> 
>   MEDIA_ENT_T_V4L2_SUBDEV_SENSOR
> - Video sensor
> + Camera video sensor entity
> 
> 
>   MEDIA_ENT_T_V4L2_SUBDEV_FLASH
> - Flash controller
> + Flash controller entity
> 
> 
>   MEDIA_ENT_T_V4L2_SUBDEV_LENS
> - Lens controller
> + Lens controller entity
> 
> 
>   MEDIA_ENT_T_V4L2_SUBDEV_DECODER
> - Video decoder, the basic function of the video decoder is to
> - accept analogue video from a wide variety of sources such as
> + Analog video decoder, the basic function of the video decoder
> + is to accept analogue video from a wide variety of sources such as
>   broadcast, DVD players, cameras and video cassette recorders, in
> - either NTSC, PAL or HD format and still occasionally SECAM, separate
> - it into its component parts, luminance and chrominance, and output
> + either NTSC, PAL, SECAM or HD format, separating the stream
> + into its component parts, luminance and chrominance, and output
>   it in some digital video standard, with appropriate embedded timing
>   signals.
> 
> 
>   MEDIA_ENT_T_V4L2_SUBDEV_TUNER
> - TV and/or radio tuner
> + Digital TV, analog TV, radio and/or software radio 
> tuner
> 
>   
>
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v8 41/55] [media] DocBook: update descriptions for the media controller entities

[Mauro Carvalho Chehab]

Cleanup the media controller entities description:
- remove MEDIA_ENT_T_DEVNODE and MEDIA_ENT_T_V4L2_SUBDEV entity
  types, as they don't mean anything;
- add MEDIA_ENT_T_UNKNOWN with a proper description;
- remove ALSA and FB entity types. Those should not be used, as
  the types are deprecated. We'll soon be adidng ALSA, but with
  a different entity namespace;
- improve the description of some entities.

Signed-off-by: Mauro Carvalho Chehab mche...@osg.samsung.com

diff --git a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml 
b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
index 32a783635649..bd90dde54416 100644
--- a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
+++ b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
@@ -179,70 +179,59 @@
 colspec colname=c2/
tbody valign=top
  row
-   entryconstantMEDIA_ENT_T_DEVNODE/constant/entry
-   entryUnknown device node/entry
+   entryconstantMEDIA_ENT_T_UNKNOWN/constant and 
constantMEDIA_ENT_T_V4L2_SUBDEV_UNKNOWN/constant/entry
+   entryUnknown entity. That generally indicates that
+   a driver didn't initialize properly the entity, with is a Kernel 
bug/entry
  /row
  row
entryconstantMEDIA_ENT_T_V4L2_VIDEO/constant/entry
-   entryV4L video, radio or vbi device node/entry
- /row
- row
-   entryconstantMEDIA_ENT_T_DEVNODE_FB/constant/entry
-   entryFrame buffer device node/entry
- /row
- row
-   entryconstantMEDIA_ENT_T_DEVNODE_ALSA/constant/entry
-   entryALSA card/entry
+   entryV4L video streaming input or output entity/entry
  /row
  row
entryconstantMEDIA_ENT_T_DVB_DEMOD/constant/entry
-   entryDVB frontend devnode/entry
+   entryDVB demodulator entity/entry
  /row
  row
entryconstantMEDIA_ENT_T_DVB_DEMUX/constant/entry
-   entryDVB demux devnode/entry
+   entryDVB demux entity. Could be implemented on hardware or in 
Kernelspace/entry
  /row
  row
entryconstantMEDIA_ENT_T_DVB_TSOUT/constant/entry
-   entryDVB DVR devnode/entry
+   entryDVB Transport Stream output entity/entry
  /row
  row
entryconstantMEDIA_ENT_T_DVB_CA/constant/entry
-   entryDVB CAM devnode/entry
+   entryDVB Conditional Access module (CAM) entity/entry
  /row
  row
entryconstantMEDIA_ENT_T_DVB_DEMOD_NET_DECAP/constant/entry
-   entryDVB network devnode/entry
- /row
- row
-   entryconstantMEDIA_ENT_T_V4L2_SUBDEV/constant/entry
-   entryUnknown V4L sub-device/entry
+   entryDVB network ULE/MLE desencapsulation entity. Could be 
implemented on hardware or in Kernelspace/entry
  /row
  row
entryconstantMEDIA_ENT_T_V4L2_SUBDEV_SENSOR/constant/entry
-   entryVideo sensor/entry
+   entryCamera video sensor entity/entry
  /row
  row
entryconstantMEDIA_ENT_T_V4L2_SUBDEV_FLASH/constant/entry
-   entryFlash controller/entry
+   entryFlash controller entity/entry
  /row
  row
entryconstantMEDIA_ENT_T_V4L2_SUBDEV_LENS/constant/entry
-   entryLens controller/entry
+   entryLens controller entity/entry
  /row
  row
entryconstantMEDIA_ENT_T_V4L2_SUBDEV_DECODER/constant/entry
-   entryVideo decoder, the basic function of the video decoder is to
-   accept analogue video from a wide variety of sources such as
+   entryAnalog video decoder, the basic function of the video decoder
+   is to accept analogue video from a wide variety of sources such as
broadcast, DVD players, cameras and video cassette recorders, in
-   either NTSC, PAL or HD format and still occasionally SECAM, separate
-   it into its component parts, luminance and chrominance, and output
+   either NTSC, PAL, SECAM or HD format, separating the stream
+   into its component parts, luminance and chrominance, and output
it in some digital video standard, with appropriate embedded timing
signals./entry
  /row
  row
entryconstantMEDIA_ENT_T_V4L2_SUBDEV_TUNER/constant/entry
-   entryTV and/or radio tuner/entry
+   entryDigital TV, analog TV, radio and/or software radio 
tuner/entry
  /row
/tbody
   /tgroup
-- 
2.4.3

--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html