These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / nfc / st-nci / ndlc.h

diff --git a/kernel/drivers/nfc/st21nfcb/ndlc.h b/kernel/drivers/nfc/st-nci/ndlc.h
similarity index 85%
rename from kernel/drivers/nfc/st21nfcb/ndlc.h
rename to kernel/drivers/nfc/st-nci/ndlc.h
index b28140e..bdf78ff 100644 (file)
--- a/kernel/drivers/nfc/st21nfcb/ndlc.h
+++ b/kernel/drivers/nfc/st-nci/ndlc.h
@@ -1,7 +1,7 @@
 /*
  * NCI based Driver for STMicroelectronics NFC Chip
  *
- * Copyright (C) 2014  STMicroelectronics SAS. All rights reserved.
+ * Copyright (C) 2014-2015  STMicroelectronics SAS. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -22,6 +22,8 @@
 #include <linux/skbuff.h>
 #include <net/nfc/nfc.h>
 
+struct st_nci_se_status;
+
 /* Low Level Transport description */
 struct llt_ndlc {
        struct nci_dev *ndev;
@@ -43,10 +45,11 @@ struct llt_ndlc {
        struct device *dev;
 
        /*
-        * < 0 if hardware error occured
+        * < 0 if hardware error occurred
         * and prevents normal operation.
         */
        int hard_fault;
+       int powered;
 };
 
 int ndlc_open(struct llt_ndlc *ndlc);
@@ -54,6 +57,7 @@ void ndlc_close(struct llt_ndlc *ndlc);
 int ndlc_send(struct llt_ndlc *ndlc, struct sk_buff *skb);
 void ndlc_recv(struct llt_ndlc *ndlc, struct sk_buff *skb);
 int ndlc_probe(void *phy_id, struct nfc_phy_ops *phy_ops, struct device *dev,
-       int phy_headroom, int phy_tailroom, struct llt_ndlc **ndlc_id);
+              int phy_headroom, int phy_tailroom, struct llt_ndlc **ndlc_id,
+              struct st_nci_se_status *se_status);
 void ndlc_remove(struct llt_ndlc *ndlc);
 #endif /* __LOCAL_NDLC_H__ */