1. add FM radio type
2. update rfkill_type docs
Signed-off-by: Tomas Winkler <[email protected]>
---
rfkill.c | 3 +++
rfkill.h | 3 +++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/rfkill.c b/rfkill.c
index 216e6ac..3f71181 100644
--- a/rfkill.c
+++ b/rfkill.c
@@ -109,6 +109,8 @@ static const char *type2string(enum rfkill_type type)
return "Wireless WAN";
case RFKILL_TYPE_GPS:
return "GPS";
+ case RFKILL_TYPE_FM:
+ return "FM";
case NUM_RFKILL_TYPES:
return NULL;
}
@@ -203,6 +205,7 @@ static struct rfkill_type_str rfkill_type_strings[] = {
{ .type = RFKILL_TYPE_WIMAX, .name = "wimax" },
{ .type = RFKILL_TYPE_WWAN, .name = "wwan" },
{ .type = RFKILL_TYPE_GPS, .name = "gps" },
+ { .type = RFKILL_TYPE_FM, .name = "fm" },
{ .name = NULL }
};
diff --git a/rfkill.h b/rfkill.h
index 3392c59..97059d0 100644
--- a/rfkill.h
+++ b/rfkill.h
@@ -35,6 +35,8 @@
* @RFKILL_TYPE_UWB: switch is on a ultra wideband device.
* @RFKILL_TYPE_WIMAX: switch is on a WiMAX device.
* @RFKILL_TYPE_WWAN: switch is on a wireless WAN device.
+ * @RFKILL_TYPE_GPS: switch is on a GPS device.
+ * @RFKILL_TYPE_FM: switch is on a FM radio device.
* @NUM_RFKILL_TYPES: number of defined rfkill types
*/
enum rfkill_type {
@@ -45,6 +47,7 @@ enum rfkill_type {
RFKILL_TYPE_WIMAX,
RFKILL_TYPE_WWAN,
RFKILL_TYPE_GPS,
+ RFKILL_TYPE_FM,
NUM_RFKILL_TYPES,
};
--
1.6.0.6
---------------------------------------------------------------------
Intel Israel (74) Limited
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
On Mon, Jan 18, 2010 at 11:05 PM, Tomas Winkler <[email protected]> wrote:
> 1. add FM radio type
> 2. update rfkill_type docs
>
> Signed-off-by: Tomas Winkler <[email protected]>
Why is this being pushed for 2.6.33 at this point?
Luis
On Tue, 2010-01-19 at 09:57 -0800, Luis R. Rodriguez wrote:
> On Tue, Jan 19, 2010 at 9:55 AM, Johannes Berg
> <[email protected]> wrote:
> > On Tue, 2010-01-19 at 09:53 -0800, Luis R. Rodriguez wrote:
> >> On Mon, Jan 18, 2010 at 11:05 PM, Tomas Winkler
> >> <[email protected]> wrote:
> >> > 1. add FM radio type
> >> > 2. update rfkill_type docs
> >> >
> >> > Signed-off-by: Tomas Winkler <[email protected]>
> >>
> >> Why is this being pushed for 2.6.33 at this point?
> >
> > ??? Have you read the patch?
>
> So this is updating linux-next to get 2.6.33 rfkill stuff? How did
> that happen?
You still haven't read it? :)
It's for rfkill userspace.
johannes
On Tue, Jan 19, 2010 at 9:59 AM, Johannes Berg
<[email protected]> wrote:
> On Tue, 2010-01-19 at 09:57 -0800, Luis R. Rodriguez wrote:
>> On Tue, Jan 19, 2010 at 9:55 AM, Johannes Berg
>> <[email protected]> wrote:
>> > On Tue, 2010-01-19 at 09:53 -0800, Luis R. Rodriguez wrote:
>> >> On Mon, Jan 18, 2010 at 11:05 PM, Tomas Winkler
>> >> <[email protected]> wrote:
>> >> > 1. add FM radio type
>> >> > 2. update rfkill_type docs
>> >> >
>> >> > Signed-off-by: Tomas Winkler <[email protected]>
>> >>
>> >> Why is this being pushed for 2.6.33 at this point?
>> >
>> > ??? Have you read the patch?
>>
>> So this is updating linux-next to get 2.6.33 rfkill stuff? How did
>> that happen?
>
> You still haven't read it? :)
>
> It's for rfkill userspace.
Jeesh, sorry about that. Monday e-mail trigger happy.
Luis
Call it "urfkill" :-)
--
"One disk to rule them all, One disk to find them. One disk to bring
them all and in the darkness grind them. In the Land of Redmond
where the shadows lie." -- The Silicon Valley Tarot
Henrique Holschuh
On Tue, Jan 19, 2010 at 8:02 PM, Luis R. Rodriguez <[email protected]> wrote:
> On Tue, Jan 19, 2010 at 9:59 AM, Johannes Berg
> <[email protected]> wrote:
>> On Tue, 2010-01-19 at 09:57 -0800, Luis R. Rodriguez wrote:
>>> On Tue, Jan 19, 2010 at 9:55 AM, Johannes Berg
>>> <[email protected]> wrote:
>>> > On Tue, 2010-01-19 at 09:53 -0800, Luis R. Rodriguez wrote:
>>> >> On Mon, Jan 18, 2010 at 11:05 PM, Tomas Winkler
>>> >> <[email protected]> wrote:
>>> >> > 1. add FM radio type
>>> >> > 2. update rfkill_type docs
>>> >> >
>>> >> > Signed-off-by: Tomas Winkler <[email protected]>
>>> >>
>>> >> Why is this being pushed for 2.6.33 at this point?
>>> >
>>> > ??? Have you read the patch?
>>>
>>> So this is updating linux-next to get 2.6.33 rfkill stuff? How did
>>> that happen?
>>
>> You still haven't read it? :)
>>
>> It's for rfkill userspace.
>
> Jeesh, sorry about that. Monday e-mail trigger happy.
:)
Is there any preferable patch prefix for rfkill utility? Just to make
mail sorting a bit easier ...
Tomas
On Tue, Jan 19, 2010 at 9:55 AM, Johannes Berg
<[email protected]> wrote:
> On Tue, 2010-01-19 at 09:53 -0800, Luis R. Rodriguez wrote:
>> On Mon, Jan 18, 2010 at 11:05 PM, Tomas Winkler
>> <[email protected]> wrote:
>> > 1. add FM radio type
>> > 2. update rfkill_type docs
>> >
>> > Signed-off-by: Tomas Winkler <[email protected]>
>>
>> Why is this being pushed for 2.6.33 at this point?
>
> ??? Have you read the patch?
So this is updating linux-next to get 2.6.33 rfkill stuff? How did that happen?
Luis
On Tue, 2010-01-19 at 09:53 -0800, Luis R. Rodriguez wrote:
> On Mon, Jan 18, 2010 at 11:05 PM, Tomas Winkler
> <[email protected]> wrote:
> > 1. add FM radio type
> > 2. update rfkill_type docs
> >
> > Signed-off-by: Tomas Winkler <[email protected]>
>
> Why is this being pushed for 2.6.33 at this point?
??? Have you read the patch?
johannes