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 (1 of 195 files). Show all

Unified · Split

include/uapi/linux/nfc.h+24−13
@@ -5,20 +5,17 @@ · 4 unmodified lines
5 * Lauro Ramos Venancio <lauro.venancio@openbossa.org>5 * Lauro Ramos Venancio <lauro.venancio@openbossa.org>
6 * Aloisio Almeida Jr <aloisio.almeida@openbossa.org>6 * Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
7 *7 *
8 * This program is free software; you can redistribute it and/or modify8 * Permission to use, copy, modify, and/or distribute this software for any
9 * it under the terms of the GNU General Public License as published by9 * purpose with or without fee is hereby granted, provided that the above
10 * the Free Software Foundation; either version 2 of the License, or10 * copyright notice and this permission notice appear in all copies.
11 * (at your option) any later version.
12 *11 *
13 * This program is distributed in the hope that it will be useful,12 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of13 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the14 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
16 * GNU General Public License for more details.15 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
17 *16 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
18 * You should have received a copy of the GNU General Public License17 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
19 * along with this program; if not, write to the18 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
20 * Free Software Foundation, Inc.,
21 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
22 */19 */
23 20
24#ifndef __LINUX_NFC_H21#ifndef __LINUX_NFC_H
@@ -67,6 +64,11 @@ · 42 unmodified lines
67 * subsequent CONNECT and CC messages.64 * subsequent CONNECT and CC messages.
68 * If one of the passed parameters is wrong none is set and -EINVAL is65 * If one of the passed parameters is wrong none is set and -EINVAL is
69 * returned.66 * 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.
70 */72 */
71enum nfc_commands {73enum nfc_commands {
72 NFC_CMD_UNSPEC,74 NFC_CMD_UNSPEC,
@@ -86,6 +88,8 @@ enum nfc_commands { · 13 unmodified lines
86 NFC_EVENT_TM_DEACTIVATED,88 NFC_EVENT_TM_DEACTIVATED,
87 NFC_CMD_LLC_GET_PARAMS,89 NFC_CMD_LLC_GET_PARAMS,
88 NFC_CMD_LLC_SET_PARAMS,90 NFC_CMD_LLC_SET_PARAMS,
91 NFC_CMD_ENABLE_SE,
92 NFC_CMD_DISABLE_SE,
89/* private: internal use only */93/* private: internal use only */
90 __NFC_CMD_AFTER_LAST94 __NFC_CMD_AFTER_LAST
91};95};
@@ -114,6 +118,7 @@ enum nfc_commands { · 22 unmodified lines
114 * @NFC_ATTR_LLC_PARAM_LTO: Link TimeOut parameter118 * @NFC_ATTR_LLC_PARAM_LTO: Link TimeOut parameter
115 * @NFC_ATTR_LLC_PARAM_RW: Receive Window size parameter119 * @NFC_ATTR_LLC_PARAM_RW: Receive Window size parameter
116 * @NFC_ATTR_LLC_PARAM_MIUX: MIU eXtension parameter120 * @NFC_ATTR_LLC_PARAM_MIUX: MIU eXtension parameter
121 * @NFC_ATTR_SE: Available Secure Elements
117 */122 */
118enum nfc_attrs {123enum nfc_attrs {
119 NFC_ATTR_UNSPEC,124 NFC_ATTR_UNSPEC,
@@ -134,6 +139,7 @@ enum nfc_attrs { · 14 unmodified lines
134 NFC_ATTR_LLC_PARAM_LTO,139 NFC_ATTR_LLC_PARAM_LTO,
135 NFC_ATTR_LLC_PARAM_RW,140 NFC_ATTR_LLC_PARAM_RW,
136 NFC_ATTR_LLC_PARAM_MIUX,141 NFC_ATTR_LLC_PARAM_MIUX,
142 NFC_ATTR_SE,
137/* private: internal use only */143/* private: internal use only */
138 __NFC_ATTR_AFTER_LAST144 __NFC_ATTR_AFTER_LAST
139};145};
@@ -172,6 +178,11 @@ enum nfc_attrs { · 32 unmodified lines
172#define NFC_PROTO_NFC_DEP_MASK (1 << NFC_PROTO_NFC_DEP)178#define NFC_PROTO_NFC_DEP_MASK (1 << NFC_PROTO_NFC_DEP)
173#define NFC_PROTO_ISO14443_B_MASK (1 << NFC_PROTO_ISO14443_B)179#define NFC_PROTO_ISO14443_B_MASK (1 << NFC_PROTO_ISO14443_B)
174 180
181/* NFC Secure Elements */
182#define NFC_SE_NONE 0x0
183#define NFC_SE_UICC 0x1
184#define NFC_SE_EMBEDDED 0x2
185
175struct sockaddr_nfc {186struct sockaddr_nfc {
176 sa_family_t sa_family;187 sa_family_t sa_family;
177 __u32 dev_idx;188 __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