diff options
| author | Christophe Ricard <christophe-h.ricard@st.com> | 2015-10-26 05:55:22 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2015-10-26 05:55:22 +0100 |
| commit | f5876627715e3584db379a0549f8ce6f3f06e2bc (patch) | |
| tree | 7828cb85ecfb4c76249b261bc62ef607686dcca7 /drivers/nfc/st-nci/st-nci.h | |
| parent | a06347c04c13e380afce0c9816df51f00b83faf1 (diff) | |
| download | lwn-f5876627715e3584db379a0549f8ce6f3f06e2bc.tar.gz lwn-f5876627715e3584db379a0549f8ce6f3f06e2bc.zip | |
NFC: st-nci: Align st-nci driver with other nfc driver
Align st-nci driver with other NFC drivers:
- Remove st-nci_ prefix
- Merge se.h in st-nci.h
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc/st-nci/st-nci.h')
| -rw-r--r-- | drivers/nfc/st-nci/st-nci.h | 40 |
1 files changed, 39 insertions, 1 deletions
diff --git a/drivers/nfc/st-nci/st-nci.h b/drivers/nfc/st-nci/st-nci.h index b39b8cc63dcb..90c21eab3058 100644 --- a/drivers/nfc/st-nci/st-nci.h +++ b/drivers/nfc/st-nci/st-nci.h @@ -19,7 +19,6 @@ #ifndef __LOCAL_ST_NCI_H_ #define __LOCAL_ST_NCI_H_ -#include "se.h" #include "ndlc.h" /* Define private flags: */ @@ -28,6 +27,13 @@ #define ST_NCI_CORE_PROP 0x01 #define ST_NCI_SET_NFC_MODE 0x02 +/* + * ref ISO7816-3 chap 8.1. the initial character TS is followed by a + * sequence of at most 32 characters. + */ +#define ST_NCI_ESE_MAX_LENGTH 33 +#define ST_NCI_HCI_HOST_ID_ESE 0xc0 + struct nci_mode_set_cmd { u8 cmd_type; u8 mode; @@ -37,6 +43,23 @@ struct nci_mode_set_rsp { u8 status; } __packed; +struct st_nci_se_info { + u8 atr[ST_NCI_ESE_MAX_LENGTH]; + struct completion req_completion; + + struct timer_list bwi_timer; + int wt_timeout; /* in msecs */ + bool bwi_active; + + struct timer_list se_active_timer; + bool se_active; + + bool xch_error; + + se_io_cb_t cb; + void *cb_context; +}; + struct st_nci_info { struct llt_ndlc *ndlc; unsigned long flags; @@ -47,4 +70,19 @@ void st_nci_remove(struct nci_dev *ndev); int st_nci_probe(struct llt_ndlc *ndlc, int phy_headroom, int phy_tailroom); +int st_nci_se_init(struct nci_dev *ndev); +void st_nci_se_deinit(struct nci_dev *ndev); + +int st_nci_discover_se(struct nci_dev *ndev); +int st_nci_enable_se(struct nci_dev *ndev, u32 se_idx); +int st_nci_disable_se(struct nci_dev *ndev, u32 se_idx); +int st_nci_se_io(struct nci_dev *ndev, u32 se_idx, + u8 *apdu, size_t apdu_length, + se_io_cb_t cb, void *cb_context); +int st_nci_hci_load_session(struct nci_dev *ndev); +void st_nci_hci_event_received(struct nci_dev *ndev, u8 pipe, + u8 event, struct sk_buff *skb); +void st_nci_hci_cmd_received(struct nci_dev *ndev, u8 pipe, u8 cmd, + struct sk_buff *skb); + #endif /* __LOCAL_ST_NCI_H_ */ |