diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2011-10-11 04:12:52 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-16 06:58:53 -0500 |
commit | aa07eec5320cf1793062c03b8409e7541ca37c31 (patch) | |
tree | cbfead55cd780cb44768c4a8c1f783df020d00c6 /Documentation | |
parent | dacd4fa37dbafe209a90d6d5b729d2257df4b734 (diff) |
[media] v4l2-ioctl: make tuner 'type' check more strict for S_FREQUENCY
As per the feature removal document, make the tuner type check more strict
so that it is no longer possible to set the radio frequency through a video
node or the TV frequency through a radio node.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-g-frequency.xml | 7 | ||||
-rw-r--r-- | Documentation/feature-removal-schedule.txt | 11 |
2 files changed, 5 insertions, 13 deletions
diff --git a/Documentation/DocBook/media/v4l/vidioc-g-frequency.xml b/Documentation/DocBook/media/v4l/vidioc-g-frequency.xml index 16431813bebd..66e9a5257861 100644 --- a/Documentation/DocBook/media/v4l/vidioc-g-frequency.xml +++ b/Documentation/DocBook/media/v4l/vidioc-g-frequency.xml | |||
@@ -98,8 +98,11 @@ the &v4l2-output; <structfield>modulator</structfield> field and the | |||
98 | <entry>&v4l2-tuner-type;</entry> | 98 | <entry>&v4l2-tuner-type;</entry> |
99 | <entry><structfield>type</structfield></entry> | 99 | <entry><structfield>type</structfield></entry> |
100 | <entry>The tuner type. This is the same value as in the | 100 | <entry>The tuner type. This is the same value as in the |
101 | &v4l2-tuner; <structfield>type</structfield> field. The field is not | 101 | &v4l2-tuner; <structfield>type</structfield> field. The type must be set |
102 | applicable to modulators, &ie; ignored by drivers.</entry> | 102 | to <constant>V4L2_TUNER_RADIO</constant> for <filename>/dev/radioX</filename> |
103 | device nodes, and to <constant>V4L2_TUNER_ANALOG_TV</constant> | ||
104 | for all others. The field is not applicable to modulators, &ie; ignored | ||
105 | by drivers.</entry> | ||
103 | </row> | 106 | </row> |
104 | <row> | 107 | <row> |
105 | <entry>__u32</entry> | 108 | <entry>__u32</entry> |
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index c4362ef3a793..fed5a34a727d 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
@@ -460,17 +460,6 @@ Who: Jean Delvare <khali@linux-fr.org> | |||
460 | 460 | ||
461 | ---------------------------- | 461 | ---------------------------- |
462 | 462 | ||
463 | What: For VIDIOC_S_FREQUENCY the type field must match the device node's type. | ||
464 | If not, return -EINVAL. | ||
465 | When: 3.2 | ||
466 | Why: It makes no sense to switch the tuner to radio mode by calling | ||
467 | VIDIOC_S_FREQUENCY on a video node, or to switch the tuner to tv mode by | ||
468 | calling VIDIOC_S_FREQUENCY on a radio node. This is the first step of a | ||
469 | move to more consistent handling of tv and radio tuners. | ||
470 | Who: Hans Verkuil <hans.verkuil@cisco.com> | ||
471 | |||
472 | ---------------------------- | ||
473 | |||
474 | What: Opening a radio device node will no longer automatically switch the | 463 | What: Opening a radio device node will no longer automatically switch the |
475 | tuner mode from tv to radio. | 464 | tuner mode from tv to radio. |
476 | When: 3.3 | 465 | When: 3.3 |