summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-06-24Merge "Fix warnings in HAL."android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Treehugger Robot
2016-06-16Fix warnings in HAL.Jizhou Liao
Fix warnings in HAL. Change-Id: I65367c9d9d90b8cf0897880b01d4930f1a836294
2016-05-13Merge "Adding robustness to t3t callback function"android-wear-n-preview-3android-wear-n-preview-1android-n-preview-4android-n-preview-3Martijn Coenen
2016-05-13Merge "Fix warnings in external/libnfc-nci/src."Martijn Coenen
2016-05-11Merge "Free memory in case of error response"Martijn Coenen
2016-05-11Merge "Support NXP PN551 NFC controller"Martijn Coenen
2016-05-10Support NXP PN551 NFC controllerJizhou Liao
The changes to support PN551 controller: - New firmware download sequence - New build option&configuration file - Remove all warnings - Bug fix Change-Id: Ic7cedf067d2f3c7fa554c93a07bbc1c056ec44cc
2016-05-10Merge "Configure nfc device node through .conf file"Martijn Coenen
2016-05-10Merge "Abort NFC initialization if chip type doesn't match to HAL ↵Martijn Coenen
implemetation."
2016-04-26Configure nfc device node through .conf fileJizhou Liao
NXP_NFC_DEV_NODE is used to specify nfc device node name in libnfc-nxp.conf. Change-Id: I203249c355504a330891788ae7a4013a431d4cf0
2016-04-06Fix warnings in external/libnfc-nci/src.Jizhou Liao
Bug: 205930
2016-03-22Free memory in case of error responseJizhou Liao
In case of NFC_DATA_CEVT with error response, p_data is allocated as p_msg from nfc_main_hal_data_cback(), here to free this buffer to avoid memory leak.
2016-03-02Abort NFC initialization if chip type doesn't match to HAL implemetation.Jizhou Liao
Compare firmware versions on chip and HAL implemetation, if mismatch, abort nfc initialization. Change-Id: I3594e7a94ee927155d92a4b56bf4c732a6aff70a
2016-02-22Merge "Swap LF_T3T_FLAGS bytes for PN548"android-n-preview-2Martijn Coenen
am: a5e3f072ce * commit 'a5e3f072ce6c8ff9cc08f4f600e2cdb460558b81': Swap LF_T3T_FLAGS bytes for PN548
2016-02-22Merge "Swap LF_T3T_FLAGS bytes for PN548"android-n-preview-1Martijn Coenen
2016-02-22Swap LF_T3T_FLAGS bytes for PN548Jizhou Liao
PN548 firmware implements LF_T3T_FLAGS in big endian. As NCI spec required, it should present as little endian. This patch is a workaround to swap LF_T3T_FLAGS byte from little endian to big endian. Bug: 22379408
2016-02-17Merge commit '53494e77309c2ebe58cf8b6347e51ed5494617b3' into HEADBill Yi
2016-02-04Merge "Set RC=1 when only polling for T3T."Martijn Coenen
2016-02-03Set RC=1 when only polling for T3T.Martijn Coenen
According to the NFC Forum Activity spec, controllers must: 1) Poll with RC=0 and SC=FFFF to find NFC-DEP targets 2) Poll with RC=1 and SC=FFFF to find T3T targets Many controllers don't do this yet, and seem to be activating NFC-DEP by default. We can at least fix the scenario where we're not interested in NFC-DEP, by setting RC=1 in that case. Otherwise, keep the default of RC=0. Change-Id: Icc27950c38bf0b0a10fc1325e85e4a526557b641
2016-01-22Merge "libnfc-nci: silence some uninteresting warnings."Elliott Hughes
2016-01-21libnfc-nci: silence some uninteresting warnings.Elliott Hughes
Change-Id: I24c65e8d5fbe80e23d3469a55efe4469c251530c
2016-01-08Merge "Implementation of HCE for NFC-F."Martijn Coenen
am: ae2dabbe32 * commit 'ae2dabbe3237514bf7398333026840d36f458505': Implementation of HCE for NFC-F.
2016-01-08Merge "Implementation of HCE for NFC-F."Martijn Coenen
2015-11-25Merge "Fix rf discover notification type." am: 7d7160dda3Martijn Coenen
am: dc0e6b6249 * commit 'dc0e6b62493b650bed4a26f55a61f50bebf7121c': Fix rf discover notification type.
2015-11-25Merge "Fix rf discover notification type."Martijn Coenen
am: 7d7160dda3 * commit '7d7160dda3b206c4135a0bff1299d2f8d7bfe5ed': Fix rf discover notification type.
2015-11-25Merge "Fix rf discover notification type."Martijn Coenen
2015-11-24Fix rf discover notification type.Martijn Coenen
Should be a UINT8; fix the JNI instead. Change-Id: I0d4fda2015ac0cb9aa517ce01608181a8d59fa84
2015-11-05Don\'t free memory that shouldn\'t be freed. am: 633b73f890Martijn Coenen
am: 53b8f70e4b * commit '53b8f70e4bb222b85f904f26cc04076242e9244c': Don't free memory that shouldn't be freed.
2015-11-05Don\'t free memory that shouldn\'t be freed.android-6.0.1_r68android-6.0.1_r67android-6.0.1_r62android-6.0.1_r54android-6.0.1_r53android-6.0.1_r45android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21marshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devMartijn Coenen
am: 633b73f890 * commit '633b73f8909c8bc52868848399d61fa3b8df3e72': Don't free memory that shouldn't be freed.
2015-11-05Adding robustness to t3t callback functionKen Wahid
Adding NULL pointer checks to fix a couple of suspicious pointer dereference warnings found by the Klocwork source code analysis tool. The same NULL checks exist already in the corresponding t1t and t2t callback functions (in rw_t1t.c and rw_t2t.c respectively). Therefore considered valid and relevant in the t3t function as well. Change-Id: Ib432f7b63647f2dac8683b66067b970e3888d146 Signed-off-by: Ken Wahid <kenx.wahid@intel.com> Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
2015-11-05Merge "Don\'t free memory that shouldn\'t be freed." am: c4ea0a696eMartijn Coenen
am: 30af63ccfe * commit '30af63ccfe160852e82e71f253b7c14986eb8fd5': Don't free memory that shouldn't be freed.
2015-11-05Merge "Don\'t free memory that shouldn\'t be freed."Martijn Coenen
am: c4ea0a696e * commit 'c4ea0a696e0d09c1f69d629e1aa5d49de63d7b1e': Don't free memory that shouldn't be freed.
2015-11-05Merge "Don't free memory that shouldn't be freed."Martijn Coenen
2015-11-05Don't free memory that shouldn't be freed.Martijn Coenen
In case of NFC_ERROR_CEVT, p_data is just a pointer to an uint8_t, and doesn't contain data that needs to be freed. Note that there's a fall-through from NFC_DATA_CEVT above which warrants further investigation, but for now this is the safe fix. Bug: 25489121 Change-Id: Ibab5b42ca9defca04b2310c8d9a441c89f0f722d
2015-11-05Don't free memory that shouldn't be freed.android-6.0.1_r63android-6.0.1_r55android-6.0.1_r5android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r18android-6.0.1_r16marshmallow-dr-dragon-releaseMartijn Coenen
In case of NFC_ERROR_CEVT, p_data is just a pointer to an uint8_t, and doesn't contain data that needs to be freed. Note that there's a fall-through from NFC_DATA_CEVT above which warrants further investigation, but for now this is the safe fix. Bug: 25489121 Change-Id: Ibab5b42ca9defca04b2310c8d9a441c89f0f722d
2015-11-03Merge commit \'02de621133c35cbdb7012866d11cf10627540074\' into HEADBill Yi
am: 59f2e9f65e * commit '59f2e9f65e2549c1fecb2629e821160b5ea934f6':
2015-11-03Merge commit '02de621133c35cbdb7012866d11cf10627540074' into HEADBill Yi
2015-11-03Merge "add PN54x chip selection" am: 8c3bbf44cbMartijn Coenen
am: f644e0182e * commit 'f644e0182e68dd9488594e729408a71dad330f72': add PN54x chip selection
2015-11-03Merge "add PN54x chip selection"Martijn Coenen
am: 8c3bbf44cb * commit '8c3bbf44cbb767b12d79e7402dc8178bd5db07c7': add PN54x chip selection
2015-11-03Merge "add PN54x chip selection"Martijn Coenen
2015-11-02Merge "Fix 256-bit Thinfilm NFC barcode." am: ce926cf46dMartijn Coenen
am: dacb0c215d * commit 'dacb0c215d2423f460ca9e8e716ca3c7328192e0': Fix 256-bit Thinfilm NFC barcode.
2015-11-02Merge "Fix 256-bit Thinfilm NFC barcode."Martijn Coenen
am: ce926cf46d * commit 'ce926cf46d2c8c689df3bbac24edf41f05daee71': Fix 256-bit Thinfilm NFC barcode.
2015-11-02Merge "Fix 256-bit Thinfilm NFC barcode."Martijn Coenen
2015-10-30Fix 256-bit Thinfilm NFC barcode. am: 920423e954Martijn Coenen
am: a6ee33c7cb * commit 'a6ee33c7cbd7987f6333505b3093fe7aa2b84625': Fix 256-bit Thinfilm NFC barcode.
2015-10-30Fix 256-bit Thinfilm NFC barcode.Martijn Coenen
am: 920423e954 * commit '920423e9544a1fa72a682cd2928c2e7ec0f86ba5': Fix 256-bit Thinfilm NFC barcode.
2015-10-30Fix 256-bit Thinfilm NFC barcode.Martijn Coenen
The temporary buffer holding the last part of the activation notification was too small in case of 256-bit Thinfilm tags. Bug: 25385090 Change-Id: I3e8cea9d566050e8eb2eebfd846cbc2047498960
2015-10-30Fix 256-bit Thinfilm NFC barcode.Martijn Coenen
The temporary buffer holding the last part of the activation notification was too small in case of 256-bit Thinfilm tags. Change-Id: I3e8cea9d566050e8eb2eebfd846cbc2047498960
2015-10-14am 0b0bc17e: am f85bfd06: Use global all-cpp-files-underDan Willemsen
* commit '0b0bc17e7ddec16c09573ac7b051578e1df31773': Use global all-cpp-files-under
2015-10-14am f85bfd06: Use global all-cpp-files-underDan Willemsen
* commit 'f85bfd062f4ea7f5348c81cd24d59b8d5772292a': Use global all-cpp-files-under
2015-10-13Use global all-cpp-files-undermarshmallow-mr1-devDan Willemsen
The build system now has a better implementation of all-cpp-files-under Bug: 24204119 Change-Id: I295247b82c1d522f284963df79b94730c1f6017c
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 15:16:19 +0000