diff options
author | Eric Lapuyade <eric.lapuyade@linux.intel.com> | 2012-09-18 13:45:48 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-09-24 18:17:26 -0400 |
commit | 412fda538f4b1317ecd0fbe6e5bc9124792bea88 (patch) | |
tree | afd09c49880919110dd1dc25027b75a63f8dd169 /include/net/nfc/hci.h | |
parent | 4a61cd6687fc6348d08724676d34e38160d6cf9b (diff) |
NFC: Changed HCI and PN544 HCI driver to use the new HCI LLC Core
The previous shdlc HCI driver and its header are removed from the tree.
PN544 now registers directly with HCI and passes the name of the llc it
requires (shdlc).
HCI instantiation now allocates the required llc instance. The llc is
started when the HCI device is brought up.
Signed-off-by: Eric Lapuyade <eric.lapuyade@intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include/net/nfc/hci.h')
-rw-r--r-- | include/net/nfc/hci.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/nfc/hci.h b/include/net/nfc/hci.h index 6cee6e21fc46..9b5ed2d94d60 100644 --- a/include/net/nfc/hci.h +++ b/include/net/nfc/hci.h | |||
@@ -87,6 +87,8 @@ struct nfc_hci_dev { | |||
87 | 87 | ||
88 | struct nfc_hci_ops *ops; | 88 | struct nfc_hci_ops *ops; |
89 | 89 | ||
90 | struct nfc_llc *llc; | ||
91 | |||
90 | struct nfc_hci_init_data init_data; | 92 | struct nfc_hci_init_data init_data; |
91 | 93 | ||
92 | void *clientdata; | 94 | void *clientdata; |
@@ -113,6 +115,7 @@ struct nfc_hci_dev { | |||
113 | struct nfc_hci_dev *nfc_hci_allocate_device(struct nfc_hci_ops *ops, | 115 | struct nfc_hci_dev *nfc_hci_allocate_device(struct nfc_hci_ops *ops, |
114 | struct nfc_hci_init_data *init_data, | 116 | struct nfc_hci_init_data *init_data, |
115 | u32 protocols, | 117 | u32 protocols, |
118 | const char *llc_name, | ||
116 | int tx_headroom, | 119 | int tx_headroom, |
117 | int tx_tailroom, | 120 | int tx_tailroom, |
118 | int max_link_payload); | 121 | int max_link_payload); |