Samuel Ortiz <sameo@linux.intel.com> says: "NFC: 3.16: First pull request This is the NFC pull request for 3.16. We have: - STMicroeectronics st21nfca support. The st21nfca is an HCI chipset and thus relies on the HCI stack. This submission provides support for tag redaer/writer mode (including Type 5) and device tree bindings. - PM runtime support and a bunch of bug fixes for TI's trf7970a. - Device tree support for NXP's pn544. Legacy platform data support is obviously kept intact. - NFC Tag type 4B support to the NFC Digital stack. - SOCK_RAW type support to the raw NFC socket, and allow NCI sniffing from that. This can be extended to report HCI frames and also proprietarry ones like e.g. the pn533 ones."
Showing the changes to include/uapi/linux (1 of 28 files). Show all
Unified · Split
| @@ -273,11 +273,19 @@ struct sockaddr_nfc_llcp { · 272 unmodified lines | |||
| 273 | * First byte is the adapter index | 273 | * First byte is the adapter index |
| 274 | * Second byte contains flags | 274 | * Second byte contains flags |
| 275 | * - 0x01 - Direction (0=RX, 1=TX) | 275 | * - 0x01 - Direction (0=RX, 1=TX) |
| 276 | * - 0x02-0x80 - Reserved | 276 | * - 0x02-0x04 - Payload type (000=LLCP, 001=NCI, 010=HCI, 011=Digital, |
| 277 | * 100=Proprietary) | ||
| 278 | * - 0x05-0x80 - Reserved | ||
| 277 | **/ | 279 | **/ |
| 278 | #define NFC_LLCP_RAW_HEADER_SIZE 2 | 280 | #define NFC_RAW_HEADER_SIZE 2 |
| 279 | #define NFC_LLCP_DIRECTION_RX 0x00 | 281 | #define NFC_DIRECTION_RX 0x00 |
| 280 | #define NFC_LLCP_DIRECTION_TX 0x01 | 282 | #define NFC_DIRECTION_TX 0x01 |
| 283 | |||
| 284 | #define RAW_PAYLOAD_LLCP 0 | ||
| 285 | #define RAW_PAYLOAD_NCI 1 | ||
| 286 | #define RAW_PAYLOAD_HCI 2 | ||
| 287 | #define RAW_PAYLOAD_DIGITAL 3 | ||
| 288 | #define RAW_PAYLOAD_PROPRIETARY 4 | ||
| 281 | 289 | ||
| 282 | /* socket option names */ | 290 | /* socket option names */ |
| 283 | #define NFC_LLCP_RW 0 | 291 | #define NFC_LLCP_RW 0 |