NFC: Export new attributes sensb_res and sensf_res

Export new attributes sensb_res for tech B and sensf_res
for tech F in the target info (returned as a response to
NFC_CMD_GET_TARGET).
The max size of the attributes nfcid1, sensb_res and sensf_res
is exported to user space though include/linux/nfc.

Signed-off-by: Ilan Elias <ilane@ti.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 25 insertions, 2 deletions

diff --git a/include/net/nfc/nci.h b/include/net/nfc/nci.h
index 2be95e2626c0..34f5ed29c3c1 100644
--- a/include/net/nfc/nci.h
+++ b/include/net/nfc/nci.h
@@ -275,11 +275,27 @@ struct rf_tech_specific_params_nfca_poll {
         __u8    sel_res;
 } __packed;
 
+struct rf_tech_specific_params_nfcb_poll {
+        __u8    sensb_res_len;
+        __u8    sensb_res[12];  /* 11 or 12 Bytes */
+} __packed;
+
+struct rf_tech_specific_params_nfcf_poll {
+        __u8    bit_rate;
+        __u8    sensf_res_len;
+        __u8    sensf_res[18];  /* 16 or 18 Bytes */
+} __packed;
+
 struct activation_params_nfca_poll_iso_dep {
         __u8    rats_res_len;
         __u8    rats_res[20];
 };
 
+struct activation_params_nfcb_poll_iso_dep {
+        __u8    attrib_res_len;
+        __u8    attrib_res[50];
+};
+
 struct nci_rf_intf_activated_ntf {
         __u8    rf_discovery_id;
         __u8    rf_interface;
@@ -291,6 +307,8 @@ struct nci_rf_intf_activated_ntf {
 
         union {
                 struct rf_tech_specific_params_nfca_poll nfca_poll;
+                struct rf_tech_specific_params_nfcb_poll nfcb_poll;
+                struct rf_tech_specific_params_nfcf_poll nfcf_poll;
         } rf_tech_specific_params;
 
         __u8    data_exch_rf_tech_and_mode;
@@ -300,6 +318,7 @@ struct nci_rf_intf_activated_ntf {
 
         union {
                 struct activation_params_nfca_poll_iso_dep nfca_poll_iso_dep;
+                struct activation_params_nfcb_poll_iso_dep nfcb_poll_iso_dep;
         } activation_params;
 
 } __packed;
diff --git a/include/net/nfc/nfc.h b/include/net/nfc/nfc.h
index 8696b773a695..819530d0e37f 100644
--- a/include/net/nfc/nfc.h
+++ b/include/net/nfc/nfc.h
@@ -24,6 +24,7 @@
 #ifndef __NET_NFC_H
 #define __NET_NFC_H
 
+#include <linux/nfc.h>
 #include <linux/device.h>
 #include <linux/skbuff.h>
 
@@ -65,7 +66,6 @@ struct nfc_ops {
 
 #define NFC_TARGET_IDX_ANY -1
 #define NFC_MAX_GT_LEN 48
-#define NFC_MAX_NFCID1_LEN 10
 
 struct nfc_target {
         u32 idx;
@@ -73,7 +73,11 @@ struct nfc_target {
         u16 sens_res;
         u8 sel_res;
         u8 nfcid1_len;
-        u8 nfcid1[NFC_MAX_NFCID1_LEN];
+        u8 nfcid1[NFC_NFCID1_MAXSIZE];
+        u8 sensb_res_len;
+        u8 sensb_res[NFC_SENSB_RES_MAXSIZE];
+        u8 sensf_res_len;
+        u8 sensf_res[NFC_SENSF_RES_MAXSIZE];
 };
 
 struct nfc_genl_data {