Commit e487e4dc authored by Mark A. Greer's avatar Mark A. Greer Committed by Samuel Ortiz
Browse files

NFC: Add ISO/IEC 15693 header definitions 



Add the header definitions required by upcoming
patches that add support for ISO/IEC 15693.

Signed-off-by: default avatarMark A. Greer <mgreer@animalcreek.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 35582ad9

include/net/nfc/digital.h

+4 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ enum { 
	NFC_DIGITAL_RF_TECH_106A = 0,

	NFC_DIGITAL_RF_TECH_212F,

	NFC_DIGITAL_RF_TECH_424F,

	NFC_DIGITAL_RF_TECH_ISO15693,



	NFC_DIGITAL_RF_TECH_LAST,

};
@@ -57,6 +58,9 @@ enum { 
	NFC_DIGITAL_FRAMING_NFCF_NFC_DEP,

	NFC_DIGITAL_FRAMING_NFC_DEP_ACTIVATED,



	NFC_DIGITAL_FRAMING_ISO15693_INVENTORY,

	NFC_DIGITAL_FRAMING_ISO15693_TVT,	/* Type V Tag (ISO/IEC 15693) */



	NFC_DIGITAL_FRAMING_LAST,

};

include/net/nfc/nfc.h

+3 −0
Original line number Diff line number Diff line
@@ -111,6 +111,9 @@ struct nfc_target { 
	u8 sensf_res[NFC_SENSF_RES_MAXSIZE];

	u8 hci_reader_gate;

	u8 logical_idx;

	u8 is_iso15693;

	u8 iso15693_dsfid;

	u8 iso15693_uid[NFC_ISO15693_UID_MAXSIZE];

};



/**

include/uapi/linux/nfc.h

+8 −1
Original line number Diff line number Diff line
@@ -150,6 +150,8 @@ enum nfc_commands { 
 * @NFC_ATTR_SE_TYPE: Secure element type (UICC or EMBEDDED)

 * @NFC_ATTR_FIRMWARE_DOWNLOAD_STATUS: Firmware download operation status

 * @NFC_ATTR_APDU: Secure element APDU

 * @NFC_ATTR_TARGET_ISO15693_DSFID: ISO 15693 Data Storage Format Identifier

 * @NFC_ATTR_TARGET_ISO15693_UID: ISO 15693 Unique Identifier

 */

enum nfc_attrs {

	NFC_ATTR_UNSPEC,
@@ -178,6 +180,8 @@ enum nfc_attrs { 
	NFC_ATTR_SE_AID,

	NFC_ATTR_FIRMWARE_DOWNLOAD_STATUS,

	NFC_ATTR_SE_APDU,

	NFC_ATTR_TARGET_ISO15693_DSFID,

	NFC_ATTR_TARGET_ISO15693_UID,

/* private: internal use only */

	__NFC_ATTR_AFTER_LAST

};
@@ -200,6 +204,7 @@ enum nfc_sdp_attr { 
#define NFC_SENSF_RES_MAXSIZE 18

#define NFC_GB_MAXSIZE        48

#define NFC_FIRMWARE_NAME_MAXSIZE 32

#define NFC_ISO15693_UID_MAXSIZE 8



/* NFC protocols */

#define NFC_PROTO_JEWEL		1
@@ -208,8 +213,9 @@ enum nfc_sdp_attr { 
#define NFC_PROTO_ISO14443	4

#define NFC_PROTO_NFC_DEP	5

#define NFC_PROTO_ISO14443_B	6

#define NFC_PROTO_ISO15693	7



#define NFC_PROTO_MAX		7

#define NFC_PROTO_MAX		8



/* NFC communication modes */

#define NFC_COMM_ACTIVE  0
@@ -227,6 +233,7 @@ enum nfc_sdp_attr { 
#define NFC_PROTO_ISO14443_MASK	  (1 << NFC_PROTO_ISO14443)

#define NFC_PROTO_NFC_DEP_MASK	  (1 << NFC_PROTO_NFC_DEP)

#define NFC_PROTO_ISO14443_B_MASK (1 << NFC_PROTO_ISO14443_B)

#define NFC_PROTO_ISO15693_MASK	  (1 << NFC_PROTO_ISO15693)



/* NFC Secure Elements */

#define NFC_SE_UICC     0x1