History

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

John W. Linville committed 13 years ago

Commit 87bc0722 parents f421436 01925ef186 files · +15085 −4189Browse files

Showing the changes to include/uapi/linux (1 of 186 files). Show all

Unified · Split

include/uapi/linux/nfc.h+4−0
@@ -85,6 +85,7 @@ · 84 unmodified lines
85 * a specific SE notifies us about the end of a transaction. The parameter85 * a specific SE notifies us about the end of a transaction. The parameter
86 * for this event is the application ID (AID).86 * for this event is the application ID (AID).
87 * @NFC_CMD_GET_SE: Dump all discovered secure elements from an NFC controller.87 * @NFC_CMD_GET_SE: Dump all discovered secure elements from an NFC controller.
88 * @NFC_CMD_SE_IO: Send/Receive APDUs to/from the selected secure element.
88 */89 */
89enum nfc_commands {90enum nfc_commands {
90 NFC_CMD_UNSPEC,91 NFC_CMD_UNSPEC,
@@ -114,6 +115,7 @@ enum nfc_commands { · 23 unmodified lines
114 NFC_EVENT_SE_CONNECTIVITY,115 NFC_EVENT_SE_CONNECTIVITY,
115 NFC_EVENT_SE_TRANSACTION,116 NFC_EVENT_SE_TRANSACTION,
116 NFC_CMD_GET_SE,117 NFC_CMD_GET_SE,
118 NFC_CMD_SE_IO,
117/* private: internal use only */119/* private: internal use only */
118 __NFC_CMD_AFTER_LAST120 __NFC_CMD_AFTER_LAST
119};121};
@@ -147,6 +149,7 @@ enum nfc_commands { · 27 unmodified lines
147 * @NFC_ATTR_SE_INDEX: Secure element index149 * @NFC_ATTR_SE_INDEX: Secure element index
148 * @NFC_ATTR_SE_TYPE: Secure element type (UICC or EMBEDDED)150 * @NFC_ATTR_SE_TYPE: Secure element type (UICC or EMBEDDED)
149 * @NFC_ATTR_FIRMWARE_DOWNLOAD_STATUS: Firmware download operation status151 * @NFC_ATTR_FIRMWARE_DOWNLOAD_STATUS: Firmware download operation status
152 * @NFC_ATTR_APDU: Secure element APDU
150 */153 */
151enum nfc_attrs {154enum nfc_attrs {
152 NFC_ATTR_UNSPEC,155 NFC_ATTR_UNSPEC,
@@ -174,6 +177,7 @@ enum nfc_attrs { · 21 unmodified lines
174 NFC_ATTR_SE_TYPE,177 NFC_ATTR_SE_TYPE,
175 NFC_ATTR_SE_AID,178 NFC_ATTR_SE_AID,
176 NFC_ATTR_FIRMWARE_DOWNLOAD_STATUS,179 NFC_ATTR_FIRMWARE_DOWNLOAD_STATUS,
180 NFC_ATTR_SE_APDU,
177/* private: internal use only */181/* private: internal use only */
178 __NFC_ATTR_AFTER_LAST182 __NFC_ATTR_AFTER_LAST
179};183};