diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/net/nfc/nci.h | 30 | ||||
-rw-r--r-- | include/net/nfc/nci_core.h | 3 |
2 files changed, 33 insertions, 0 deletions
diff --git a/include/net/nfc/nci.h b/include/net/nfc/nci.h index 230f227bb319..deac78b9a53c 100644 --- a/include/net/nfc/nci.h +++ b/include/net/nfc/nci.h | |||
@@ -243,6 +243,26 @@ struct nci_core_set_config_cmd { | |||
243 | struct set_config_param param; /* support 1 param per cmd is enough */ | 243 | struct set_config_param param; /* support 1 param per cmd is enough */ |
244 | } __packed; | 244 | } __packed; |
245 | 245 | ||
246 | #define NCI_OP_CORE_CONN_CREATE_CMD nci_opcode_pack(NCI_GID_CORE, 0x04) | ||
247 | struct dest_spec_params { | ||
248 | __u8 id; | ||
249 | __u8 protocol; | ||
250 | } __packed; | ||
251 | |||
252 | struct core_conn_create_dest_spec_params { | ||
253 | __u8 type; | ||
254 | __u8 length; | ||
255 | struct dest_spec_params value; | ||
256 | } __packed; | ||
257 | |||
258 | struct nci_core_conn_create_cmd { | ||
259 | __u8 destination_type; | ||
260 | __u8 number_destination_params; | ||
261 | struct core_conn_create_dest_spec_params params; | ||
262 | } __packed; | ||
263 | |||
264 | #define NCI_OP_CORE_CONN_CLOSE_CMD nci_opcode_pack(NCI_GID_CORE, 0x05) | ||
265 | |||
246 | #define NCI_OP_RF_DISCOVER_MAP_CMD nci_opcode_pack(NCI_GID_RF_MGMT, 0x00) | 266 | #define NCI_OP_RF_DISCOVER_MAP_CMD nci_opcode_pack(NCI_GID_RF_MGMT, 0x00) |
247 | struct disc_map_config { | 267 | struct disc_map_config { |
248 | __u8 rf_protocol; | 268 | __u8 rf_protocol; |
@@ -327,6 +347,16 @@ struct nci_core_set_config_rsp { | |||
327 | __u8 params_id[0]; /* variable size array */ | 347 | __u8 params_id[0]; /* variable size array */ |
328 | } __packed; | 348 | } __packed; |
329 | 349 | ||
350 | #define NCI_OP_CORE_CONN_CREATE_RSP nci_opcode_pack(NCI_GID_CORE, 0x04) | ||
351 | struct nci_core_conn_create_rsp { | ||
352 | __u8 status; | ||
353 | __u8 max_ctrl_pkt_payload_len; | ||
354 | __u8 credits; | ||
355 | __u8 conn_id; | ||
356 | } __packed; | ||
357 | |||
358 | #define NCI_OP_CORE_CONN_CLOSE_RSP nci_opcode_pack(NCI_GID_CORE, 0x05) | ||
359 | |||
330 | #define NCI_OP_RF_DISCOVER_MAP_RSP nci_opcode_pack(NCI_GID_RF_MGMT, 0x00) | 360 | #define NCI_OP_RF_DISCOVER_MAP_RSP nci_opcode_pack(NCI_GID_RF_MGMT, 0x00) |
331 | 361 | ||
332 | #define NCI_OP_RF_DISCOVER_RSP nci_opcode_pack(NCI_GID_RF_MGMT, 0x03) | 362 | #define NCI_OP_RF_DISCOVER_RSP nci_opcode_pack(NCI_GID_RF_MGMT, 0x03) |
diff --git a/include/net/nfc/nci_core.h b/include/net/nfc/nci_core.h index 6cf6ee2b696d..8ba3e38e4167 100644 --- a/include/net/nfc/nci_core.h +++ b/include/net/nfc/nci_core.h | |||
@@ -186,6 +186,9 @@ int nci_set_config(struct nci_dev *ndev, __u8 id, size_t len, __u8 *val); | |||
186 | 186 | ||
187 | int nci_nfcee_discover(struct nci_dev *ndev, u8 action); | 187 | int nci_nfcee_discover(struct nci_dev *ndev, u8 action); |
188 | int nci_nfcee_mode_set(struct nci_dev *ndev, u8 nfcee_id, u8 nfcee_mode); | 188 | int nci_nfcee_mode_set(struct nci_dev *ndev, u8 nfcee_id, u8 nfcee_mode); |
189 | int nci_core_conn_create(struct nci_dev *ndev, | ||
190 | struct core_conn_create_dest_spec_params *params); | ||
191 | int nci_core_conn_close(struct nci_dev *ndev, u8 conn_id); | ||
189 | 192 | ||
190 | static inline struct sk_buff *nci_skb_alloc(struct nci_dev *ndev, | 193 | static inline struct sk_buff *nci_skb_alloc(struct nci_dev *ndev, |
191 | unsigned int len, | 194 | unsigned int len, |