diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2012-12-19 13:11:32 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-01-09 18:51:54 -0500 |
commit | 390a1bd8538132186ddb679cafe9e75b7ef7e2d2 (patch) | |
tree | 1c548396163a30e0e29f6572cf7b6f0c645085ba /net/nfc/nci | |
parent | 2ad554a502facd705ce6eb362d0f1ac3ca426508 (diff) |
NFC: Initial Secure Element API
Each NFC adapter can have several links to different secure elements and
that property needs to be exported by the drivers.
A secure element link can be enabled and disabled, and card emulation will
be handled by the currently active one. Otherwise card emulation will be
host implemented.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc/nci')
-rw-r--r-- | net/nfc/nci/core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c index 5f98dc1bf039..48ada0ec749e 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c | |||
@@ -658,6 +658,7 @@ static struct nfc_ops nci_nfc_ops = { | |||
658 | */ | 658 | */ |
659 | struct nci_dev *nci_allocate_device(struct nci_ops *ops, | 659 | struct nci_dev *nci_allocate_device(struct nci_ops *ops, |
660 | __u32 supported_protocols, | 660 | __u32 supported_protocols, |
661 | __u32 supported_se, | ||
661 | int tx_headroom, int tx_tailroom) | 662 | int tx_headroom, int tx_tailroom) |
662 | { | 663 | { |
663 | struct nci_dev *ndev; | 664 | struct nci_dev *ndev; |
@@ -680,6 +681,7 @@ struct nci_dev *nci_allocate_device(struct nci_ops *ops, | |||
680 | 681 | ||
681 | ndev->nfc_dev = nfc_allocate_device(&nci_nfc_ops, | 682 | ndev->nfc_dev = nfc_allocate_device(&nci_nfc_ops, |
682 | supported_protocols, | 683 | supported_protocols, |
684 | supported_se, | ||
683 | tx_headroom + NCI_DATA_HDR_SIZE, | 685 | tx_headroom + NCI_DATA_HDR_SIZE, |
684 | tx_tailroom); | 686 | tx_tailroom); |
685 | if (!ndev->nfc_dev) | 687 | if (!ndev->nfc_dev) |