NFC: Clearly separate NCI states from flags
Make a clear separation between NCI states and flags.
This is required in order to support more NCI states (e.g.
for multiple targets support).
Signed-off-by: Ilan Elias <ilane@ti.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index 815d28a..629b768 100644
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -264,6 +264,7 @@
if (!rc) {
set_bit(NCI_UP, &ndev->flags);
+ atomic_set(&ndev->state, NCI_IDLE);
} else {
/* Init failed, cleanup */
skb_queue_purge(&ndev->cmd_q);
@@ -360,7 +361,7 @@
struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);
int rc;
- if (test_bit(NCI_DISCOVERY, &ndev->flags)) {
+ if (atomic_read(&ndev->state) == NCI_DISCOVERY) {
pr_err("unable to start poll, since poll is already active\n");
return -EBUSY;
}
@@ -370,7 +371,7 @@
return -EBUSY;
}
- if (test_bit(NCI_POLL_ACTIVE, &ndev->flags)) {
+ if (atomic_read(&ndev->state) == NCI_POLL_ACTIVE) {
pr_debug("target is active, implicitly deactivate...\n");
rc = nci_request(ndev, nci_rf_deactivate_req, 0,
@@ -392,7 +393,7 @@
{
struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);
- if (!test_bit(NCI_DISCOVERY, &ndev->flags)) {
+ if (atomic_read(&ndev->state) != NCI_DISCOVERY) {
pr_err("unable to stop poll, since poll is not active\n");
return;
}
@@ -408,7 +409,7 @@
pr_debug("target_idx %d, protocol 0x%x\n", target_idx, protocol);
- if (!test_bit(NCI_POLL_ACTIVE, &ndev->flags)) {
+ if (atomic_read(&ndev->state) != NCI_POLL_ACTIVE) {
pr_err("there is no available target to activate\n");
return -EINVAL;
}
@@ -443,7 +444,7 @@
ndev->target_active_prot = 0;
- if (test_bit(NCI_POLL_ACTIVE, &ndev->flags)) {
+ if (atomic_read(&ndev->state) == NCI_POLL_ACTIVE) {
nci_request(ndev, nci_rf_deactivate_req, 0,
msecs_to_jiffies(NCI_RF_DEACTIVATE_TIMEOUT));
}
diff --git a/net/nfc/nci/ntf.c b/net/nfc/nci/ntf.c
index a88be91..8ec3946 100644
--- a/net/nfc/nci/ntf.c
+++ b/net/nfc/nci/ntf.c
@@ -261,8 +261,7 @@
__u8 *data = skb->data;
int err = 0;
- clear_bit(NCI_DISCOVERY, &ndev->flags);
- set_bit(NCI_POLL_ACTIVE, &ndev->flags);
+ atomic_set(&ndev->state, NCI_POLL_ACTIVE);
ntf.rf_discovery_id = *data++;
ntf.rf_interface = *data++;
@@ -350,7 +349,7 @@
pr_debug("entry, type 0x%x, reason 0x%x\n", ntf->type, ntf->reason);
- clear_bit(NCI_POLL_ACTIVE, &ndev->flags);
+ atomic_set(&ndev->state, NCI_IDLE);
ndev->target_active_prot = 0;
/* drop tx data queue */
diff --git a/net/nfc/nci/rsp.c b/net/nfc/nci/rsp.c
index 3c73e92..cb8bce6 100644
--- a/net/nfc/nci/rsp.c
+++ b/net/nfc/nci/rsp.c
@@ -137,7 +137,7 @@
pr_debug("status 0x%x\n", status);
if (status == NCI_STATUS_OK)
- set_bit(NCI_DISCOVERY, &ndev->flags);
+ atomic_set(&ndev->state, NCI_DISCOVERY);
nci_req_complete(ndev, status);
}
@@ -149,12 +149,12 @@
pr_debug("status 0x%x\n", status);
- clear_bit(NCI_DISCOVERY, &ndev->flags);
-
/* If target was active, complete the request only in deactivate_ntf */
if ((status != NCI_STATUS_OK) ||
- (!test_bit(NCI_POLL_ACTIVE, &ndev->flags)))
+ (atomic_read(&ndev->state) != NCI_POLL_ACTIVE)) {
+ atomic_set(&ndev->state, NCI_IDLE);
nci_req_complete(ndev, status);
+ }
}
void nci_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb)