Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 004161cb authored by Ilan Elias's avatar Ilan Elias Committed by John W. Linville
Browse files

NFC: Handle error during NCI data exchange 



Add support for NCI Interface Error Notification.
When this notification is received and we're during a
data exchange transaction, indicate an error to the NFC
core layer via the data exchange callback.

Signed-off-by: default avatarIlan Elias <ilane@ti.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 637d85a7

include/net/nfc/nci.h

+6 −0
Original line number Diff line number Diff line
@@ -260,6 +260,12 @@ struct nci_core_conn_credit_ntf { 
	struct conn_credit_entry	conn_entries[NCI_MAX_NUM_CONN];

} __packed;



#define NCI_OP_CORE_INTF_ERROR_NTF	nci_opcode_pack(NCI_GID_CORE, 0x08)

struct nci_core_intf_error_ntf {

	__u8	status;

	__u8	conn_id;

} __packed;



#define NCI_OP_RF_INTF_ACTIVATED_NTF	nci_opcode_pack(NCI_GID_RF_MGMT, 0x05)

struct rf_tech_specific_params_nfca_poll {

	__u16	sens_res;

net/nfc/nci/ntf.c

+18 −0
Original line number Diff line number Diff line
@@ -71,6 +71,20 @@ static void nci_core_conn_credits_ntf_packet(struct nci_dev *ndev, 
		queue_work(ndev->tx_wq, &ndev->tx_work);

}



static void nci_core_conn_intf_error_ntf_packet(struct nci_dev *ndev,

						struct sk_buff *skb)

{

	struct nci_core_intf_error_ntf *ntf = (void *) skb->data;



	ntf->conn_id = nci_conn_id(&ntf->conn_id);



	pr_debug("status 0x%x, conn_id %d\n", ntf->status, ntf->conn_id);



	/* complete the data exchange transaction, if exists */

	if (test_bit(NCI_DATA_EXCHANGE, &ndev->flags))

		nci_data_exchange_complete(ndev, NULL, -EIO);

}



static __u8 *nci_extract_rf_params_nfca_passive_poll(struct nci_dev *ndev,

			struct nci_rf_intf_activated_ntf *ntf, __u8 *data)

{
@@ -280,6 +294,10 @@ void nci_ntf_packet(struct nci_dev *ndev, struct sk_buff *skb) 
		nci_core_conn_credits_ntf_packet(ndev, skb);

		break;



	case NCI_OP_CORE_INTF_ERROR_NTF:

		nci_core_conn_intf_error_ntf_packet(ndev, skb);

		break;



	case NCI_OP_RF_INTF_ACTIVATED_NTF:

		nci_rf_intf_activated_ntf_packet(ndev, skb);

		break;