summaryrefslogtreecommitdiff
path: root/inc
AgeCommit message (Collapse)Author
2014-03-21libnfc-nxp: fix build for 64-bitColin Cross
Turn off unused parameter warnings to unclutter the build output When storing an int in a void*, use intptr_t to cast between them Store pointer handles in an intptr_t or a uintptr_t Change-Id: If48290ca23dd295f1a87220c5b1d5232ebdc8d45
2012-11-27Increase default IsoDep timeout to 1200ms.Martijn Coenen
An increasing number of IsoDep tags in the field requires more than 600ms to respond to initial NDEF commands. To make sure we can detect these tags properly, increase the default timeout for IsoDep to ~1200ms. Bug: 7600632 Change-Id: I690e2c1993b64c0f639423d5cf0c810f56ad1197
2012-08-23Add support for target-customized NFC stack configurationSebastian Niciarz
This patch allows inclusion of target-customized configuration of NFC stack. The target-specific configuration will be stored in a header file, outside of AOSP. To have it icluded, define TARGET_HAS_NFC_CUSTOM_CONFIG macro and export your header file using BUILD_COPY_HEADERS macro. Change-Id: Ifa2d08c2ae8860c3f0690a04c517025892bd4c16 Author: Sebastian Niciarz <sebastian.niciarz@intel.com> Signed-off-by: Sebastian Niciarz <sebastian.niciarz@intel.com> Singed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 23071
2012-02-17(DEBUG) Add support for setting p2p modes.Martijn Coenen
Change-Id: Ic6df1fc458cef2531119e5e5e2ef5f9a7b21a524
2012-01-27Increase internal LLCP buffers to fit max MIUSunil Jogi
Interal buffer increased to 2178 = 3 (max LLCP header size) + 128 (default MIU) + 2047 (max MIU) Change-Id: I3cc2ff705e74ae657d93b5e50a577b0e7e5ebfcf
2012-01-27LLCP 1.1 implementation.Sunil Jogi
Previously, in LLCP v1.0, the only way to use the SDP (Service Discovery Protocol) service was to send a CONNECT frame containing the Service Name to the SDP service. This was implicitly preforming a connection request to the requested service. LLCP v1.1 introduced a way to discover services more efficiently and without implicit connection. It also enables connectionless services to have a service name. It is based on a new protocol based on a new SNL frame containing discovery requests and responses. This update comes with new APIs: - phLibNfc_Llcp_DiscoverServices() function can be used to discover remote services. It can take multiple service names and resolve all of them in a single call. - Register service name at bind time. Cache LLCP service name/sap pairs. In LLCP 1.1 specification defines at section 5.9 that any service lookup answer must be valid for the whole LLCP session duration. To enforce this, we cache the SAP/SN pairs locally and make sure that the applications don't break the cache. The stack remains fully retro-compatible with v1.0 devices. Change-Id: I052edd3838013cee65e7415d0ed01fc3e9cad36d
2011-11-03Use NFC HAL for some libnfc settings.android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0.3_r2android-cts-4.0.3_r1ics-mr1Martijn Coenen
The NFC HAL in libhardware allows us to store and retrieve product-specific settings. This patch moves two product-specific settings to the HAL: the device port, and the usage of the i2c workaround we had for crespo. This means configuring the port no longer needs to be done from JNI land. Change-Id: I2e19b6f188f808bc2f2a1f1abc28f2a6c47e6a4c
2011-10-25Use a 10s timeout in uart_read() in FW download mode.Nick Pelly
This provides a path to flush RX, necessary when we enter FW download mode with bogus data already in RX. This fixes a problem where NFC was dead on several HSPA and LTE devices. Also decrease FW timeout completition from 120s to 60s. Typically FW download takes 30s, and 120 is unnecessarily large and causes a long delay to bring up NFC when we need to retry FW. Bug: 5468674 Change-Id: I0fd40c199daac861fe5acda4f2d214bdcff8e869
2011-09-20Manual port of 6900b4 from gingerbread:Rob von Behren
Patch to add Secure Download Mechanism in the libnfc This patch permit to support secure download update and also to avoid locking states in case of download failures Bug: 5331837 Change-Id: Ia5b6d9baf57231b0193bbbe85c88c7df557017c6
2011-07-25Increase number of LLCP sockets from 5 to 10.Martijn Coenen
We currently have 3 server sockets open (snep, npp, bluetooth); I found that when we traverse from snep to npp (as a fallback), then do bluetooth, we run out of sockets (NFCSTATUS_INSUFFICIENT_RESOURCES is returned on socket creation). This is because cleanup of the sockets is asynchronous and the previous 2 sockets may still be disconnecting. Increasing to 10 should be enough for ICS purposes. Change-Id: I803da4cbcc97e7c5b736bf7276d2bbb7136c6dc3
2011-06-28am 51c0ca53: am f1612434: am 967359c8: Patch to support the new PN544 ↵Daniel Tomas
firmware events * commit '51c0ca53011b86464dcf14aeb33944a69861a8f4': Patch to support the new PN544 firmware events
2011-06-28Patch to add the windowing support in the libnfcDaniel Tomas
This patch enables windowing of LLC packets send from chipset to host. The host will now wait for up to 4 LLC packets from the chipset before sending an ACK (S-Frame RR). Change-Id: I6a70e1d780847a104e3ec8e403593a69e222aec9
2011-06-28Patch to support the new PN544 firmware eventsandroid-cts-2.3_r5Daniel Tomas
Change-Id: I6e5a976721fb52f2da30081276bb2ac15d27d186
2011-06-27libnfc spring cleaningNick Pelly
o Fix most libnfc warnings, from 360 to 18 o Make DAL_DEBUG much less verbose and more useful o Clean up Android.mk Done with minimal textual diff to minimize merge conflicts. Change-Id: I918645500723ff7bb092ad9959628fcabac45bec
2011-06-09Make NfcA timeout configurable in libnfc.Martijn Coenen
Adds an interface for setting the NfcA timeout, which is called "mifare raw" in libnfc. Also changed the default, since it was set to only 2 ms, which is too short for most commands. Current setting is around 600ms. Change-Id: I00ccd85cd47a70895a3aca0f0bc34e1b0eab82c7
2011-05-23Update P2P Modes.Nick Pelly
o Fix DEFAULT_NFCIP_INITIATOR_MODE_SUPPORT, DEFAULT_NFCIP_TARGET_MODE_SUPPORT to allow all possible modes (actual modes selected by Nfc.apk). o Fix phNfc_eP2PMode_t enum to list initiator modes. Change-Id: I841b6f1387ac536f47d357a0430eb9362b419810
2011-04-15Enable P2P 106 passive (again).Nick Pelly
Disabling P2P 106 passive caused a large P2P discovery regression. Change-Id: I9856ba1a29cd717da2f578abd073b341c54fce36
2011-03-18Disable P2P target 106 passive mode.Nick Pelly
P2P target 106 passive appears as an ISO 14443-3A target to reader/writers in the field. This can confuse some terminals, especially when we also have card emulation turned on, since it looks like we have two -3A targets in the field. P2P target 106 passive is just one of many P2P sub-modes. We do not know of any P2P devices that only initiate using only 106 passive, so this should not present inter-op issues. Change-Id: I1cb84ed791a86a7f225a51806e99bab031dcb6ca
2011-03-11Fix a compilation bug with PHDBG_TRACES enabled.Jeff Hamilton
Change-Id: I6f3a96b9b063b66f735ff97c1aa63aaaad0a03b9
2011-01-18Change the default IsoDep timeout to 300ms.Martijn Coenen
Change-Id: Idcbf0ab9b982b66c39b68762129766e16017558c
2011-01-05Libnfc updated to just notify the JNI when a transaction event is detecteddaniel_tomas
Change-Id: Id2991644e9a45a66172377d66b5dc3e99bbd6a39
2010-12-16Add support for connecting to different handles on the same tag.Martijn Coenen
This is needed for proper multi-protocol tag support. (Before this required a restart of the polling loop). Change-Id: If61da437cda40d82bdbacf5a01ea4c585c7a5be9
2010-12-09Download feature added in the libnfcdaniel_Tomas
Change-Id: Idfed8c90453a0acc7fa632f62a1e20617b4ae7f6
2010-12-09Enable P2P 106 for P2P without SMX.Nick Pelly
Change-Id: Ica5158d1851fe56a896b6a0d8d714d8aa9d6b029
2010-12-08Fix to increase the response timeout for the Secure Elementdaniel_Tomas
Change-Id: I150411fb826525ae30cbe36e2be9afb1f20deb19
2010-12-05Enable SMX and Disable P2P Target 106daniel_Tomas
Change-Id: I2bef50244d216d76f3f81df20e4f0b2cddea3d86
2010-12-05Secure Element access implementationDaniel Tomas
Change-Id: I5a34e5318d60d04cbb4f43bcba7a146c2ef9eed5
2010-12-05Enable P2P feature again.Nick Pelly
This is effectively a revert of previous commit "Fix to disable P2P...", except I have not reverted the DEFAULT_SESSION since that would encourage reuse of 'goog4'. Change-Id: I8d42a7496cf6776cfd41e73f5ec25953773ceb09 Signed-off-by: Nick Pelly <npelly@google.com>
2010-11-03Fix to disable P2P feature in the libnfcandroid-cts-2.3_r1android-2.3_r1android-2.3.2_r1android-2.3.1_r1Daniel Tomas
Change-Id: I6bbabdd141962dd60ff7fadc39fc047be15b055e Signed-off-by: Nick Pelly <npelly@google.com>
2010-11-03HCI timer enabled to HW reset NFC when HCI command times out.Daniel Tomas
Change-Id: Iee39957227fcdc8e97b520d22032dc97915323f3 Signed-off-by: Nick Pelly <npelly@google.com>
2010-11-03fixed ISO15693 collisionaferir
Change-Id: Ic27ec9adbdffb064f03f567b160b05502def2444
2010-11-01Revert "Disable P2P target 106 kbit/s mode."Jeff Hamilton
This reverts commit 4c03147f9df22103145e67ce1d7faece051e0bfb. Change-Id: I44496a47a98367b88ae69d019d363bd0fa962611
2010-10-26Disable P2P target 106 kbit/s mode.Sylvain Fonteneau
NFC_IP mode controls the P2P modes that the PN544 operates in. This change turns off 106kb/s passive (P2P target mode). The reason for this change is that enabling P2P target at 106 kb/s can interfere with card emulation. Some 106kb/s card readers will enumerate the pn544 as two distinct targets if we have 106kb/s card emulation and 106kb/s P2P target, and they will then refuse to talk to us. So this is basically for legacy support of 106kb/s card emulation. NXP advise that it is a common change to disable 106kb/s P2P target. We still enable 212kb/s and 424kb/s P2P target. Secondly, we need to choose a different session ID to force the pn544 to apply this new configuration (instead of just loading the previous from EEPROM). Change-Id: I2847c04bb028b857223439dc1f9f6252162913c4 Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-12STANDBY mode and Polling loopgoodsc.lee
Change-Id: Ib6563a94b29c7eb9de6615881eadbdf0e94994c8 S5PC11X: NFC: Enable the STANDBY mode and add enableDiscovery and disableDiscovery for polling loop.
2010-09-23Initial libnfc checkinNick Pelly
Source: Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010) Change-Id: Ie47f18423f949a8d3e0815d13f55c814312add24 Signed-off-by: Nick Pelly <npelly@google.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 20:12:59 +0000