diff options
Diffstat (limited to 'include/net/nfc/nfc.h')
| -rw-r--r-- | include/net/nfc/nfc.h | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/include/net/nfc/nfc.h b/include/net/nfc/nfc.h index 82fc4e4..f68ee68 100644 --- a/include/net/nfc/nfc.h +++ b/include/net/nfc/nfc.h @@ -28,14 +28,9 @@ #include <linux/device.h> #include <linux/skbuff.h> -#define nfc_info(dev, fmt, ...) dev_info((dev), "NFC: " fmt, ##__VA_ARGS__) -#define nfc_err(dev, fmt, ...) dev_err((dev), "NFC: " fmt, ##__VA_ARGS__) - -struct nfc_phy_ops { - int (*write)(void *dev_id, struct sk_buff *skb); - int (*enable)(void *dev_id); - void (*disable)(void *dev_id); -}; +#define nfc_dev_info(dev, fmt, arg...) dev_info((dev), "NFC: " fmt "\n", ## arg) +#define nfc_dev_err(dev, fmt, arg...) dev_err((dev), "NFC: " fmt "\n", ## arg) +#define nfc_dev_dbg(dev, fmt, arg...) dev_dbg((dev), fmt "\n", ## arg) struct nfc_dev; @@ -53,8 +48,6 @@ struct nfc_dev; typedef void (*data_exchange_cb_t)(void *context, struct sk_buff *skb, int err); -typedef void (*se_io_cb_t)(void *context, u8 *apdu, size_t apdu_len, int err); - struct nfc_target; struct nfc_ops { @@ -81,23 +74,12 @@ struct nfc_ops { int (*discover_se)(struct nfc_dev *dev); int (*enable_se)(struct nfc_dev *dev, u32 se_idx); int (*disable_se)(struct nfc_dev *dev, u32 se_idx); - int (*se_io) (struct nfc_dev *dev, u32 se_idx, - u8 *apdu, size_t apdu_length, - se_io_cb_t cb, void *cb_context); }; #define NFC_TARGET_IDX_ANY -1 #define NFC_MAX_GT_LEN 48 #define NFC_ATR_RES_GT_OFFSET 15 -/** - * struct nfc_target - NFC target descriptiom - * - * @sens_res: 2 bytes describing the target SENS_RES response, if the target - * is a type A one. The %sens_res most significant byte must be byte 2 - * as described by the NFC Forum digital specification (i.e. the platform - * configuration one) while %sens_res least significant byte is byte 1. - */ struct nfc_target { u32 idx; u32 supported_protocols; @@ -261,6 +243,5 @@ void nfc_driver_failure(struct nfc_dev *dev, int err); int nfc_add_se(struct nfc_dev *dev, u32 se_idx, u16 type); int nfc_remove_se(struct nfc_dev *dev, u32 se_idx); -struct nfc_se *nfc_find_se(struct nfc_dev *dev, u32 se_idx); #endif /* __NET_NFC_H */ |