Add NFC support

rfkill.h is synced with the kernel header, man page is updated and
RFKILL_TYPE_NFC is mapped to "nfc".

diff --git a/rfkill.8 b/rfkill.8
index aa11fde2dd7eb6bf7895c9770466659be6ba3c87..24baccc678917e94aae4ca3cd5a5323e61114b61 100644 (file)
--- a/rfkill.8
+++ b/rfkill.8
@@ -24,7 +24,7 @@ or just all of the given type.
 .BI block " index|type"
 Disable the device corresponding to the given index.
 \fItype\fR is one of "all", "wifi", "wlan", "bluetooth", "uwb",
-"ultrawideband", "wimax", "wwan", "gps" or "fm".
+"ultrawideband", "wimax", "wwan", "gps", "fm" or "nfc".
 .TP
 .BI unblock " index|type"
 Enable the device corresponding to the given index. If the device is

diff --git a/rfkill.c b/rfkill.c
index bda649a978da31ebbb957576820736c7ba1fa76e..b2672ee3cd4ed9d7aa5ddb84ef33a2536d2b01f5 100644 (file)
--- a/rfkill.c
+++ b/rfkill.c
@@ -111,6 +111,8 @@ static const char *type2string(enum rfkill_type type)
                return "GPS";
        case RFKILL_TYPE_FM:
                return "FM";
+       case RFKILL_TYPE_NFC:
+               return "NFC";
        case NUM_RFKILL_TYPES:
                return NULL;
        }
@@ -133,6 +135,7 @@ static const struct rfkill_type_str rfkill_type_strings[] = {
        {       .type = RFKILL_TYPE_WWAN,               .name = "wwan"  },
        {       .type = RFKILL_TYPE_GPS,                .name = "gps"   },
        {       .type = RFKILL_TYPE_FM,                 .name = "fm"    },
+       {       .type = RFKILL_TYPE_NFC,                .name = "nfc"   },
        {       .name = NULL }
 };
 

diff --git a/rfkill.h b/rfkill.h
index 97059d08a626cb70b2db4c39d7f7c9a17b800213..d253b4ebcaf2227558ee604b3e322da5a5a18636 100644 (file)
--- a/rfkill.h
+++ b/rfkill.h
@@ -37,6 +37,7 @@
  * @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.
+ * @RFKILL_TYPE_NFC: switch is on an NFC device.
  * @NUM_RFKILL_TYPES: number of defined rfkill types
  */
 enum rfkill_type {
@@ -48,6 +49,7 @@ enum rfkill_type {
        RFKILL_TYPE_WWAN,
        RFKILL_TYPE_GPS,
        RFKILL_TYPE_FM,
+       RFKILL_TYPE_NFC,
        NUM_RFKILL_TYPES,
 };