Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts: drivers/net/wireless/iwlwifi/iwl-testmode.c include/net/nfc/nfc.h net/nfc/netlink.c net/wireless/nl80211.c
This commit is contained in:
John W. Linville
198
include/net/nfc/hci.h
Normal file
198
include/net/nfc/hci.h
Normal file
@@ -0,0 +1,198 @@
|
||||
/*
|
||||
* Copyright (C) 2011 Intel Corporation. All rights reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the
|
||||
* Free Software Foundation, Inc.,
|
||||
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#ifndef __NET_HCI_H
|
||||
#define __NET_HCI_H
|
||||
|
||||
#include <linux/skbuff.h>
|
||||
|
||||
#include <net/nfc/nfc.h>
|
||||
|
||||
struct nfc_hci_dev;
|
||||
|
||||
struct nfc_hci_ops {
|
||||
int (*open) (struct nfc_hci_dev *hdev);
|
||||
void (*close) (struct nfc_hci_dev *hdev);
|
||||
int (*hci_ready) (struct nfc_hci_dev *hdev);
|
||||
int (*xmit) (struct nfc_hci_dev *hdev, struct sk_buff *skb);
|
||||
int (*start_poll) (struct nfc_hci_dev *hdev, u32 protocols);
|
||||
int (*target_from_gate) (struct nfc_hci_dev *hdev, u8 gate,
|
||||
struct nfc_target *target);
|
||||
int (*complete_target_discovered) (struct nfc_hci_dev *hdev, u8 gate,
|
||||
struct nfc_target *target);
|
||||
int (*data_exchange) (struct nfc_hci_dev *hdev,
|
||||
struct nfc_target *target,
|
||||
struct sk_buff *skb, struct sk_buff **res_skb);
|
||||
};
|
||||
|
||||
#define NFC_HCI_MAX_CUSTOM_GATES 15
|
||||
struct nfc_hci_init_data {
|
||||
u8 gate_count;
|
||||
u8 gates[NFC_HCI_MAX_CUSTOM_GATES];
|
||||
char session_id[9];
|
||||
};
|
||||
|
||||
typedef int (*xmit) (struct sk_buff *skb, void *cb_data);
|
||||
|
||||
#define NFC_HCI_MAX_GATES 256
|
||||
|
||||
struct nfc_hci_dev {
|
||||
struct nfc_dev *ndev;
|
||||
|
||||
u32 max_data_link_payload;
|
||||
|
||||
struct mutex msg_tx_mutex;
|
||||
|
||||
struct list_head msg_tx_queue;
|
||||
|
||||
struct workqueue_struct *msg_tx_wq;
|
||||
struct work_struct msg_tx_work;
|
||||
|
||||
struct timer_list cmd_timer;
|
||||
struct hci_msg *cmd_pending_msg;
|
||||
|
||||
struct sk_buff_head rx_hcp_frags;
|
||||
|
||||
struct workqueue_struct *msg_rx_wq;
|
||||
struct work_struct msg_rx_work;
|
||||
|
||||
struct sk_buff_head msg_rx_queue;
|
||||
|
||||
struct nfc_hci_ops *ops;
|
||||
|
||||
struct nfc_hci_init_data init_data;
|
||||
|
||||
void *clientdata;
|
||||
|
||||
u8 gate2pipe[NFC_HCI_MAX_GATES];
|
||||
|
||||
bool poll_started;
|
||||
struct nfc_target *targets;
|
||||
int target_count;
|
||||
|
||||
u8 sw_romlib;
|
||||
u8 sw_patch;
|
||||
u8 sw_flashlib_major;
|
||||
u8 sw_flashlib_minor;
|
||||
|
||||
u8 hw_derivative;
|
||||
u8 hw_version;
|
||||
u8 hw_mpw;
|
||||
u8 hw_software;
|
||||
u8 hw_bsid;
|
||||
};
|
||||
|
||||
/* hci device allocation */
|
||||
struct nfc_hci_dev *nfc_hci_allocate_device(struct nfc_hci_ops *ops,
|
||||
struct nfc_hci_init_data *init_data,
|
||||
u32 protocols,
|
||||
int tx_headroom,
|
||||
int tx_tailroom,
|
||||
int max_link_payload);
|
||||
void nfc_hci_free_device(struct nfc_hci_dev *hdev);
|
||||
|
||||
int nfc_hci_register_device(struct nfc_hci_dev *hdev);
|
||||
void nfc_hci_unregister_device(struct nfc_hci_dev *hdev);
|
||||
|
||||
void nfc_hci_set_clientdata(struct nfc_hci_dev *hdev, void *clientdata);
|
||||
void *nfc_hci_get_clientdata(struct nfc_hci_dev *hdev);
|
||||
|
||||
/* Host IDs */
|
||||
#define NFC_HCI_HOST_CONTROLLER_ID 0x00
|
||||
#define NFC_HCI_TERMINAL_HOST_ID 0x01
|
||||
#define NFC_HCI_UICC_HOST_ID 0x02
|
||||
|
||||
/* Host Controller Gates and registry indexes */
|
||||
#define NFC_HCI_ADMIN_GATE 0x00
|
||||
#define NFC_HCI_ADMIN_SESSION_IDENTITY 0x01
|
||||
#define NFC_HCI_ADMIN_MAX_PIPE 0x02
|
||||
#define NFC_HCI_ADMIN_WHITELIST 0x03
|
||||
#define NFC_HCI_ADMIN_HOST_LIST 0x04
|
||||
|
||||
#define NFC_HCI_LOOPBACK_GATE 0x04
|
||||
|
||||
#define NFC_HCI_ID_MGMT_GATE 0x05
|
||||
#define NFC_HCI_ID_MGMT_VERSION_SW 0x01
|
||||
#define NFC_HCI_ID_MGMT_VERSION_HW 0x03
|
||||
#define NFC_HCI_ID_MGMT_VENDOR_NAME 0x04
|
||||
#define NFC_HCI_ID_MGMT_MODEL_ID 0x05
|
||||
#define NFC_HCI_ID_MGMT_HCI_VERSION 0x02
|
||||
#define NFC_HCI_ID_MGMT_GATES_LIST 0x06
|
||||
|
||||
#define NFC_HCI_LINK_MGMT_GATE 0x06
|
||||
#define NFC_HCI_LINK_MGMT_REC_ERROR 0x01
|
||||
|
||||
#define NFC_HCI_RF_READER_B_GATE 0x11
|
||||
#define NFC_HCI_RF_READER_B_PUPI 0x03
|
||||
#define NFC_HCI_RF_READER_B_APPLICATION_DATA 0x04
|
||||
#define NFC_HCI_RF_READER_B_AFI 0x02
|
||||
#define NFC_HCI_RF_READER_B_HIGHER_LAYER_RESPONSE 0x01
|
||||
#define NFC_HCI_RF_READER_B_HIGHER_LAYER_DATA 0x05
|
||||
|
||||
#define NFC_HCI_RF_READER_A_GATE 0x13
|
||||
#define NFC_HCI_RF_READER_A_UID 0x02
|
||||
#define NFC_HCI_RF_READER_A_ATQA 0x04
|
||||
#define NFC_HCI_RF_READER_A_APPLICATION_DATA 0x05
|
||||
#define NFC_HCI_RF_READER_A_SAK 0x03
|
||||
#define NFC_HCI_RF_READER_A_FWI_SFGT 0x06
|
||||
#define NFC_HCI_RF_READER_A_DATARATE_MAX 0x01
|
||||
|
||||
#define NFC_HCI_TYPE_A_SEL_PROT(x) (((x) & 0x60) >> 5)
|
||||
#define NFC_HCI_TYPE_A_SEL_PROT_MIFARE 0
|
||||
#define NFC_HCI_TYPE_A_SEL_PROT_ISO14443 1
|
||||
#define NFC_HCI_TYPE_A_SEL_PROT_DEP 2
|
||||
#define NFC_HCI_TYPE_A_SEL_PROT_ISO14443_DEP 3
|
||||
|
||||
/* Generic events */
|
||||
#define NFC_HCI_EVT_HCI_END_OF_OPERATION 0x01
|
||||
#define NFC_HCI_EVT_POST_DATA 0x02
|
||||
#define NFC_HCI_EVT_HOT_PLUG 0x03
|
||||
|
||||
/* Reader RF gates events */
|
||||
#define NFC_HCI_EVT_READER_REQUESTED 0x10
|
||||
#define NFC_HCI_EVT_END_OPERATION 0x11
|
||||
|
||||
/* Reader Application gate events */
|
||||
#define NFC_HCI_EVT_TARGET_DISCOVERED 0x10
|
||||
|
||||
/* receiving messages from lower layer */
|
||||
void nfc_hci_resp_received(struct nfc_hci_dev *hdev, u8 result,
|
||||
struct sk_buff *skb);
|
||||
void nfc_hci_cmd_received(struct nfc_hci_dev *hdev, u8 pipe, u8 cmd,
|
||||
struct sk_buff *skb);
|
||||
void nfc_hci_event_received(struct nfc_hci_dev *hdev, u8 pipe, u8 event,
|
||||
struct sk_buff *skb);
|
||||
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_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,
|
||||
struct sk_buff **skb);
|
||||
int nfc_hci_set_param(struct nfc_hci_dev *hdev, u8 gate, u8 idx,
|
||||
const u8 *param, size_t param_len);
|
||||
int nfc_hci_send_cmd(struct nfc_hci_dev *hdev, u8 gate, u8 cmd,
|
||||
const u8 *param, size_t param_len, struct sk_buff **skb);
|
||||
int nfc_hci_send_response(struct nfc_hci_dev *hdev, u8 gate, u8 response,
|
||||
const u8 *param, size_t param_len);
|
||||
int nfc_hci_send_event(struct nfc_hci_dev *hdev, u8 gate, u8 event,
|
||||
const u8 *param, size_t param_len);
|
||||
|
||||
#endif /* __NET_HCI_H */
|
||||
@@ -62,10 +62,12 @@ struct nfc_ops {
|
||||
int (*data_exchange)(struct nfc_dev *dev, u32 target_idx,
|
||||
struct sk_buff *skb, data_exchange_cb_t cb,
|
||||
void *cb_context);
|
||||
int (*check_presence)(struct nfc_dev *dev, u32 target_idx);
|
||||
};
|
||||
|
||||
#define NFC_TARGET_IDX_ANY -1
|
||||
#define NFC_MAX_GT_LEN 48
|
||||
#define NFC_TARGET_IDX_NONE 0xffffffff
|
||||
|
||||
struct nfc_target {
|
||||
u32 idx;
|
||||
@@ -78,6 +80,8 @@ struct nfc_target {
|
||||
u8 sensb_res[NFC_SENSB_RES_MAXSIZE];
|
||||
u8 sensf_res_len;
|
||||
u8 sensf_res[NFC_SENSF_RES_MAXSIZE];
|
||||
u8 hci_reader_gate;
|
||||
u8 logical_idx;
|
||||
};
|
||||
|
||||
struct nfc_genl_data {
|
||||
@@ -87,6 +91,7 @@ struct nfc_genl_data {
|
||||
|
||||
struct nfc_dev {
|
||||
unsigned int idx;
|
||||
u32 target_next_idx;
|
||||
struct nfc_target *targets;
|
||||
int n_targets;
|
||||
int targets_generation;
|
||||
@@ -94,7 +99,7 @@ struct nfc_dev {
|
||||
struct device dev;
|
||||
bool dev_up;
|
||||
bool polling;
|
||||
bool remote_activated;
|
||||
u32 activated_target_idx;
|
||||
bool dep_link_up;
|
||||
u32 dep_rf_mode;
|
||||
struct nfc_genl_data genl_data;
|
||||
@@ -103,6 +108,10 @@ struct nfc_dev {
|
||||
int tx_headroom;
|
||||
int tx_tailroom;
|
||||
|
||||
struct timer_list check_pres_timer;
|
||||
struct workqueue_struct *check_pres_wq;
|
||||
struct work_struct check_pres_work;
|
||||
|
||||
struct nfc_ops *ops;
|
||||
};
|
||||
#define to_nfc_dev(_dev) container_of(_dev, struct nfc_dev, dev)
|
||||
@@ -181,6 +190,7 @@ int nfc_set_remote_general_bytes(struct nfc_dev *dev,
|
||||
|
||||
int nfc_targets_found(struct nfc_dev *dev,
|
||||
struct nfc_target *targets, int ntargets);
|
||||
int nfc_target_lost(struct nfc_dev *dev, u32 target_idx);
|
||||
|
||||
int nfc_dep_link_is_up(struct nfc_dev *dev, u32 target_idx,
|
||||
u8 comm_mode, u8 rf_mode);
|
||||
|
||||
104
include/net/nfc/shdlc.h
Normal file
104
include/net/nfc/shdlc.h
Normal file
@@ -0,0 +1,104 @@
|
||||
/*
|
||||
* Copyright (C) 2012 Intel Corporation. All rights reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the
|
||||
* Free Software Foundation, Inc.,
|
||||
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#ifndef __NFC_SHDLC_H
|
||||
#define __NFC_SHDLC_H
|
||||
|
||||
struct nfc_shdlc;
|
||||
|
||||
struct nfc_shdlc_ops {
|
||||
int (*open) (struct nfc_shdlc *shdlc);
|
||||
void (*close) (struct nfc_shdlc *shdlc);
|
||||
int (*hci_ready) (struct nfc_shdlc *shdlc);
|
||||
int (*xmit) (struct nfc_shdlc *shdlc, struct sk_buff *skb);
|
||||
int (*start_poll) (struct nfc_shdlc *shdlc, u32 protocols);
|
||||
int (*target_from_gate) (struct nfc_shdlc *shdlc, u8 gate,
|
||||
struct nfc_target *target);
|
||||
int (*complete_target_discovered) (struct nfc_shdlc *shdlc, u8 gate,
|
||||
struct nfc_target *target);
|
||||
int (*data_exchange) (struct nfc_shdlc *shdlc,
|
||||
struct nfc_target *target,
|
||||
struct sk_buff *skb, struct sk_buff **res_skb);
|
||||
};
|
||||
|
||||
enum shdlc_state {
|
||||
SHDLC_DISCONNECTED = 0,
|
||||
SHDLC_CONNECTING = 1,
|
||||
SHDLC_NEGOCIATING = 2,
|
||||
SHDLC_CONNECTED = 3
|
||||
};
|
||||
|
||||
struct nfc_shdlc {
|
||||
struct mutex state_mutex;
|
||||
enum shdlc_state state;
|
||||
int hard_fault;
|
||||
|
||||
struct nfc_hci_dev *hdev;
|
||||
|
||||
wait_queue_head_t *connect_wq;
|
||||
int connect_tries;
|
||||
int connect_result;
|
||||
struct timer_list connect_timer;/* aka T3 in spec 10.6.1 */
|
||||
|
||||
u8 w; /* window size */
|
||||
bool srej_support;
|
||||
|
||||
struct timer_list t1_timer; /* send ack timeout */
|
||||
bool t1_active;
|
||||
|
||||
struct timer_list t2_timer; /* guard/retransmit timeout */
|
||||
bool t2_active;
|
||||
|
||||
int ns; /* next seq num for send */
|
||||
int nr; /* next expected seq num for receive */
|
||||
int dnr; /* oldest sent unacked seq num */
|
||||
|
||||
struct sk_buff_head rcv_q;
|
||||
|
||||
struct sk_buff_head send_q;
|
||||
bool rnr; /* other side is not ready to receive */
|
||||
|
||||
struct sk_buff_head ack_pending_q;
|
||||
|
||||
struct workqueue_struct *sm_wq;
|
||||
struct work_struct sm_work;
|
||||
|
||||
struct nfc_shdlc_ops *ops;
|
||||
|
||||
int client_headroom;
|
||||
int client_tailroom;
|
||||
|
||||
void *clientdata;
|
||||
};
|
||||
|
||||
void nfc_shdlc_recv_frame(struct nfc_shdlc *shdlc, struct sk_buff *skb);
|
||||
|
||||
struct nfc_shdlc *nfc_shdlc_allocate(struct nfc_shdlc_ops *ops,
|
||||
struct nfc_hci_init_data *init_data,
|
||||
u32 protocols,
|
||||
int tx_headroom, int tx_tailroom,
|
||||
int max_link_payload, const char *devname);
|
||||
|
||||
void nfc_shdlc_free(struct nfc_shdlc *shdlc);
|
||||
|
||||
void nfc_shdlc_set_clientdata(struct nfc_shdlc *shdlc, void *clientdata);
|
||||
void *nfc_shdlc_get_clientdata(struct nfc_shdlc *shdlc);
|
||||
struct nfc_hci_dev *nfc_shdlc_get_hci_dev(struct nfc_shdlc *shdlc);
|
||||
|
||||
#endif /* __NFC_SHDLC_H */
|
||||
Reference in New Issue
Block a user