summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-11-02Fix Mifare plus SL2 detection.Martijn Coenen
Also fixes detection for other tags that are not mifare and not t2t Change-Id: Ia0f2731b967654af5f883f01458413817b5caf57 Signed-off-by: Nick Pelly <npelly@google.com>
2010-11-02Merge "Fixed Mifare classic presence checking" into gingerbreadNick Pelly
2010-11-02Fixed Mifare classic presence checkingMartijn Coenen
Change-Id: I7a1c90f46e669093e7c2d8778d712eeb6e6b7917 Signed-off-by: Nick Pelly <npelly@google.com>
2010-11-02Merge "Fixed ICODE and Felica presence checking." into gingerbreadNick Pelly
2010-11-02Fixed ICODE and Felica presence checking.Martijn Coenen
For Felica, the wrong command was used. For ICODE (ISO15693), there was no check implemented at all Change-Id: I40b17feb8b9184cc3c2765cb5b32ea82ebec143b
2010-11-02Fix the parameters to phFriNfc_Llcp_EncodeMIUX.Jeff Hamilton
Change-Id: Ia0426198d0edd325edcc2bb5a3c6d7d623e28a9f
2010-11-01Revert "Disable P2P target 106 kbit/s mode."Jeff Hamilton
This reverts commit 4c03147f9df22103145e67ce1d7faece051e0bfb. Change-Id: I44496a47a98367b88ae69d019d363bd0fa962611
2010-11-01Fixed LLCP socket options storage.Sylvain Fonteneau
Socket options are now copied in the libnfc to avoid referencing a pointer that may not be valid during the whole socket life cycle. Change-Id: I7266164bf157242df1ce7fb7a0f9cffd52938140 Signed-off-by: Nick Pelly <npelly@google.com>
2010-11-01Use new PN544_SET_PWR ioctlNick Pelly
Change-Id: I2d8d981d01d1e0f035d3dd3485d62dd26028b8ba Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-28Fixed LLCP Service Name matching failure.Sylvain Fonteneau
Service Name is now copied in the libnfc to avoid referencing a pointer that may not be valid during the whole socket life. Change-Id: I6572366ac51502d189cc8f1350fa089c11cc2bea
2010-10-28Avoid overrun when setting timer.Sylvain Fonteneau
Change-Id: I27ef4ab66c1b3a9ed4eb668125cda36f7cccd4a7
2010-10-28Patch from NXP. New Dal implementationJeff Hamilton
Change-Id: Ib9fe02224daa65a59a87fcd7b5cd8506fca0f3ab
2010-10-28Patch from NXP. Libnfc - Download,Reset mode management and driver ↵Jeff Hamilton
workaround with delay Change-Id: I736e5f50db749c9570b24194fe3963efbacc5c52
2010-10-27Assign names to reader and writer thread so its easier to debug them.Nick Pelly
Change-Id: I2580675e2002546ac28a6a3a5ced7683af9448d9 Signed-off-by: Nick Pelly <npelly@google.com>
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-15NFC: Move NFC service jni from external/libnfc-nxp to packages/apps/Nfc.Nick Pelly
This was a temporary location. It is now in packages/apps/Nfc. Change-Id: I44033bb99fe1998496fc9d27f5f4f153d6e28348 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-10-12Update libnfc_nxp_jni for new NFC API.Nick Pelly
Change-Id: I77b123a2bf1aeb958629e93670475c5e7c0563d3 Signed-off-by: Nick Pelly <npelly@google.com>
2010-09-28Modify Android.mk for JNI.Nick Pelly
Change-Id: I08897e1c75193db5a9661164899cc502afb7816b Signed-off-by: Nick Pelly <npelly@google.com>
2010-09-27Check in libnfc-jni to external/libnfc-nxp temporarily.Nick Pelly
libnfc-jni will eventually move to packages/apps/Nfc/jni or similar. Source: Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010) Change-Id: If81874a731fdd4089d856b2147578c5762d183a8 Signed-off-by: Nick Pelly <npelly@google.com>
2010-09-24Cleanup Android.mkNick Pelly
Add LOCAL_MODULE_TAGS to Android.mk Remove noisy log. Change-Id: Id6a6b76b7dc6f5138cbdbe12caae9c249f2f4c5a Signed-off-by: Nick Pelly <npelly@google.com>
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>
2010-09-23new project, first commitAnatol Pomazau