]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
update rfkill.h from kernel 2.6.33
authorTomas Winkler <tomas.winkler@intel.com>
Tue, 19 Jan 2010 07:05:21 +0000 (09:05 +0200)
committerJohannes Berg <johannes@sipsolutions.net>
Tue, 19 Jan 2010 10:24:15 +0000 (11:24 +0100)
1. add FM radio type
2. update rfkill_type docs

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
rfkill.c
rfkill.h

index 216e6ac2a36a2ffe782eda32f03b4b7749a011c8..3f71181b8ede5aa114af35abaa238e00f7de3e77 100644 (file)
--- 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 }
 };
 
index 3392c59d270681b0336d6edf6deac6e942e02693..97059d08a626cb70b2db4c39d7f7c9a17b800213 100644 (file)
--- 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,
 };