summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Properly handle missing firmwaresreplicant-4.2-0002replicant-4.2-0001Paul Kocialkowski2013-11-112-2/+13
| | | | | Change-Id: I9f732f6e1ded628ab24cae6cfb18aa3d6d527201 Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
* Merge tag 'android-4.2.2_r1' of ↵Steve Kondik2013-02-122-2/+14
|\ | | | | | | | | | | https://android.googlesource.com/platform/external/libnfc-nxp into 1.1 Android 4.2.2 release 1
| * Merge "NDEF Type 3 tag reading with padding bytes" into jb-mr1.1-devMartijn Coenen2012-11-281-1/+13
| |\
| | * NDEF Type 3 tag reading with padding bytesSunil Jogi2012-11-271-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | NDEF Type 3 tag reading was not ignoring the padding bytes, which leads to failure of parsing the NDEF data. This patch fix that problem. Bug: 7600630 Change-Id: I45cf1841bdc343503a8a12d622ac8470c3e64ce4
| * | Increase default IsoDep timeout to 1200ms.Martijn Coenen2012-11-271-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | 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
* | libnfc-nxp: Add alternate firmware pathSteve Kondik2013-02-061-2/+6
| | | | | | | | | | | | | | * Check in /system/lib for firmware as well, so we can be bug-for-bug compatible with OEMs. Change-Id: Iea350c3d0a58a1f6012c2a088f8ba6fed4b10365
* | Merge branch 'jb-mr1-release' of ↵Steve Kondik2012-12-277-27/+42
|\ \ | |/ | | | | | | | | | | | | | | https://android.googlesource.com/platform/external/libnfc-nxp into aosp Conflicts: src/phHal4Nfc_ADD.c Change-Id: I950a66598954d21b49f723da2c58bff2ba719239
| * am e4d3c945: Merge "Add support for target-customized NFC stack configuration"Martijn Coenen2012-08-302-19/+23
| |\ | | | | | | | | | | | | * commit 'e4d3c945777c912ba71e79ac99cb11190cf8f90a': Add support for target-customized NFC stack configuration
| | * Merge "Add support for target-customized NFC stack configuration"Martijn Coenen2012-08-302-19/+23
| | |\
| | | * Add support for target-customized NFC stack configurationSebastian Niciarz2012-08-232-19/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | am cbef2c80: Merge "HCI ANY_OPEN_PIPE on identity management gate crash fix"Jeff Hamilton2012-08-291-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'cbef2c806acfba5b63963844fccfe3fae975d6bd': HCI ANY_OPEN_PIPE on identity management gate crash fix
| | * | Merge "HCI ANY_OPEN_PIPE on identity management gate crash fix"Jeff Hamilton2012-08-291-0/+1
| | |\ \
| | | * | HCI ANY_OPEN_PIPE on identity management gate crash fixDejan REBRACA2012-08-141-0/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently, host identity management gate does not support HCI commands coming from another host (including host controller). This patch fixes a tombstone when receiving an HCI command from another host, but still doesn't have a mechanism to treat the command. Change-Id: Ib72df6bac8f503f2b66998ee6e687ae99c15d17b Author: Dejan Rebraca <dejanx.rebraca@intel.com> Signed-off-by: Dejan Rebraca <dejanx.rebraca@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: 42426
| * | | am 1985108c: Merge "Support of topaz tag NFC Forum version number 1.1"Jeff Hamilton2012-08-291-1/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '1985108ceba65f0b01d5c4c41da49073c5d01230': Support of topaz tag NFC Forum version number 1.1
| | * | Merge "Support of topaz tag NFC Forum version number 1.1"Jeff Hamilton2012-08-291-1/+4
| | |\ \ | | | |/ | | |/|
| | | * Support of topaz tag NFC Forum version number 1.1Dejan REBRACA2012-08-141-1/+4
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latest version of NFC forum Tag type 1 spec is 1.1. This version number needs to be supported by libnfc to support Topaz tags V1.1 with dynamic content. Version number is part of capability container which resides in segment 1 of EEPROM memory of the tag. For older versions of Tag type 1, NFC device may be backward compatible. Change-Id: Ibbfa720d2e34c2f2612579e368f31f4a5c66b465 Author: Dejan REBRACA <dejanx.rebraca@intel.com> Signed-off-by: Dejan REBRACA <dejanx.rebraca@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: 33236
| * | phHal4Nfc_ADD: fix memcpy overlapNick Kralevich2012-07-171-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't call memcpy when src==dest. It's undefined. When memcpy overlap detection is enabled, this causes the NFC process to crash and burn. Bug: 6826770 Change-Id: I199af98e453953de288964f47248cb59af4deecb
| * | phFriNfc_OvrHal: fix memcpy overlapNick Kralevich2012-07-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use the API workaround when OvrHal->TranceiveInfo.sRecvData.buffer == pRecvdata->buffer. When memcpy overlap detection is enabled, this causes the NFC process to crash and burn. memcpy is undefined when src=dest. Bug: 6826770 Change-Id: Iebc8f82a4f86d560e764cef2229a7f86fa642783
| * | am b668d06f: Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
| |\ \ | | |/ | | | | | | | | | * commit 'b668d06f9447b613f6e8e65817e12ccd8d2b6225': Revert "Added addr field in response of Jewel command"
| | * Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
| | |\ | | | | | | | | | | | | Change-Id: I8d723033a1d479bd9ef5973cb098b488c54c6c62
| * | \ am f888888a: am 42fef9f8: Revert "Added addr field in response of Jewel command"Martijn Coenen2012-06-141-63/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'f888888a6278d53192bd00b0665c0d39b3cdb6e0': Revert "Added addr field in response of Jewel command"
| | * | am 42fef9f8: Revert "Added addr field in response of Jewel command"Martijn Coenen2012-06-141-63/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '42fef9f8aa6d0878cb3f2c050c637afa7f8d8abd': Revert "Added addr field in response of Jewel command"
| * | \ \ am 55d095b1: (-s ours) am 144d72d3: Remove some logs in case of abort() (DO ↵Martijn Coenen2012-06-120-0/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE). * commit '55d095b160d7e11c5061e213ae2e1f365f556745': Remove some logs in case of abort() (DO NOT MERGE).
| | * | | am 144d72d3: Remove some logs in case of abort() (DO NOT MERGE).Martijn Coenen2012-06-121-4/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '144d72d32ae420d5f4b25897a43210f56e287637': Remove some logs in case of abort() (DO NOT MERGE).
| * | | | | Remove some logs in case of abort().Martijn Coenen2012-06-081-4/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to see more context of HCI timeout crashes. Change-Id: I5cf1f829f3d0db5afd8d2c753fba7c3f8ad70365
| * | | | Reconcile with jb-releaseThe Android Open Source Project2012-05-240-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I33ff7dfbaeb2e3d39f3235647a4d87fad0d7c57d
| * \ \ \ \ am ba040759: Fix wrong extern variable sizeSunil Jogi2012-05-231-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ba0407599b6271f47a4e6e6d539522ae5b207287': Fix wrong extern variable size
| | \ \ \ \ \
| | \ \ \ \ \
| *-. \ \ \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | Change-Id: Ieee9b73eaf1313ba6307349f72a7d16d980c89d8
* | | | | | | | Merge "On some handsets, there is a configuration of hardware that causes a ↵Steve Kondik2012-10-032-2/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | conflict with HCE. Primarily it is something in the SWP configuration with a SWP sim card. It appears to be a PN544 register setting that blocks HCE type A only from initialization. This patch checks for this conflict and disables HCE for those configurations. The better way would be to understand how to set the PN544 registers to unblock the conflict, but this is a sufficient work around for this minority of configurations" into jellybean
| * | | | | | | | On some handsets, there is a configuration of hardware that causes a ↵doug yeager2012-09-262-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conflict with HCE. Primarily it is something in the SWP configuration with a SWP sim card. It appears to be a PN544 register setting that blocks HCE type A only from initialization. This patch checks for this conflict and disables HCE for those configurations. The better way would be to understand how to set the PN544 registers to unblock the conflict, but this is a sufficient work around for this minority of configurations Change-Id: I64d79acaa7eb58e15f1fb4bbe298883036f6d45a
* | | | | | | | | Merge "card emulation patch port to JB" into jellybeanSteve Kondik2012-08-3123-1565/+5395
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | card emulation patch port to JBdoug yeager2012-08-2823-1565/+5395
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: I86657f9c547840de33c35df4912b5f282d4fe459
* | | | | | | | Merge branch 'jb-release' of ↵Steve Kondik2012-08-100-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | https://android.googlesource.com/platform/external/libnfc-nxp into aosp
| * | | | | | Revert "Added addr field in response of Jewel command"Martijn Coenen2012-06-141-63/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c0da27e8f303bf459797f90f9f2e67c552ae8c27. Bug: 6666792 Change-Id: Icf6aa84a750d2e4855487a6e46959019a09e4a95
| * | | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-130-0/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | |_|_|_|/ | |/| | | |
| | * | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-240-0/+0
| | |\ \ \ \ | | | | |/ / | | | |/| / | | | |_|/ | | |/| |
| | | * | merge in jb-release history after reset to masterThe Android Automerger2012-04-230-0/+0
| | | |\ \ | | | | |/ | | | |/|
| | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-180-0/+0
| | | | |\
| | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-090-0/+0
| | | | | |\
| | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-210-0/+0
| | | | | | |\
| | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-200-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-200-0/+0
| | | | | | | | |\ | | | | | | | |/ / | | | | | | |/| / | | | | | | | |/
| | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-120-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-080-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-060-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-050-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-02-070-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-01-310-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-01-300-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2012-01-250-0/+0
| | | | | | | | | | | | | | |\
generated by cgit v1.1 at 2024-12-22 18:39:45 +0000