diff options
| author | Eric Lapuyade <eric.lapuyade@linux.intel.com> | 2012-06-05 14:42:11 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-07-09 16:42:12 -0400 |
| commit | a10d595b1074d04446f77161eea165e5809e163c (patch) | |
| tree | 4ba305673685b1602cc4ec66083a7c06a1d0b06e /include/net/nfc | |
| parent | eae202aa2083eb6f7fdb686e2c42d7db4ef63632 (diff) | |
| download | op-kernel-dev-a10d595b1074d04446f77161eea165e5809e163c.zip op-kernel-dev-a10d595b1074d04446f77161eea165e5809e163c.tar.gz | |
NFC: Allow HCI driver to pre-open pipes to some gates
Some NFC chips will statically create and open pipes for both standard
and proprietary gates. The driver can now pass this information to HCI
such that HCI will not attempt to create and open them, but will instead
directly use the passed pipe ids.
Signed-off-by: Eric Lapuyade <eric.lapuyade@intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include/net/nfc')
| -rw-r--r-- | include/net/nfc/hci.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/include/net/nfc/hci.h b/include/net/nfc/hci.h index d25dd9b..f5169b0 100644 --- a/include/net/nfc/hci.h +++ b/include/net/nfc/hci.h @@ -44,10 +44,20 @@ struct nfc_hci_ops { struct nfc_target *target); }; -#define NFC_HCI_MAX_CUSTOM_GATES 15 +/* Pipes */ +#define NFC_HCI_INVALID_PIPE 0x80 +#define NFC_HCI_LINK_MGMT_PIPE 0x00 +#define NFC_HCI_ADMIN_PIPE 0x01 + +struct nfc_hci_gate { + u8 gate; + u8 pipe; +}; + +#define NFC_HCI_MAX_CUSTOM_GATES 50 struct nfc_hci_init_data { u8 gate_count; - u8 gates[NFC_HCI_MAX_CUSTOM_GATES]; + struct nfc_hci_gate gates[NFC_HCI_MAX_CUSTOM_GATES]; char session_id[9]; }; @@ -182,7 +192,8 @@ void nfc_hci_event_received(struct nfc_hci_dev *hdev, u8 pipe, u8 event, void nfc_hci_recv_frame(struct nfc_hci_dev *hdev, struct sk_buff *skb); /* connecting to gates and sending hci instructions */ -int nfc_hci_connect_gate(struct nfc_hci_dev *hdev, u8 dest_host, u8 dest_gate); +int nfc_hci_connect_gate(struct nfc_hci_dev *hdev, u8 dest_host, u8 dest_gate, + u8 pipe); int nfc_hci_disconnect_gate(struct nfc_hci_dev *hdev, u8 gate); int nfc_hci_disconnect_all_gates(struct nfc_hci_dev *hdev); int nfc_hci_get_param(struct nfc_hci_dev *hdev, u8 gate, u8 idx, |
