Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5876627 authored by Christophe Ricard's avatar Christophe Ricard Committed by Samuel Ortiz
Browse files

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: default avatarChristophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent a06347c0

drivers/nfc/st-nci/core.c

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <linux/delay.h>



#include "st-nci.h"

#include "se.h"



#define DRIVER_DESC "NCI NFC driver for ST_NCI"

drivers/nfc/st-nci/se.c

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <net/nfc/nci_core.h>



#include "st-nci.h"

#include "se.h"



struct st_nci_pipe_info {

	u8 pipe_state;

drivers/nfc/st-nci/se.h

deleted100644 → 0
+0 −61
Original line number Diff line number Diff line 
/*

 * Secure Element Driver for STMicroelectronics NFC NCI Chip

 *

 * 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,

 * version 2, as published by the Free Software Foundation.

 *

 * 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, see <http://www.gnu.org/licenses/>.

 */

#ifndef __LOCAL_ST_NCI_SE_H_

#define __LOCAL_ST_NCI_SE_H_



/*

 * 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 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;

};



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_SE_H_ */

drivers/nfc/st-nci/st-nci.h

+39 −1
Original line number Diff line number Diff line
@@ -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_ */