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

Commit 9295b5b5 authored by Christophe Ricard's avatar Christophe Ricard Committed by Samuel Ortiz
Browse files

NFC: nci: Add support for different NCI_DEACTIVATE_TYPE 



nci_rf_deactivate_req only support NCI_DEACTIVATE_TYPE_IDLE_MODE.
In some situation, it might be necessary to be able to support other
NCI_DEACTIVATE_TYPE such as NCI_DEACTIVATE_TYPE_SLEEP_MODE in order for
example to reactivate the selected target.

Signed-off-by: default avatarChristophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 4391590c

net/nfc/nci/core.c

+6 −4
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ static void nci_rf_deactivate_req(struct nci_dev *ndev, unsigned long opt) 
{

	struct nci_rf_deactivate_cmd cmd;



	cmd.type = NCI_DEACTIVATE_TYPE_IDLE_MODE;

	cmd.type = opt;



	nci_send_cmd(ndev, NCI_OP_RF_DEACTIVATE_CMD,

		     sizeof(struct nci_rf_deactivate_cmd), &cmd);
@@ -527,7 +527,8 @@ static int nci_start_poll(struct nfc_dev *nfc_dev, 
	    (atomic_read(&ndev->state) == NCI_POLL_ACTIVE)) {

		pr_debug("target active or w4 select, implicitly deactivate\n");



		rc = nci_request(ndev, nci_rf_deactivate_req, 0,

		rc = nci_request(ndev, nci_rf_deactivate_req,

				 NCI_DEACTIVATE_TYPE_IDLE_MODE,

				 msecs_to_jiffies(NCI_RF_DEACTIVATE_TIMEOUT));

		if (rc)

			return -EBUSY;
@@ -568,7 +569,7 @@ static void nci_stop_poll(struct nfc_dev *nfc_dev) 
		return;

	}



	nci_request(ndev, nci_rf_deactivate_req, 0,

	nci_request(ndev, nci_rf_deactivate_req, NCI_DEACTIVATE_TYPE_IDLE_MODE,

		    msecs_to_jiffies(NCI_RF_DEACTIVATE_TIMEOUT));

}
@@ -653,7 +654,8 @@ static void nci_deactivate_target(struct nfc_dev *nfc_dev, 
	ndev->target_active_prot = 0;



	if (atomic_read(&ndev->state) == NCI_POLL_ACTIVE) {

		nci_request(ndev, nci_rf_deactivate_req, 0,

		nci_request(ndev, nci_rf_deactivate_req,

			    NCI_DEACTIVATE_TYPE_SLEEP_MODE,

			    msecs_to_jiffies(NCI_RF_DEACTIVATE_TIMEOUT));

	}

}