SDR receiver has ADC (Analog-to-Digital Converter) and SDR transmitter has DAC (Digital-to-Analog Converter). Originally I though it could be good idea to have own type for receiver and transmitter, but now I feel one common type for SDR is enough. So lets rename it. Signed-off-by: Antti Palosaari <crope@iki.fi> Acked-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> [hans.verkuil@cisco.com: this was added in 4.4, so update 4.2 to 4.4]
Unified · Split
| @@ -2591,6 +2591,18 @@ and &v4l2-mbus-framefmt;. · 2590 unmodified lines | |||
| 2591 | </orderedlist> | 2591 | </orderedlist> |
| 2592 | </section> | 2592 | </section> |
| 2593 | 2593 | ||
| 2594 | <section> | ||
| 2595 | <title>V4L2 in Linux 4.4</title> | ||
| 2596 | <orderedlist> | ||
| 2597 | <listitem> | ||
| 2598 | <para>Renamed <constant>V4L2_TUNER_ADC</constant> to | ||
| 2599 | <constant>V4L2_TUNER_SDR</constant>. The use of | ||
| 2600 | <constant>V4L2_TUNER_ADC</constant> is deprecated now. | ||
| 2601 | </para> | ||
| 2602 | </listitem> | ||
| 2603 | </orderedlist> | ||
| 2604 | </section> | ||
| 2605 | |||
| 2594 | <section id="other"> | 2606 | <section id="other"> |
| 2595 | <title>Relation of V4L2 to other Linux multimedia APIs</title> | 2607 | <title>Relation of V4L2 to other Linux multimedia APIs</title> |
| 2596 | 2608 | ||
| @@ -44,10 +44,10 @@ frequency. · 43 unmodified lines | |||
| 44 | </para> | 44 | </para> |
| 45 | 45 | ||
| 46 | <para> | 46 | <para> |
| 47 | The <constant>V4L2_TUNER_ADC</constant> tuner type is used for ADC tuners, and | 47 | The <constant>V4L2_TUNER_SDR</constant> tuner type is used for SDR tuners, and |
| 48 | the <constant>V4L2_TUNER_RF</constant> tuner type is used for RF tuners. The | 48 | the <constant>V4L2_TUNER_RF</constant> tuner type is used for RF tuners. The |
| 49 | tuner index of the RF tuner (if any) must always follow the ADC tuner index. | 49 | tuner index of the RF tuner (if any) must always follow the SDR tuner index. |
| 50 | Normally the ADC tuner is #0 and the RF tuner is #1. | 50 | Normally the SDR tuner is #0 and the RF tuner is #1. |
| 51 | </para> | 51 | </para> |
| 52 | 52 | ||
| 53 | <para> | 53 | <para> |
| @@ -151,6 +151,13 @@ Rubli, Andy Walls, Muralidharan Karicheri, Mauro Carvalho Chehab, · 150 unmodified lines | |||
| 151 | structs, ioctls) must be noted in more detail in the history chapter | 151 | structs, ioctls) must be noted in more detail in the history chapter |
| 152 | (compat.xml), along with the possible impact on existing drivers and | 152 | (compat.xml), along with the possible impact on existing drivers and |
| 153 | applications. --> | 153 | applications. --> |
| 154 | <revision> | ||
| 155 | <revnumber>4.4</revnumber> | ||
| 156 | <date>2015-05-26</date> | ||
| 157 | <authorinitials>ap</authorinitials> | ||
| 158 | <revremark>Renamed V4L2_TUNER_ADC to V4L2_TUNER_SDR. | ||
| 159 | </revremark> | ||
| 160 | </revision> | ||
| 154 | 161 | ||
| 155 | <revision> | 162 | <revision> |
| 156 | <revnumber>3.21</revnumber> | 163 | <revnumber>3.21</revnumber> |
| @@ -1637,7 +1637,7 @@ static int v4l_g_frequency(const struct v4l2_ioctl_ops *ops, · 1636 unmodified lines | |||
| 1637 | struct v4l2_frequency *p = arg; | 1637 | struct v4l2_frequency *p = arg; |
| 1638 | 1638 | ||
| 1639 | if (vfd->vfl_type == VFL_TYPE_SDR) | 1639 | if (vfd->vfl_type == VFL_TYPE_SDR) |
| 1640 | p->type = V4L2_TUNER_ADC; | 1640 | p->type = V4L2_TUNER_SDR; |
| 1641 | else | 1641 | else |
| 1642 | p->type = (vfd->vfl_type == VFL_TYPE_RADIO) ? | 1642 | p->type = (vfd->vfl_type == VFL_TYPE_RADIO) ? |
| 1643 | V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV; | 1643 | V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV; |
| @@ -1652,7 +1652,7 @@ static int v4l_s_frequency(const struct v4l2_ioctl_ops *ops, · 8 unmodified lines | |||
| 1652 | enum v4l2_tuner_type type; | 1652 | enum v4l2_tuner_type type; |
| 1653 | 1653 | ||
| 1654 | if (vfd->vfl_type == VFL_TYPE_SDR) { | 1654 | if (vfd->vfl_type == VFL_TYPE_SDR) { |
| 1655 | if (p->type != V4L2_TUNER_ADC && p->type != V4L2_TUNER_RF) | 1655 | if (p->type != V4L2_TUNER_SDR && p->type != V4L2_TUNER_RF) |
| 1656 | return -EINVAL; | 1656 | return -EINVAL; |
| 1657 | } else { | 1657 | } else { |
| 1658 | type = (vfd->vfl_type == VFL_TYPE_RADIO) ? | 1658 | type = (vfd->vfl_type == VFL_TYPE_RADIO) ? |
| @@ -2277,7 +2277,7 @@ static int v4l_enum_freq_bands(const struct v4l2_ioctl_ops *ops, · 618 unmodified lines | |||
| 2277 | int err; | 2277 | int err; |
| 2278 | 2278 | ||
| 2279 | if (vfd->vfl_type == VFL_TYPE_SDR) { | 2279 | if (vfd->vfl_type == VFL_TYPE_SDR) { |
| 2280 | if (p->type != V4L2_TUNER_ADC && p->type != V4L2_TUNER_RF) | 2280 | if (p->type != V4L2_TUNER_SDR && p->type != V4L2_TUNER_RF) |
| 2281 | return -EINVAL; | 2281 | return -EINVAL; |
| 2282 | type = p->type; | 2282 | type = p->type; |
| 2283 | } else { | 2283 | } else { |
| @@ -165,10 +165,13 @@ enum v4l2_tuner_type { · 164 unmodified lines | |||
| 165 | V4L2_TUNER_RADIO = 1, | 165 | V4L2_TUNER_RADIO = 1, |
| 166 | V4L2_TUNER_ANALOG_TV = 2, | 166 | V4L2_TUNER_ANALOG_TV = 2, |
| 167 | V4L2_TUNER_DIGITAL_TV = 3, | 167 | V4L2_TUNER_DIGITAL_TV = 3, |
| 168 | V4L2_TUNER_ADC = 4, | 168 | V4L2_TUNER_SDR = 4, |
| 169 | V4L2_TUNER_RF = 5, | 169 | V4L2_TUNER_RF = 5, |
| 170 | }; | 170 | }; |
| 171 | 171 | ||
| 172 | /* Deprecated, do not use */ | ||
| 173 | #define V4L2_TUNER_ADC V4L2_TUNER_SDR | ||
| 174 | |||
| 172 | enum v4l2_memory { | 175 | enum v4l2_memory { |
| 173 | V4L2_MEMORY_MMAP = 1, | 176 | V4L2_MEMORY_MMAP = 1, |
| 174 | V4L2_MEMORY_USERPTR = 2, | 177 | V4L2_MEMORY_USERPTR = 2, |