rfkill.h is synced with the kernel header, man page is updated and
RFKILL_TYPE_NFC is mapped to "nfc".
---
rfkill.8 | 2 +-
rfkill.c | 3 +++
rfkill.h | 2 ++
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/rfkill.8 b/rfkill.8
index aa11fde..24baccc 100644
--- 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 bda649a..b2672ee 100644
--- 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 97059d0..d253b4e 100644
--- 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,
};
--
1.7.10.4
--
Intel Open Source Technology Centre
http://oss.intel.com/
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
