summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Added addr field in response of Jewel command"Martijn Coenen2012-06-141-63/+0
| | | | | | | This reverts commit c0da27e8f303bf459797f90f9f2e67c552ae8c27. Bug: 6666792 Change-Id: Icf6aa84a750d2e4855487a6e46959019a09e4a95
* Remove some logs in case of abort() (DO NOT MERGE).Martijn Coenen2012-06-121-4/+2
| | | | | | | | This allows us to see more context of HCI timeout crashes. Bug: 6114991 Change-Id: Icfda5d4e15e3ceb471ab24f5cb42001c95e9d034
* Fix wrong extern variable sizeSunil Jogi2012-05-231-1/+1
| | | | | | | nxp_nfc_felica_timeout originally uint8_t but current source has uint32_t. Changed to uint8_t to fix the problem. Without fix it overwrite the other global memory region which can create problem in other section of code.
* Merge "Added recovery function when SE wired mode selected"Martijn Coenen2012-04-203-0/+19
|\
| * Added recovery function when SE wired mode selectedSunil Jogi2012-04-133-0/+19
| | | | | | | | | | | | | | | | Added a recovery function with delay when SE wired mode selected. This function will add extra delay before any abort when SE is in wired mode. This will allow SE to complete any operation and do not power off the SE immediately when wired mode transaction is on going.
* | Add NOTICE and MODULE_LICENSE_APACHE filesWei Zhong2012-04-192-0/+189
| | | | | | | | | | | | | | | | | | | | Copyright (C) 2010 NXP Semiconductors Licensed under APACHE2 Bug: 6299628 Change-Id: Ib94487a81d0041f24dc831dd64819be45c153645 Signed-off-by: Wei Zhong <wzhong@google.com>
* | Fix T2T makeReadonly.Martijn Coenen2012-04-191-1/+1
| | | | | | | | Change-Id: Ie4a87d23034cfdbb3c1db227a7f54c2e1a45c98c
* | Added addr field in response of Jewel commandSunil Jogi2012-04-171-0/+63
|/ | | | | | | | | Most of the Jewel command response includes the address which is sent as part of command. The response of Jewel command was missing address field. This patch fix that problem by adding the missing addr field. Bug: 5341397 Change-Id: Icba0b37dd9987bc34c3490fa12ebda51ac25ad1e
* Added support for tearing recovery for MIFARE Classic ReadonlySunil Jogi2012-04-023-14/+16
| | | | | | | | When readonly is interrupted in between next readonly call make remaining sectors readonly and return true. If all sectors are readonly then call to readonly returns error. Change-Id: Id47a77198b41d69b743f24259849e943954c7a58
* Mifare readonly support.Sunil Jogi2012-04-027-22/+455
| | | | | | | | This patch requires changes done in following projects submited as patches: 1. packages/apps/Nfc 2. frameworks/base Change-Id: I9036309d82dd897e77f6bc14c30fbde255bf955c
* Patch to support MIFARE with SAK 0x01Sunil Jogi2012-04-025-4/+9
| | | | Change-Id: Ifb1389d428855c2eea99390790af13f28571097a
* Empty merge of a remote-tracking branchMike Lockwood2012-03-210-0/+0
|\ | | | | | | Change-Id: I5d578bd35aaacdb4ccbaf15668da38a67abc631c
| * DO NOT MERGEMike J. Chen2012-02-071-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable NXP_SMX (secure element) in libnfc-nxp for Phantasm Phantasm uses a PN544, which has no secure element. libnfc-nxp is configured to assume a secure element currently and doesn't handle runtime detection properly. The result is that on first boot, when the NfcService tries to wipe the secure element, it hangs as it tries to open a connection to the non-existing secure element. Changing the define to NXP_SMX=0 makes the library report no secure element, and the wipe operation fails (like it should) when it tries to do the wipe. This fixes Bug: 5964890 Will file a separate bug to have the library and Nfc.apk do better at runtime detection of the secure element. This shouldn't go back to master since it's a target specific change. Change-Id: Id6e57b7f5a88e96a59b9cdc6f67ac966fa964356 Signed-off-by: Mike J. Chen <mjchen@google.com>
| * am b99be65c: Use NFC HAL for some libnfc settings.Martijn Coenen2011-11-076-114/+56
| |\ | | | | | | | | | | | | * commit 'b99be65c277b0cc65a00a33e784ed49461531737': Use NFC HAL for some libnfc settings.
| * \ keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl2011-10-280-0/+0
| |\ \
| | * \ undo reset to ics-mr1 until we have a better methodEd Heyl2011-10-260-0/+0
| | |\ \
| | | * \ reset to ics-mr1, but keep historyEd Heyl2011-10-260-0/+0
| | | |\ \ | | |/ / / | |/| / / | | |/ /
| | * | am 36623817: Merge remote branch \'goog/ics-mr0\' into ics-mr1Ed Heyl2011-10-260-0/+0
| | |\ \ | | |/ / | |/| | | | | | | | | | * commit '366238178f7a6d26ce051150f4fb65e533c2fae4': Use a 10s timeout in uart_read() in FW download mode.
| | * | am b13b27aa: Use a 10s timeout in uart_read() in FW download mode.Nick Pelly2011-10-262-2/+6
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'b13b27aa9bb96897e996cf89ed8412c46ef2cf07': Use a 10s timeout in uart_read() in FW download mode.
| | * \ \ am ff39bc6d: (-s ours) am 17abc6eb: (-s ours) Merge "Remove NFC I2C ↵Martijn Coenen2011-10-210-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | workaround for Prime (DO NOT MERGE)." into ics-mr0 * commit 'ff39bc6d4fb3fa08fc55721a8962c713751fca09': Remove NFC I2C workaround for Prime (DO NOT MERGE).
* | | | | | Don't dump nfc target/initiator modes to system log.Martijn Coenen2012-03-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1938f348704f6fabefa6600ecf32ff7d6204d021
* | | | | | Replace loge with aloge.Ramanan Rajeswaran2012-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie2a90be2152c28029990f5e4db5dffd5928fd030
* | | | | | am da7d267e: am 3f791036: nfc-hal: generalize error handling in Reader thread.Rakesh Goyal2012-03-091-5/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'da7d267e855affe83c0bc5958292fe74d6e27d7e': nfc-hal: generalize error handling in Reader thread.
| * \ \ \ \ \ am 3f791036: nfc-hal: generalize error handling in Reader thread.Rakesh Goyal2012-03-091-5/+16
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3f791036276b6f535ad253dd25650fad60c72695': nfc-hal: generalize error handling in Reader thread.
| | * | | | | | nfc-hal: generalize error handling in Reader thread.Rakesh Goyal2012-03-091-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If host runs faster than the nfc chip, it tries to read response immediately. In this scenario nfc chip responds back with it's read address and software should ignore this data and retry. This patch generalizes the retry mechanism to accomodate other versions of the nfc chip. Change-Id: I3e18e34fd3edf6ed0a7f302a6be9321ab8ed7875
* | | | | | | | am bbda0171: am 65ce3454: Merge "Fix one coding error of using a temporary ↵Nick Pelly2012-03-071-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | variable in the global structure NdefMap" * commit 'bbda017196474931e686669f0b6bc749f6dc1b0a': Fix one coding error of using a temporary variable in the global structure NdefMap
| * | | | | | | am 65ce3454: Merge "Fix one coding error of using a temporary variable in ↵Nick Pelly2012-03-071-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the global structure NdefMap" * commit '65ce34545ca9a1b77b54acd373618821d8123ef8': Fix one coding error of using a temporary variable in the global structure NdefMap
| | * \ \ \ \ \ \ Merge "Fix one coding error of using a temporary variable in the global ↵Nick Pelly2012-03-071-1/+1
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | structure NdefMap"
| | | * | | | | | | Fix one coding error of using a temporary variable in the global structure ↵Jack Ren2012-03-011-1/+1
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NdefMap In the following code: the local variable PacketDataLength is a local variable in stack, but used in the ndefMap which is a global structure. When the function phFriNfc_NdefMap_EraseNdef( ) returns, the PacketDataLength will be freed, too. If it is used later via the pointer in NdefMap, will cause some of potential issues. Fix it by re-define it as static. NFCSTATUS phFriNfc_NdefMap_EraseNdef(phFriNfc_NdefMap_t *NdefMap) { NFCSTATUS status = NFCSTATUS_PENDING; static uint8_t PktData[3] = PH_FRINFC_NDEFMAP_EMPTY_NDEF_MSG; uint8_t MemOffset = PH_FRINFC_NDEFMAP_SEEK_BEGIN; uint32_t PacketDataLength = sizeof(PktData); ... /* Mifare card selected. Call Mifare Write */ status = phFriNfc_NdefMap_WrNdef( NdefMap, PktData, &PacketDataLength, MemOffset); break; ... } Change-Id: Iee278fe39749619aa44c620138eae85a46f6e4a5 Signed-off-by: Dejan REBRACA <dejanx.rebraca@intel.com> Signed-off-by: Ken Wahid <kenx.wahid@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
* | | | | | | | | Support for handling of proprietry TLV in T4TSunil Jogi2012-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If CC file is including proprietory TLV then Check NDEF was returning tag is not NDEF compilant. This patch fix that problem. Change-Id: I28e7701c7d6e78de8b19b93d09789c09fa9357bd
* | | | | | | | | Skip proprietry TLV for Type 2Sunil Jogi2012-03-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skipping proprietry TLV for Type 2 reading if it is present. Earlier Type 2 tag was not detected as NDEF tag is proprietry TLV present. Change-Id: Ia3ca722790f4a990fe976617aecbbdf6a7d53570
* | | | | | | | | (DEBUG) Add support for setting p2p modes.Martijn Coenen2012-02-174-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic6df1fc458cef2531119e5e5e2ef5f9a7b21a524
* | | | | | | | | Fix NFCSTATUS_BUSY responses after doing p2p.Martijn Coenen2012-02-061-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LLCP state was not reset properly. Bug: 5971895 Change-Id: I4fda6ef7c78ae2730359cf5c90d887d205e57799
* | | | | | | | | Merge "Fixed FRMR sending on invalid LLCP frame received"Martijn Coenen2012-02-062-12/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed FRMR sending on invalid LLCP frame receivedSunil Jogi2012-02-062-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DSAP and SSAP were switched on with the other at multiple location in the code. This patch fix those. Change-Id: Iea8e499049a2cd4a234155a3044b875eb9c6ca7a
* | | | | | | | | | am 700428d8: am 8c56cd9e: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / / * commit '700428d8f73604f27f4416fd14d3ef1cb86fca9e':
| * | | | | | | | am 8c56cd9e: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / / * commit '8c56cd9e0bc2808d73e6596ba3bb128cc2fbcd7c':
| | * | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | Change-Id: Iee6e204b8a44a1efb75dea184cc1a69baac91f06
* | | | | | | | Handle inbound buffering in LLCP connectionless socketsSunil Jogi2012-01-303-67/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables the server to avoid losing packets, especially when receiving them in an aggregated packet. The size of the buffer is determined by the size of the working buffer provided by the application. Change-Id: Ia3c72e19fdb74e2a43390af5607c497c2275fe46
* | | | | | | | Fixed rejected receive request in LLCPSunil Jogi2012-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If phLibNfc_Llcp_Recv() is called in the callback of a previous phLibNfc_Llcp_Recv(), it could be rejected due to the bSocketRecvPending flag which was not properly reset. Change-Id: I6c41469480b50bb7adc9a721ec96f715e5d56a60
* | | | | | | | Fixed wrong callbacks callSunil Jogi2012-01-301-19/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call the callback only if the context is not null. Change-Id: I783d9e8ddedb2546eff85837826703db189f9f59
* | | | | | | | Increase internal LLCP buffers to fit max MIUSunil Jogi2012-01-272-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Interal buffer increased to 2178 = 3 (max LLCP header size) + 128 (default MIU) + 2047 (max MIU) Change-Id: I3cc2ff705e74ae657d93b5e50a577b0e7e5ebfcf
* | | | | | | | Reset LLCP socket internal variables before next use.Sunil Jogi2012-01-271-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some internal variables used in reveive window checkings were not reset on socket closure/re-opening. This was leading to have the send() function waiting forever for remote acknowledgments. Change-Id: Ic7741b004de80af3f851f620842d46c42f654804
* | | | | | | | Update for LLCP V(SA) internal variableSunil Jogi2012-01-271-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The V(SA) is an internal variable used in LLCP connection-oriented data links to check receive window conditions. It corresponds to the last frame number acknowledged by remote peer + 1. The patch makes sure this variable is updated evry time it is needed. Change-Id: Ie5ac925a6f1dfa19b22ac2b6e96659440d5daf21
* | | | | | | | LLCP 1.1: Fix some bugs.Martijn Coenen2012-01-272-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Clear out send callback if send was not accepted. - Set transport busy status for RR/RNR frames. Change-Id: Idf8986f6b82995644b176247a644e36d2c879ebf
* | | | | | | | Adding support for handling maximum length supported by peerSunil Jogi2012-01-274-21/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for chaining is added based on maximum length supported by and passed in ATS by peer and maximum length supported by the device. Change-Id: I8f9f8468ff8ac9d3579bc8b6afbe3e2072e56de8
* | | | | | | | LLCP 1.1 implementation.Sunil Jogi2012-01-2711-108/+912
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, in LLCP v1.0, the only way to use the SDP (Service Discovery Protocol) service was to send a CONNECT frame containing the Service Name to the SDP service. This was implicitly preforming a connection request to the requested service. LLCP v1.1 introduced a way to discover services more efficiently and without implicit connection. It also enables connectionless services to have a service name. It is based on a new protocol based on a new SNL frame containing discovery requests and responses. This update comes with new APIs: - phLibNfc_Llcp_DiscoverServices() function can be used to discover remote services. It can take multiple service names and resolve all of them in a single call. - Register service name at bind time. Cache LLCP service name/sap pairs. In LLCP 1.1 specification defines at section 5.9 that any service lookup answer must be valid for the whole LLCP session duration. To enforce this, we cache the SAP/SN pairs locally and make sure that the applications don't break the cache. The stack remains fully retro-compatible with v1.0 devices. Change-Id: I052edd3838013cee65e7415d0ed01fc3e9cad36d
* | | | | | | | LLCP 1.1: allow pending operations on connectionless.Sunil Jogi2012-01-276-469/+595
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pending operations were handled at the connection-oriented sockets level, with no possibility for other transport types to handle pending operations. A dispatcher has been added at the generic transport level to remove this limitation. This feature is needed to implement LLCP v1.1. Change-Id: I69e37ba800d1c531396ca97ab0a0480e0f53d63f
* | | | | | | | Don't overwrite psUpperLayerContext when reconfiguring the SE.Martijn Coenen2012-01-202-54/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes one of the crashes occuring when turning the screen off during p2p transfers. One remaining. Change-Id: I3e45be9b8f4be40350ba4dd9db7e596631206bd1
* | | | | | | | Clear out send/recv callbacks for connectionless sockets.Martijn Coenen2012-01-201-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a connectionless socket is closed, Connectionless_Abort() is called, which in turn calls the send and receive callbacks to indicate abortion. But since these callbacks are not cleared out after a previous send/receive has completed, this can lead to spurious callbacks and consequently memory corruption. Change-Id: Iea7a34829c4db1cae3b49f33117b25b50205683f
generated by cgit v1.1 at 2024-12-23 07:56:47 +0000