History

Merge remote-tracking branch 'wireless-next/master' into HEAD

Johannes Berg committed 13 years ago

Commit 448cd552 parents 3b4797b 9ebea38195 files · +12015 −3487Browse files

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

Unified · Split

include/uapi/linux/nfc.h+24−13
@@ -5,20 +5,17 @@ · 4 unmodified lines
55 * Lauro Ramos Venancio <lauro.venancio@openbossa.org>
66 * Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
77 *
8− * This program is free software; you can redistribute it and/or modify
9− * it under the terms of the GNU General Public License as published by
10− * the Free Software Foundation; either version 2 of the License, or
11− * (at your option) any later version.
8+ * Permission to use, copy, modify, and/or distribute this software for any
9+ * purpose with or without fee is hereby granted, provided that the above
10+ * copyright notice and this permission notice appear in all copies.
1211 *
13− * This program is distributed in the hope that it will be useful,
14− * but WITHOUT ANY WARRANTY; without even the implied warranty of
15− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16− * GNU General Public License for more details.
17− *
18− * You should have received a copy of the GNU General Public License
19− * along with this program; if not, write to the
20− * Free Software Foundation, Inc.,
21− * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
12+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
13+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
14+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
15+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
16+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
17+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
18+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
2219 */
2320
2421 #ifndef __LINUX_NFC_H
@@ -67,6 +64,11 @@ · 42 unmodified lines
6764 * subsequent CONNECT and CC messages.
6865 * If one of the passed parameters is wrong none is set and -EINVAL is
6966 * returned.
67+ * @NFC_CMD_ENABLE_SE: Enable the physical link to a specific secure element.
68+ * Once enabled a secure element will handle card emulation mode, i.e.
69+ * starting a poll from a device which has a secure element enabled means
70+ * we want to do SE based card emulation.
71+ * @NFC_CMD_DISABLE_SE: Disable the physical link to a specific secure element.
7072 */
7173 enum nfc_commands {
7274 NFC_CMD_UNSPEC,
@@ -86,6 +88,8 @@ enum nfc_commands { · 13 unmodified lines
8688 NFC_EVENT_TM_DEACTIVATED,
8789 NFC_CMD_LLC_GET_PARAMS,
8890 NFC_CMD_LLC_SET_PARAMS,
91+ NFC_CMD_ENABLE_SE,
92+ NFC_CMD_DISABLE_SE,
8993 /* private: internal use only */
9094 __NFC_CMD_AFTER_LAST
9195 };
@@ -114,6 +118,7 @@ enum nfc_commands { · 22 unmodified lines
114118 * @NFC_ATTR_LLC_PARAM_LTO: Link TimeOut parameter
115119 * @NFC_ATTR_LLC_PARAM_RW: Receive Window size parameter
116120 * @NFC_ATTR_LLC_PARAM_MIUX: MIU eXtension parameter
121+ * @NFC_ATTR_SE: Available Secure Elements
117122 */
118123 enum nfc_attrs {
119124 NFC_ATTR_UNSPEC,
@@ -134,6 +139,7 @@ enum nfc_attrs { · 14 unmodified lines
134139 NFC_ATTR_LLC_PARAM_LTO,
135140 NFC_ATTR_LLC_PARAM_RW,
136141 NFC_ATTR_LLC_PARAM_MIUX,
142+ NFC_ATTR_SE,
137143 /* private: internal use only */
138144 __NFC_ATTR_AFTER_LAST
139145 };
@@ -172,6 +178,11 @@ enum nfc_attrs { · 32 unmodified lines
172178 #define NFC_PROTO_NFC_DEP_MASK (1 << NFC_PROTO_NFC_DEP)
173179 #define NFC_PROTO_ISO14443_B_MASK (1 << NFC_PROTO_ISO14443_B)
174180
181+/* NFC Secure Elements */
182+#define NFC_SE_NONE 0x0
183+#define NFC_SE_UICC 0x1
184+#define NFC_SE_EMBEDDED 0x2
185+
175186 struct sockaddr_nfc {
176187 sa_family_t sa_family;
177188 __u32 dev_idx;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t