NFC: Add ISO/IEC 15693 header definitions

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

Mark A. Greer committed 12 years ago

Commit e487e4d1 parent 35582ad3 files · +15 −1Browse files

Unified · Split

3 files

include/net/nfc/digital.h +4 −0
include/net/nfc/nfc.h +3 −0
include/uapi/linux/nfc.h +8 −1

@@ -35,6 +35,7 @@ enum { · 34 unmodified lines
35	35	NFC_DIGITAL_RF_TECH_106A = 0,
36	36	NFC_DIGITAL_RF_TECH_212F,
37	37	NFC_DIGITAL_RF_TECH_424F,
	38	+ NFC_DIGITAL_RF_TECH_ISO15693,
38	39
39	40	NFC_DIGITAL_RF_TECH_LAST,
40	41	};
@@ -57,6 +58,9 @@ enum { · 16 unmodified lines
57	58	NFC_DIGITAL_FRAMING_NFCF_NFC_DEP,
58	59	NFC_DIGITAL_FRAMING_NFC_DEP_ACTIVATED,
59	60
	61	+ NFC_DIGITAL_FRAMING_ISO15693_INVENTORY,
	62	+ NFC_DIGITAL_FRAMING_ISO15693_TVT, /* Type V Tag (ISO/IEC 15693) */
	63	+
60	64	NFC_DIGITAL_FRAMING_LAST,
61	65	};
62	66

include/net/nfc/nfc.h+3−0

@@ -111,6 +111,9 @@ struct nfc_target { · 110 unmodified lines
111	111	u8 sensf_res[NFC_SENSF_RES_MAXSIZE];
112	112	u8 hci_reader_gate;
113	113	u8 logical_idx;
	114	+ u8 is_iso15693;
	115	+ u8 iso15693_dsfid;
	116	+ u8 iso15693_uid[NFC_ISO15693_UID_MAXSIZE];
114	117	};
115	118
116	119	/**

include/uapi/linux/nfc.h+8−1

@@ -150,6 +150,8 @@ enum nfc_commands { · 149 unmodified lines
150	150	* @NFC_ATTR_SE_TYPE: Secure element type (UICC or EMBEDDED)
151	151	* @NFC_ATTR_FIRMWARE_DOWNLOAD_STATUS: Firmware download operation status
152	152	* @NFC_ATTR_APDU: Secure element APDU
	153	+ * @NFC_ATTR_TARGET_ISO15693_DSFID: ISO 15693 Data Storage Format Identifier
	154	+ * @NFC_ATTR_TARGET_ISO15693_UID: ISO 15693 Unique Identifier
153	155	*/
154	156	enum nfc_attrs {
155	157	NFC_ATTR_UNSPEC,
@@ -178,6 +180,8 @@ enum nfc_attrs { · 22 unmodified lines
178	180	NFC_ATTR_SE_AID,
179	181	NFC_ATTR_FIRMWARE_DOWNLOAD_STATUS,
180	182	NFC_ATTR_SE_APDU,
	183	+ NFC_ATTR_TARGET_ISO15693_DSFID,
	184	+ NFC_ATTR_TARGET_ISO15693_UID,
181	185	/* private: internal use only */
182	186	__NFC_ATTR_AFTER_LAST
183	187	};
@@ -200,6 +204,7 @@ enum nfc_sdp_attr { · 16 unmodified lines
200	204	#define NFC_SENSF_RES_MAXSIZE 18
201	205	#define NFC_GB_MAXSIZE 48
202	206	#define NFC_FIRMWARE_NAME_MAXSIZE 32
	207	+#define NFC_ISO15693_UID_MAXSIZE 8
203	208
204	209	/* NFC protocols */
205	210	#define NFC_PROTO_JEWEL 1
@@ -208,8 +213,9 @@ enum nfc_sdp_attr { · 2 unmodified lines
208	213	#define NFC_PROTO_ISO14443 4
209	214	#define NFC_PROTO_NFC_DEP 5
210	215	#define NFC_PROTO_ISO14443_B 6
	216	+#define NFC_PROTO_ISO15693 7
211	217
212		−#define NFC_PROTO_MAX 7
	218	+#define NFC_PROTO_MAX 8
213	219
214	220	/* NFC communication modes */
215	221	#define NFC_COMM_ACTIVE 0
@@ -227,6 +233,7 @@ enum nfc_sdp_attr { · 11 unmodified lines
227	233	#define NFC_PROTO_ISO14443_MASK (1 << NFC_PROTO_ISO14443)
228	234	#define NFC_PROTO_NFC_DEP_MASK (1 << NFC_PROTO_NFC_DEP)
229	235	#define NFC_PROTO_ISO14443_B_MASK (1 << NFC_PROTO_ISO14443_B)
	236	+#define NFC_PROTO_ISO15693_MASK (1 << NFC_PROTO_ISO15693)
230	237
231	238	/* NFC Secure Elements */
232	239	#define NFC_SE_UICC 0x1