summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-09-25Fix fail to write RF parametersmarshmallow-dr-devJizhou Liao
Whenever receive invalid param respons during RF parameter update, this recovery mechanism includes dummy firmware download followed by firmware download and then re-update RF parameters. Bug: 24196800 Change-Id: I8e47a86ff98a9ca8c30be52c231fd284cd825f4d
2015-09-22add recovery mechanism on CORE_RESET_NTFJizhou Liao
The recovery re-init NFC by keeping configuration. This recovers P2P issue while CORE_RESET_NTF is received. Bug: 23520630 Change-Id: If2296558064029972b61823861d47e47400cc8dc
2015-09-07Finalize .conf fileJizhou Liao
Change-Id: Idbcc0f0b300a17b6463c821c6e14752ad176ea49
2015-08-28Add Mifare Classic support.Jizhou Liao
This patch is to support NXP Mifare Classic tag. Bug: 23618022 Change-Id: I36009fdf3614043a32beca4aaf2f320ba17fb40c
2015-08-21Fix stuck issue on Kovio barcodeJizhou Liao
Fix stack stuck issue if disabling Nfc when kovio barcode is just detecting. Change-Id: I5e77e1772c3211436fea5279233f26c139e8313f
2015-08-20Adding MiFARE DESFire format supportJizhou Liao
This patch is to support formatting MiFARE DESFire tag to NDEF compatible Type 4 tag Change-Id: I86b549de6836ff4a90f3d0394d2b3c112da141f1
2015-08-20Merge "Fix ISO15693 tag crash issue" into mnc-dr-devMartijn Coenen
2015-08-19Handle notification type value 1 in RF_DISCOVER_NTFJizhou Liao
Both notification type value 1 and 0 are treated as last notification Change-Id: I5e291009694c79269376833edc7cdbbb8a3b6841
2015-08-19Fix Mifare Classic presence check.Martijn Coenen
And basically any other Nfc-A tag which is not a Type 2 Tag. Change-Id: Id70d8b29837dc26dd0e45cd9e5473e64b2ac1062
2015-08-18Fix ISO15693 tag crash issueJizhou Liao
Set error flag to indicate there is an error on ISO15693 transaction. Change-Id: I5bb5d8449d095c98055d990867da945786d9254f
2015-08-07Merge "Bump libnfc-nci version for M." into mnc-dr-devMartijn Coenen
2015-08-07Bump libnfc-nci version for M.Martijn Coenen
Bug: 22675241 Change-Id: I662a5b557738139c19f2f9fbcabab88992d48f74
2015-08-03Fix conflict vendor proprietary Protocol and Discovery technology definitionsJizhou Liao
A new configuration option is added. Vendor should provide their own definition in libnfc-brcm.conf file. Change-Id: I8204fbb97bcb59ecf7b450b701546646e1952a78
2015-08-03Add Peer-To-Peer priority mechanismJizhou Liao
Most of NFC devices support card emulation now, there is a chance that the remote NFC device is detected as a card not peer device. This peer-to-peer priority mechanism will always try to establish peer-to-peer connection than card emulation Peer-To-Peer priority mechanism works only if NFCC is running in bail out mode. The configuration option NFA_POLL_BAIL_OUT_MODE is to define the mode of NFCC. Change-Id: I45a099efa77fab132189ea92da97a90240cfba1d
2015-08-03ISO-DEP presence check workaroundJizhou Liao
Not all ISO-DEP tags will response empty I-Block as presence check command. This workaround replaces empty I-Block command to NXP proprietay presence check command. Change-Id: Ie1625f323840ab92b508cc2a1521365517c7a4a3
2015-07-23Avoid routing table update if nothing changed.Jizhou Liao
Switch screen on/off always trigger tech route and protocol route update. This will rewrite entire routing table even if there is no change at all. Change-Id: I8d7e1cb0dff5b81a48f21eb2fa9e38c4839811b7
2015-07-20Update customized settings to eeprom after firmware downloadJizhou Liao
The customized RF, clock settings have to be updated to eeprom after firmware download Change-Id: I5261590206b0cc15587fc8c6ea240b97b91da429
2015-07-20T1T HR0 and HR1 parameters missing.Jizhou Liao
There should be RID command to get HR0 and HR1 parameters. This patch adds RID to fix this problem. (DO NOT MERGE) Change-Id: I88d901ce204eb1bb8ba72702396f536282bfa65c
2015-07-15Memory leak and NULL pointer check fixes.Jizhou Liao
Change-Id: Idf720890d5b0307d22407b3a28929b8a72d4404f
2015-06-29Add NFC-DEP routingandroid-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r4android-6.0.0_r3android-6.0.0_r2android-6.0.0_r1marshmallow-releasemarshmallow-devmarshmallow-cts-releaseJizhou Liao
NFC-DEP Protocol route should be added to routing table Change-Id: I02695add26bd9588853054ac2ac318852152b679
2015-05-20Adding NXP NCI Hal implementation (DO NOT MERGE.)Jizhou Liao
This patch includes Hal implementation of NXP's NCI based NFC controller. Change-Id: I6ee7fac309aebb52ae3d7c197685df729751ee52
2015-04-16Merge "Fix <string.h> include."master-soongMartijn Coenen
2015-04-16Fix <string.h> include.Martijn Coenen
Change-Id: Icca59d428459c241b20eb69975fc8a355ee9692a
2015-04-16Merge "Bump LLCP version to 1.2"Martijn Coenen
2015-04-16Merge "Add system prop for enabling protocol logging"Martijn Coenen
2015-04-15Bump LLCP version to 1.2Martijn Coenen
Also expose peer LLCP version in API. Change-Id: I8e353c1e2f7b5574a9c190c329c8a38115c58c34
2015-04-15Add system prop for enabling protocol loggingAndres Morales
Change-Id: I6e398cb4b64902cb5d2ed63d5729d2ed1b211c6d
2015-03-18Merge "Add NOTICE and MODULE_LICENSE"android-wear-5.1.1_r1android-wear-5.1.0_r1Conley Owens
2015-03-12Add NOTICE and MODULE_LICENSEConley Owens
Change-Id: I153dcd68c3f8e37329b03177f5426ad9eacb4bee
2015-01-30am 33fc4b74: Merge "Add missing includes."Elliott Hughes
* commit '33fc4b74e29f4857d06b56d8bec42f887ca4e8e7': Add missing includes.
2015-01-30Merge "Add missing includes."Elliott Hughes
2015-01-29Add missing includes.Elliott Hughes
Change-Id: I710c99bc17c7a94bf037ee0a105e08aa0d69de9f
2015-01-28am 734ebfac: Merge "Add missing includes."Elliott Hughes
* commit '734ebfacc51fb53541e182b72d1aad33b565c7fc': Add missing includes.
2015-01-28Merge "Add missing includes."Elliott Hughes
2015-01-28Add missing includes.Elliott Hughes
Change-Id: I0f8b11edd715eecd1b189329fef4fa959152a022
2014-12-16am 9e3ff8f6: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang
* commit '9e3ff8f62fa9376643002c233d03f594fa171167': Cleanup Obsolete LOCAL_PRELINK_MODULE.
2014-12-16Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang
2014-12-16Cleanup Obsolete LOCAL_PRELINK_MODULE.Ying Wang
Bug: 18675947 Change-Id: Id4f526f82065ddc0300943ccafab52cdf09f2838
2014-11-17am 97dff702: Merge "Move libnfc-nci to libc++."Dan Albert
* commit '97dff702b35992d4df2b6e479de857c57835da54': Move libnfc-nci to libc++.
2014-11-17Merge "Move libnfc-nci to libc++."android-wear-5.0.0_r1lollipop-wear-releaseDan Albert
2014-11-15Move libnfc-nci to libc++.Dan Albert
Bug: 15193147 Change-Id: I57ad8bfc82bca3b27fcc545992788bcbbed3616e
2014-10-26am 26617dd4: am 90186191: Merge "Don\'t set a pthread_t to NULL"Martijn Coenen
* commit '26617dd4be8ba02b95833d41a7414fec49b6b8bb':
2014-10-26am 25318f32: am 4b981bc8: Merge "Fix Clang compilation errors."Chih-Hung Hsieh
* commit '25318f3270d4784fdcd686d18ab351f27688de94':
2014-10-26am 324f25d9: am ed2d14c1: Merge "Fix null pointer dereference." into lmp-devMartijn Coenen
* commit '324f25d95f9ab9cef0eca8ea12bcb4541f8c5060':
2014-10-26am c2e8691c: resolved conflicts for merge of efd44c45 to lmp-dev-plus-aospDan Albert
* commit 'c2e8691cc3f7f04fe2258b83c91b25f5ba1208d6':
2014-10-20am 90186191: Merge "Don\'t set a pthread_t to NULL"Martijn Coenen
* commit '901861912ee63d9a0208ea9ecfc07931945d4743': Don't set a pthread_t to NULL
2014-10-20am 90186191: Merge "Don\'t set a pthread_t to NULL"Martijn Coenen
* commit '901861912ee63d9a0208ea9ecfc07931945d4743': Don't set a pthread_t to NULL
2014-10-20Merge "Don't set a pthread_t to NULL"Martijn Coenen
2014-10-10am 4b981bc8: Merge "Fix Clang compilation errors."Chih-Hung Hsieh
* commit '4b981bc81b0c1c3588c393a79b9f222f1b62a291': Fix Clang compilation errors.
2014-10-10am 4b981bc8: Merge "Fix Clang compilation errors."Chih-Hung Hsieh
* commit '4b981bc81b0c1c3588c393a79b9f222f1b62a291': Fix Clang compilation errors.