summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Firmware data load from a static file instead of a libraryHEADreplicant-4.2-0004replicant-4.2-0003replicant-4.2Paul Kocialkowski2014-09-012-23/+52
* Revert "Properly handle missing firmwares"Paul Kocialkowski2014-09-012-13/+2
* Properly handle missing firmwaresreplicant-4.2-0002replicant-4.2-0001Paul Kocialkowski2013-11-112-2/+13
* Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/ext...Steve Kondik2013-02-121-1/+13
|\
| * NDEF Type 3 tag reading with padding bytesSunil Jogi2012-11-271-1/+13
* | libnfc-nxp: Add alternate firmware pathSteve Kondik2013-02-061-2/+6
* | Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/ex...Steve Kondik2012-12-274-8/+18
|\ \ | |/
| * am cbef2c80: Merge "HCI ANY_OPEN_PIPE on identity management gate crash fix"Jeff Hamilton2012-08-291-0/+1
| |\
| | * 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
| * | | am 1985108c: 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
| | |/
| * | phHal4Nfc_ADD: fix memcpy overlapNick Kralevich2012-07-171-5/+8
| * | phFriNfc_OvrHal: fix memcpy overlapNick Kralevich2012-07-171-1/+4
| |/
* | On some handsets, there is a configuration of hardware that causes a conflict...doug yeager2012-09-262-2/+6
* | card emulation patch port to JBdoug yeager2012-08-2819-1337/+5135
|/
* Revert "Added addr field in response of Jewel command"Martijn Coenen2012-06-141-63/+0
* Fix wrong extern variable sizeSunil Jogi2012-05-231-1/+1
* Merge "Added recovery function when SE wired mode selected"Martijn Coenen2012-04-202-0/+16
|\
| * Added recovery function when SE wired mode selectedSunil Jogi2012-04-132-0/+16
* | Fix T2T makeReadonly.Martijn Coenen2012-04-191-1/+1
* | Added addr field in response of Jewel commandSunil Jogi2012-04-171-0/+63
|/
* Added support for tearing recovery for MIFARE Classic ReadonlySunil Jogi2012-04-023-14/+16
* Mifare readonly support.Sunil Jogi2012-04-027-22/+455
* Patch to support MIFARE with SAK 0x01Sunil Jogi2012-04-025-4/+9
* Don't dump nfc target/initiator modes to system log.Martijn Coenen2012-03-161-2/+2
* am bbda0171: am 65ce3454: Merge "Fix one coding error of using a temporary va...Nick Pelly2012-03-071-1/+1
|\
| * Fix one coding error of using a temporary variable in the global structure Nd...Jack Ren2012-03-011-1/+1
* | Support for handling of proprietry TLV in T4TSunil Jogi2012-03-051-1/+1
* | Skip proprietry TLV for Type 2Sunil Jogi2012-03-051-1/+3
* | (DEBUG) Add support for setting p2p modes.Martijn Coenen2012-02-172-3/+31
* | Fix NFCSTATUS_BUSY responses after doing p2p.Martijn Coenen2012-02-061-2/+3
* | Fixed FRMR sending on invalid LLCP frame receivedSunil Jogi2012-02-062-12/+12
* | Handle inbound buffering in LLCP connectionless socketsSunil Jogi2012-01-303-67/+171
* | Fixed rejected receive request in LLCPSunil Jogi2012-01-301-1/+1
* | Fixed wrong callbacks callSunil Jogi2012-01-301-19/+17
* | Increase internal LLCP buffers to fit max MIUSunil Jogi2012-01-271-2/+2
* | Reset LLCP socket internal variables before next use.Sunil Jogi2012-01-271-0/+6
* | Update for LLCP V(SA) internal variableSunil Jogi2012-01-271-6/+3
* | LLCP 1.1: Fix some bugs.Martijn Coenen2012-01-272-3/+14
* | Adding support for handling maximum length supported by peerSunil Jogi2012-01-274-21/+34
* | LLCP 1.1 implementation.Sunil Jogi2012-01-2710-108/+911
* | LLCP 1.1: allow pending operations on connectionless.Sunil Jogi2012-01-276-469/+595
* | Don't overwrite psUpperLayerContext when reconfiguring the SE.Martijn Coenen2012-01-202-54/+49
* | Clear out send/recv callbacks for connectionless sockets.Martijn Coenen2012-01-201-3/+14
* | Prevent LLCP stack from deactiving twice.Martijn Coenen2012-01-131-2/+2
* | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-062-6/+6
* | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-053-7/+7
* | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-031-1/+1
|/
* Use NFC HAL for some libnfc settings.Martijn Coenen2011-11-031-20/+2