[media] DocBook: update entities documentation

Due to the rename, the documentation became outdated.

Update it to reflect what's there at media.h.

Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@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 13d0b5891fb7610e632a088ede5114544e20b5f1..27f8817e7abe96c39e1cbc4f8fff74cd82561b0f 100644 (file)
--- a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
+++ b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
@@ -179,56 +179,72 @@
         <colspec colname="c2"/>
        <tbody valign="top">
          <row>
-           <entry><constant>MEDIA_ENT_T_UNKNOWN</constant> and <constant>MEDIA_ENT_T_V4L2_SUBDEV_UNKNOWN</constant></entry>
+           <entry><constant>MEDIA_ENT_F_UNKNOWN</constant> and <constant>MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN</constant></entry>
            <entry>Unknown entity. That generally indicates that
            a driver didn't initialize properly the entity, with is a Kernel bug</entry>
          </row>
          <row>
-           <entry><constant>MEDIA_ENT_T_V4L2_VIDEO</constant></entry>
-           <entry>V4L video streaming input or output entity</entry>
+           <entry><constant>MEDIA_ENT_F_IO_V4L</constant></entry>
+           <entry>Data streaming input and/or output entity.</entry>
          </row>
          <row>
-           <entry><constant>MEDIA_ENT_T_V4L2_VBI</constant></entry>
+           <entry><constant>MEDIA_ENT_F_IO_VBI</constant></entry>
            <entry>V4L VBI streaming input or output entity</entry>
          </row>
          <row>
-           <entry><constant>MEDIA_ENT_T_V4L2_SWRADIO</constant></entry>
+           <entry><constant>MEDIA_ENT_F_IO_SWRADIO</constant></entry>
            <entry>V4L Software Digital Radio (SDR) streaming input or output entity</entry>
          </row>
          <row>
-           <entry><constant>MEDIA_ENT_T_DVB_DEMOD</constant></entry>
-           <entry>DVB demodulator entity</entry>
+           <entry><constant>MEDIA_ENT_F_IO_DTV</constant></entry>
+           <entry>DVB Digital TV streaming input or output entity</entry>
          </row>
          <row>
-           <entry><constant>MEDIA_ENT_T_DVB_DEMUX</constant></entry>
-           <entry>DVB demux entity. Can be implemented in hardware or in Kernelspace</entry>
+           <entry><constant>MEDIA_ENT_F_DTV_DEMOD</constant></entry>
+           <entry>Digital TV demodulator entity.</entry>
          </row>
          <row>
-           <entry><constant>MEDIA_ENT_T_DVB_TSOUT</constant></entry>
-           <entry>DVB Transport Stream output entity</entry>
+           <entry><constant>MEDIA_ENT_F_MPEG_TS_DEMUX</constant></entry>
+           <entry>MPEG Transport stream demux entity. Could be implemented on hardware or in Kernelspace by the Linux DVB subsystem.</entry>
          </row>
          <row>
-           <entry><constant>MEDIA_ENT_T_DVB_CA</constant></entry>
-           <entry>DVB Conditional Access module (CAM) entity</entry>
+           <entry><constant>MEDIA_ENT_F_DTV_CA</constant></entry>
+           <entry>Digital TV Conditional Access module (CAM) entity</entry>
          </row>
          <row>
-           <entry><constant>MEDIA_ENT_T_DVB_DEMOD_NET_DECAP</constant></entry>
-           <entry>DVB network ULE/MLE de-encapsulation entity. Can be implemented in hardware or in Kernelspace</entry>
+           <entry><constant>MEDIA_ENT_F_DTV_NET_DECAP</constant></entry>
+           <entry>Digital TV network ULE/MLE desencapsulation entity. Could be implemented on hardware or in Kernelspace</entry>
          </row>
          <row>
-           <entry><constant>MEDIA_ENT_T_V4L2_SUBDEV_SENSOR</constant></entry>
-           <entry>Camera image sensor entity</entry>
+           <entry><constant>MEDIA_ENT_F_CONN_RF</constant></entry>
+           <entry>Connector for a Radio Frequency (RF) signal.</entry>
          </row>
          <row>
-           <entry><constant>MEDIA_ENT_T_V4L2_SUBDEV_FLASH</constant></entry>
-           <entry>Flash controller entity</entry>
+           <entry><constant>MEDIA_ENT_F_CONN_SVIDEO</constant></entry>
+           <entry>Connector for a S-Video signal.</entry>
          </row>
          <row>
-           <entry><constant>MEDIA_ENT_T_V4L2_SUBDEV_LENS</constant></entry>
-           <entry>Lens controller entity</entry>
+           <entry><constant>MEDIA_ENT_F_CONN_COMPOSITE</constant></entry>
+           <entry>Connector for a RGB composite signal.</entry>
          </row>
          <row>
-           <entry><constant>MEDIA_ENT_T_V4L2_SUBDEV_DECODER</constant></entry>
+           <entry><constant>MEDIA_ENT_F_CONN_TEST</constant></entry>
+           <entry>Connector for a test generator.</entry>
+         </row>
+         <row>
+           <entry><constant>MEDIA_ENT_F_CAM_SENSOR</constant></entry>
+           <entry>Camera video sensor entity.</entry>
+         </row>
+         <row>
+           <entry><constant>MEDIA_ENT_F_FLASH</constant></entry>
+           <entry>Flash controller entity.</entry>
+         </row>
+         <row>
+           <entry><constant>MEDIA_ENT_F_LENS</constant></entry>
+           <entry>Lens controller entity.</entry>
+         </row>
+         <row>
+           <entry><constant>MEDIA_ENT_F_ATV_DECODER</constant></entry>
            <entry>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
@@ -238,8 +254,8 @@
            signals.</entry>
          </row>
          <row>
-           <entry><constant>MEDIA_ENT_T_V4L2_SUBDEV_TUNER</constant></entry>
-           <entry>Digital TV, analog TV, radio and/or software radio tuner</entry>
+           <entry><constant>MEDIA_ENT_F_TUNER</constant></entry>
+           <entry>Digital TV, analog TV, radio and/or software radio tuner.</entry>
          </row>
        </tbody>
       </tgroup>