mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Ilan Elias 2012-01-18 13:16:12 +02:00 committed by John W. Linville
parent 6d810f1032
commit 8939e47fc9
4 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/net/nfc/nci_core.h
View File

@ -34,16 +34,21 @@
#include <net/nfc/nfc.h>
#include <net/nfc/nci.h>
/* NCI device state */
enum {
/* NCI device flags */
enum nci_flag {
NCI_INIT,
NCI_UP,
NCI_DISCOVERY,
NCI_POLL_ACTIVE,
NCI_DATA_EXCHANGE,
NCI_DATA_EXCHANGE_TO,
};
/* NCI device states */
enum nci_state {
NCI_IDLE,
NCI_DISCOVERY,
NCI_POLL_ACTIVE,
};
/* NCI timeouts */
#define NCI_RESET_TIMEOUT 5000
#define NCI_INIT_TIMEOUT 5000
@ -70,6 +75,7 @@ struct nci_dev {
int tx_headroom;
int tx_tailroom;
atomic_t state;
unsigned long flags;
atomic_t cmd_cnt;

11
net/nfc/nci/core.c
View File

@ -264,6 +264,7 @@ static int nci_open_device(struct nci_dev *ndev)
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 @@ static int nci_start_poll(struct nfc_dev *nfc_dev, __u32 protocols)
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 @@ static int nci_start_poll(struct nfc_dev *nfc_dev, __u32 protocols)
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 @@ static void nci_stop_poll(struct nfc_dev *nfc_dev)
{
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 @@ static int nci_activate_target(struct nfc_dev *nfc_dev, __u32 target_idx,
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 @@ static void nci_deactivate_target(struct nfc_dev *nfc_dev, __u32 target_idx)
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));
}

5
net/nfc/nci/ntf.c
View File

@ -261,8 +261,7 @@ static void nci_rf_intf_activated_ntf_packet(struct nci_dev *ndev,
__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 @@ static void nci_rf_deactivate_ntf_packet(struct nci_dev *ndev,
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 */

8
net/nfc/nci/rsp.c
View File

@ -137,7 +137,7 @@ static void nci_rf_disc_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb)
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 @@ static void nci_rf_deactivate_rsp_packet(struct nci_dev *ndev,
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)