diff options
author | Vincent Cuissard <cuissard@marvell.com> | 2014-07-22 21:48:38 +0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2014-09-01 16:40:31 +0400 |
commit | cfdbeeafdbbdbc006f700e92cbad2cb5d4529f3d (patch) | |
tree | ecf3fc7d4cf0203573369febdedd3baced9a1593 /net/nfc/nci/core.c | |
parent | f23b73526b82ca2ef333362e704a51d817c1ffc1 (diff) | |
download | linux-cfdbeeafdbbdbc006f700e92cbad2cb5d4529f3d.tar.xz |
NFC: NCI: Add support of ISO15693
Update nci.h to respect latest NCI specification proposal
(stop using proprietary opcodes). Handle ISO15693 parameters
in NCI_RF_ACTIVATED_NTF handler.
Signed-off-by: Vincent Cuissard <cuissard@marvell.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc/nci/core.c')
-rw-r--r-- | net/nfc/nci/core.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c index 2b400e1a8695..860080803a3e 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c @@ -231,6 +231,14 @@ static void nci_rf_discover_req(struct nci_dev *ndev, unsigned long opt) cmd.num_disc_configs++; } + if ((cmd.num_disc_configs < NCI_MAX_NUM_RF_CONFIGS) && + (protocols & NFC_PROTO_ISO15693_MASK)) { + cmd.disc_configs[cmd.num_disc_configs].rf_tech_and_mode = + NCI_NFC_V_PASSIVE_POLL_MODE; + cmd.disc_configs[cmd.num_disc_configs].frequency = 1; + cmd.num_disc_configs++; + } + nci_send_cmd(ndev, NCI_OP_RF_DISCOVER_CMD, (1 + (cmd.num_disc_configs * sizeof(struct disc_config))), &cmd); |