diff --git a/Documentation/DocBook/media/Makefile b/Documentation/DocBook/media/Makefile
index f2f57861f0c8743efdec92b5a5d7cf8b53e589a0..f8380219afbb515bac2102ab48fc3e7ee9ca7134 100644
--- a/Documentation/DocBook/media/Makefile
+++ b/Documentation/DocBook/media/Makefile
@@ -179,7 +179,6 @@ DOCUMENTED = \
-e "s/v4l2\-mpeg\-vbi\-ITV0/v4l2-mpeg-vbi-itv0-1/g"
DVB_DOCUMENTED = \
- -e "s/\(linkend\=\"\)FE_SET_PROPERTY/\1FE_GET_PROPERTY/g" \
-e "s,\(struct\s\+\)\([a-z0-9_]\+\)\(\s\+{\),\1\\2\<\/link\>\3,g" \
-e "s,\(}\s\+\)\([a-z0-9_]\+_t\+\),\1\\2\<\/link\>,g" \
-e "s,\(define\s\+\)\(DTV_[A-Z0-9_]\+\)\(\s\+[0-9]\+\),\1\\2\<\/link\>\3,g" \
@@ -189,6 +188,7 @@ DVB_DOCUMENTED = \
-e "s,DTV-ISDBT-LAYER[A-C],DTV-ISDBT-LAYER,g" \
-e "s,\(define\s\+\)\([A-Z0-9_]\+\)\(\s\+_IO\),\1\\2\<\/link\>\3,g" \
-e "s,\(__.*_OLD\)<\/link>,\1,g" \
+ -e "s/\(linkend\=\"\)FE_SET_PROPERTY/\1FE_GET_PROPERTY/g" \
#
# Media targets and dependencies
diff --git a/Documentation/DocBook/media/dvb/dvbproperty.xml b/Documentation/DocBook/media/dvb/dvbproperty.xml
index f9680b0302b31bf6965e6a0dd10d546bb442b298..28ea62067af6025497b87a107df385ea92cabfdc 100644
--- a/Documentation/DocBook/media/dvb/dvbproperty.xml
+++ b/Documentation/DocBook/media/dvb/dvbproperty.xml
@@ -70,7 +70,7 @@ struct dtv_properties {
Property types
-On FE_GET_PROPERTY/FE_SET_PROPERTY,
+On FE_GET_PROPERTY and FE_SET_PROPERTY,
the actual action is determined by the dtv_property cmd/data pairs. With one single ioctl, is possible to
get/set up to 64 properties. The actual meaning of each property is described on the next sections.
@@ -1223,14 +1223,14 @@ enum fe_interleaving {
- ioctl FE_GET_PROPERTY
+ ioctl FE_SET_PROPERTY, FE_GET_PROPERTY
&manvol;
- FE_GET_PROPERTY
- Returns one or more frontend properties. This call only
- requires read-only access to the device
+ FE_SET_PROPERTY and FE_GET_PROPERTY
+ FE_SET_PROPERTY sets one or more frontend properties.
+ FE_GET_PROPERTY returns one or more frontend properties.
@@ -1256,7 +1256,7 @@ enum fe_interleaving {
request
- FE_GET_PROPERTY
+ FE_SET_PROPERTY, FE_GET_PROPERTY
@@ -1272,68 +1272,32 @@ enum fe_interleaving {
DescriptionAll DVB frontend devices support the
-FE_GET_PROPERTY ioctl. It is used to get properties and
-statistics from the frontend.
+FE_SET_PROPERTY and FE_GET_PROPERTY
+ioctls. The supported properties and statistics depends on the delivery system
+and on the device:
+
+
+ FE_SET_PROPERTY:
+
+This ioctl is used to set one or more
+ frontend properties.
+This is the basic command to request the frontend to tune into some
+ frequency and to start decoding the digital TV signal.
+This call requires read/write access to the device.
+At return, the values are updated to reflect the
+ actual parameters used.
+
+
+
+ FE_GET_PROPERTY:
+
+This ioctl is used to get properties and
+statistics from the frontend.
+No properties are changed, and statistics aren't reset.
+This call only requires read-only access to the device.
+
+
+
&return-value-dvb;.
-
-
-
-
-
-
- ioctl FE_SET_PROPERTY
- &manvol;
-
-
-
- FE_SET_PROPERTY
- Sets one or more frontend properties. This call
- requires read/write access to the device
-
-
-
-
-
- int ioctl
- int fd
- int request
- &dtv-property; *argp
-
-
-
-
-
- Arguments
-
-
- fd
-
- &fe_fd;
-
-
-
- request
-
- FE_SET_PROPERTY
-
-
-
- argp
-
- pointer to &dtv-property;
-
-
-
-
-
-
- Description
-
- All DVB frontend devices support the
-FE_SET_PROPERTY ioctl. It is used to sets one or more
-frontend properties. This is the basic command to request the frontend to tune
-into some frequency and to start decoding the digital TV signal.
-&return-value-dvb;.
-
diff --git a/Documentation/DocBook/media/dvb/frontend_legacy_api.xml b/Documentation/DocBook/media/dvb/frontend_legacy_api.xml
index f4d300488d12901dbc0c15fe7ca6951a74782e63..e2817f830312e47a449c7cea0fbba9d1ec367918 100644
--- a/Documentation/DocBook/media/dvb/frontend_legacy_api.xml
+++ b/Documentation/DocBook/media/dvb/frontend_legacy_api.xml
@@ -42,7 +42,7 @@
Newer formats like DVB-S2, ISDB-T, ISDB-S and DVB-T2 are not described at the above, as they're
-supported via the new FE_GET_PROPERTY/FE_GET_SET_PROPERTY ioctl's, using the DTV_DELIVERY_SYSTEM parameter.
+supported via the new FE_GET_PROPERTY/FE_GET_SET_PROPERTY ioctl's, using the DTV_DELIVERY_SYSTEM parameter.
The usage of this field is deprecated, as it doesn't report all supported standards, and
@@ -59,11 +59,11 @@ the kind of hardware you are using.
union with specific per-system parameters. However, as newer delivery systems
required more data, the structure size weren't enough to fit, and just
extending its size would break the existing applications. So, those parameters
-were replaced by the usage of
+were replaced by the usage of
FE_GET_PROPERTY/FE_SET_PROPERTY ioctl's. The
new API is flexible enough to add new parameters to existing delivery systems,
and to add newer delivery systems.
-So, newer applications should use
+So, newer applications should use
FE_GET_PROPERTY/FE_SET_PROPERTY instead, in
order to be able to support the newer System Delivery like DVB-S2, DVB-T2,
DVB-C2, ISDB, etc.