From 470d54410a98e21ffafb487d32c1185074a0b7f5 Mon Sep 17 00:00:00 2001
From: Ilan Elias <ilane@ti.com>
Date: Wed, 15 Aug 2012 11:46:23 +0300
Subject: [PATCH] --- yaml --- r: 328264 b: refs/heads/master c:
 ac206838403411e617dbe0e7df1891ee957f1f9a h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/include/net/nfc/nci.h |  6 ++++++
 trunk/net/nfc/nci/ntf.c     | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ff9bc21447b8..9abfb66f4f2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e0352306f6869b442a574a8e691f126c9fe930a
+refs/heads/master: ac206838403411e617dbe0e7df1891ee957f1f9a
diff --git a/trunk/include/net/nfc/nci.h b/trunk/include/net/nfc/nci.h
index d260ef3629db..88785e5c6b2c 100644
--- a/trunk/include/net/nfc/nci.h
+++ b/trunk/include/net/nfc/nci.h
@@ -351,6 +351,11 @@ struct activation_params_nfcb_poll_iso_dep {
 	__u8	attrib_res[50];
 };
 
+struct activation_params_poll_nfc_dep {
+	__u8	atr_res_len;
+	__u8	atr_res[63];
+};
+
 struct nci_rf_intf_activated_ntf {
 	__u8	rf_discovery_id;
 	__u8	rf_interface;
@@ -374,6 +379,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;
+		struct activation_params_poll_nfc_dep poll_nfc_dep;
 	} activation_params;
 
 } __packed;
diff --git a/trunk/net/nfc/nci/ntf.c b/trunk/net/nfc/nci/ntf.c
index af7a93b04393..6e17661a41a4 100644
--- a/trunk/net/nfc/nci/ntf.c
+++ b/trunk/net/nfc/nci/ntf.c
@@ -361,6 +361,33 @@ static int nci_extract_activation_params_iso_dep(struct nci_dev *ndev,
 	return NCI_STATUS_OK;
 }
 
+static int nci_extract_activation_params_nfc_dep(struct nci_dev *ndev,
+			struct nci_rf_intf_activated_ntf *ntf, __u8 *data)
+{
+	struct activation_params_poll_nfc_dep *poll;
+	int i;
+
+	switch (ntf->activation_rf_tech_and_mode) {
+	case NCI_NFC_A_PASSIVE_POLL_MODE:
+	case NCI_NFC_F_PASSIVE_POLL_MODE:
+		poll = &ntf->activation_params.poll_nfc_dep;
+		poll->atr_res_len = min_t(__u8, *data++, 63);
+		pr_debug("atr_res_len %d\n", poll->atr_res_len);
+		if (poll->atr_res_len > 0) {
+			for (i = 0; i < poll->atr_res_len; i++)
+				poll->atr_res[poll->atr_res_len-1-i] = data[i];
+		}
+		break;
+
+	default:
+		pr_err("unsupported activation_rf_tech_and_mode 0x%x\n",
+		       ntf->activation_rf_tech_and_mode);
+		return NCI_STATUS_RF_PROTOCOL_ERROR;
+	}
+
+	return NCI_STATUS_OK;
+}
+
 static void nci_target_auto_activated(struct nci_dev *ndev,
 				      struct nci_rf_intf_activated_ntf *ntf)
 {
@@ -454,6 +481,11 @@ static void nci_rf_intf_activated_ntf_packet(struct nci_dev *ndev,
 								    &ntf, data);
 			break;
 
+		case NCI_RF_INTERFACE_NFC_DEP:
+			err = nci_extract_activation_params_nfc_dep(ndev,
+								    &ntf, data);
+			break;
+
 		case NCI_RF_INTERFACE_FRAME:
 			/* no activation params */
 			break;