aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorIlan Elias <ilane@ti.com>2012-01-17 05:03:50 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-01-24 14:21:55 -0500
commitc4bf98b220cba7a8618405261d69ee53a265110e (patch)
tree2710efffaefc519f0d08f116ba669b1648aaab4a /include
parent889cbb911a195b832745f77240f547cb2a2885bc (diff)
NFC: Add NCI data exchange timer
Add NCI data exchange timer to catch timeouts, and call the data exchange callback with an error. Signed-off-by: Ilan Elias <ilane@ti.com> Acked-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include')
-rw-r--r--include/net/nfc/nci_core.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/nfc/nci_core.h b/include/net/nfc/nci_core.h
index f4963ea77947..9154663b606b 100644
--- a/include/net/nfc/nci_core.h
+++ b/include/net/nfc/nci_core.h
@@ -41,6 +41,7 @@ enum {
41 NCI_DISCOVERY, 41 NCI_DISCOVERY,
42 NCI_POLL_ACTIVE, 42 NCI_POLL_ACTIVE,
43 NCI_DATA_EXCHANGE, 43 NCI_DATA_EXCHANGE,
44 NCI_DATA_EXCHANGE_TO,
44}; 45};
45 46
46/* NCI timeouts */ 47/* NCI timeouts */
@@ -49,6 +50,7 @@ enum {
49#define NCI_RF_DISC_TIMEOUT 5000 50#define NCI_RF_DISC_TIMEOUT 5000
50#define NCI_RF_DEACTIVATE_TIMEOUT 30000 51#define NCI_RF_DEACTIVATE_TIMEOUT 30000
51#define NCI_CMD_TIMEOUT 5000 52#define NCI_CMD_TIMEOUT 5000
53#define NCI_DATA_TIMEOUT 700
52 54
53struct nci_dev; 55struct nci_dev;
54 56
@@ -74,6 +76,7 @@ struct nci_dev {
74 atomic_t credits_cnt; 76 atomic_t credits_cnt;
75 77
76 struct timer_list cmd_timer; 78 struct timer_list cmd_timer;
79 struct timer_list data_timer;
77 80
78 struct workqueue_struct *cmd_wq; 81 struct workqueue_struct *cmd_wq;
79 struct work_struct cmd_work; 82 struct work_struct cmd_work;