diff options
author | Christophe Ricard <christophe.ricard@gmail.com> | 2014-03-25 01:51:48 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2014-04-21 18:37:26 -0400 |
commit | d330905db608ff416a241e97c7f3b91103bfd827 (patch) | |
tree | 03c075c1ba3d1073be6102f3a3157233e3b7129b /net/nfc | |
parent | 68957303f44a501af5cf37913208a2acaa6bcdf1 (diff) |
NFC: hci: Extend command execution delay
Extend it up to the maximum FWI value 4949 ms defined by the
ISO14443-3 specification.
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc')
-rw-r--r-- | net/nfc/hci/command.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/nfc/hci/command.c b/net/nfc/hci/command.c index a9f4d2e62d8d..677d24bb70f8 100644 --- a/net/nfc/hci/command.c +++ b/net/nfc/hci/command.c | |||
@@ -26,6 +26,8 @@ | |||
26 | 26 | ||
27 | #include "hci.h" | 27 | #include "hci.h" |
28 | 28 | ||
29 | #define MAX_FWI 4949 | ||
30 | |||
29 | static int nfc_hci_execute_cmd_async(struct nfc_hci_dev *hdev, u8 pipe, u8 cmd, | 31 | static int nfc_hci_execute_cmd_async(struct nfc_hci_dev *hdev, u8 pipe, u8 cmd, |
30 | const u8 *param, size_t param_len, | 32 | const u8 *param, size_t param_len, |
31 | data_exchange_cb_t cb, void *cb_context) | 33 | data_exchange_cb_t cb, void *cb_context) |
@@ -37,7 +39,7 @@ static int nfc_hci_execute_cmd_async(struct nfc_hci_dev *hdev, u8 pipe, u8 cmd, | |||
37 | * for all commands? | 39 | * for all commands? |
38 | */ | 40 | */ |
39 | return nfc_hci_hcp_message_tx(hdev, pipe, NFC_HCI_HCP_COMMAND, cmd, | 41 | return nfc_hci_hcp_message_tx(hdev, pipe, NFC_HCI_HCP_COMMAND, cmd, |
40 | param, param_len, cb, cb_context, 3000); | 42 | param, param_len, cb, cb_context, MAX_FWI); |
41 | } | 43 | } |
42 | 44 | ||
43 | /* | 45 | /* |
@@ -82,7 +84,7 @@ static int nfc_hci_execute_cmd(struct nfc_hci_dev *hdev, u8 pipe, u8 cmd, | |||
82 | NFC_HCI_HCP_COMMAND, cmd, | 84 | NFC_HCI_HCP_COMMAND, cmd, |
83 | param, param_len, | 85 | param, param_len, |
84 | nfc_hci_execute_cb, &hcp_ew, | 86 | nfc_hci_execute_cb, &hcp_ew, |
85 | 3000); | 87 | MAX_FWI); |
86 | if (hcp_ew.exec_result < 0) | 88 | if (hcp_ew.exec_result < 0) |
87 | return hcp_ew.exec_result; | 89 | return hcp_ew.exec_result; |
88 | 90 | ||