summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | am 91710ed9: am 59827416: am 74decc93: Do not wait 3ms before each write.Nick Pelly2011-06-021-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '91710ed9dbbfe7e2a34c0194b3a273fc1047af8e': Do not wait 3ms before each write.
| * | | | | | | am 59827416: am 74decc93: Do not wait 3ms before each write.Nick Pelly2011-05-291-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '598274166736cd7986267f555528c6f72f068e6b': Do not wait 3ms before each write.
| | * | | | | | am 74decc93: Do not wait 3ms before each write.Nick Pelly2011-05-231-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '74decc93d868ec1a8f3975a4ce3d1548c6ec6d8f': Do not wait 3ms before each write.
| | | * | | | | Do not wait 3ms before each write.Nick Pelly2011-05-231-1/+1
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NXP have confirmed that 3ms delay is only needed for writes destined for SWP. Change-Id: I90a5229dbb738e1f00d37a052c7ac55e0e9d215c
* | | | | | | am 5d96b2d2: am 5a9fc269: Properly merge \'Patch to enable low level traces.\'Daniel Tomas2011-06-021-6/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '5d96b2d2dd4ba566dcb0fd5e1b5f0e84e458c4af': Properly merge 'Patch to enable low level traces.'
| * | | | | | am 5a9fc269: Properly merge \'Patch to enable low level traces.\'Daniel Tomas2011-05-291-6/+4
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '5a9fc26993404305ebebdd432258bd7d563fb2e9': Properly merge 'Patch to enable low level traces.'
| | * | | | | Properly merge 'Patch to enable low level traces.'Daniel Tomas2011-05-231-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idfd097dacb3ce4979853cb60f97527d3a7b31ab4
* | | | | | | am d9ebeefb: am 944e51f4: Merge from gingerbreadJean-Baptiste Queru2011-05-244-0/+48
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'd9ebeefb70213172ecd329095570aaa5684094e0': Patch to enable low level traces.
| * | | | | | am 944e51f4: Merge from gingerbreadJean-Baptiste Queru2011-05-234-0/+48
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '944e51f48620da730be85df3845fe4101bcbf80b': Patch to enable low level traces.
| | * | | | | Merge from gingerbreadJean-Baptiste Queru2011-05-234-0/+48
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | Change-Id: Ib6afd89a0a98acaecd9182785e53ae248157f988
| | | * | | | Patch to enable low level traces.Daniel Tomas2011-05-194-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch permit to display the NFC frames exchanged through the I2C line. To enable that, you just need to enable LOW_LEVEL_TRACES macro. Change-Id: Ica2ff2e6d111b76c056161ec557346f23d21ada0
* | | | | | | Reconcile with gingerbread-releaseThe Android Open Source Project2011-05-200-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | Change-Id: Ib5ba9a9885b5adede1b8bd3deea0f754e1c447ce
| * | | | | | merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-05-130-0/+0
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Enable P2P 106 passive (again).Nick Pelly2011-04-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabling P2P 106 passive caused a large P2P discovery regression. Change-Id: I9856ba1a29cd717da2f578abd073b341c54fce36
* | | | | | | am ec4b865b: am f4770c64: am 65179442: Fixed LLCP SAP value range.Sylvain Fonteneau2011-05-191-1/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | * commit 'ec4b865b09761f3c0c3849432dc65693d2402870': Fixed LLCP SAP value range.
| * | | | | | am f4770c64: am 65179442: Fixed LLCP SAP value range.Sylvain Fonteneau2011-05-181-1/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | * commit 'f4770c64976d3df2267387b28fa5732943d0cf71': Fixed LLCP SAP value range.
| | * | | | | am 65179442: Fixed LLCP SAP value range.Sylvain Fonteneau2011-05-181-1/+1
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | * commit '651794422f331be5865ed8afcab6a56e3abe7521': Fixed LLCP SAP value range.
| | | * | | | Fixed LLCP SAP value range.Sylvain Fonteneau2011-05-161-1/+1
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Valid LLCP Service Access Point values are 0x00 to 0x3F, not 0x2F. Before this patch, a socket with a local SAP between 0x30 and 0x3F was unable to communicate (operation callbacks were never called). Change-Id: Ic3f9b9f353a01e2682e28575152f171d7ec421e4
* | | | | | am 2af3967e: am a3a6104e: am 92c7e014: Retry i2c read 5 times on i2c read error.Nick Pelly2011-05-121-0/+11
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '2af3967eb1163d31d2e087a2f6ebc75c2520b61e': Retry i2c read 5 times on i2c read error.
| * | | | | am a3a6104e: am 92c7e014: Retry i2c read 5 times on i2c read error.Nick Pelly2011-05-121-0/+11
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'a3a6104ebe26097e24623aa0b557fe322069b51f': Retry i2c read 5 times on i2c read error.
| | * | | | am 92c7e014: Retry i2c read 5 times on i2c read error.Nick Pelly2011-05-121-0/+11
| | |\ \ \ \ | | | |/ / / | | | | | / | | | |_|/ | | |/| | * commit '92c7e0144b84a27b4573043fef718a8ba458d062': Retry i2c read 5 times on i2c read error.
| | | * | Retry i2c read 5 times on i2c read error.Nick Pelly2011-05-121-0/+11
| | | | | | | | | | | | | | | | | | | | Change-Id: I9fd0291bfd8ba9d26a0c93bc14d7184a9a188b90
* | | | | am 20f7995a: am 7825db42: am e5201c15: Patch to perform a recover in case of ↵Daniel Tomas2011-04-261-11/+23
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | a transaction failure * commit '20f7995a36673bbaaa01258488c45a33acf252a2': Patch to perform a recover in case of a transaction failure
| * | | | am 7825db42: am e5201c15: Patch to perform a recover in case of a ↵Daniel Tomas2011-04-261-11/+23
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | transaction failure * commit '7825db42b02c4ad3426d258e1590b01f5547f06b': Patch to perform a recover in case of a transaction failure
| | * | | am e5201c15: Patch to perform a recover in case of a transaction failureDaniel Tomas2011-04-261-11/+23
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit 'e5201c1575b080d023a36ed36edd8017f5c4ce28': Patch to perform a recover in case of a transaction failure
| | | * | Patch to perform a recover in case of a transaction failureDaniel Tomas2011-04-261-11/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch permit to perform a recovery when a transaction failure is detected. To detect this exception, we are filtering the Ox57 bytes because this means that the IRQ line is high but no data is available from PN544. Change-Id: Ibb55ea3db2bc6cdff2c5b28bbe2127250c5637a8
* | | | | am e4a547cf: am 4ce9f49c: am 17018c3f: Merge "Enable P2P 106 passive ↵Jeff Hamilton2011-04-171-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | (again)." into gingerbread * commit 'e4a547cf6e636d1d1a4a56ad3456f67e5ecf25e6': Enable P2P 106 passive (again).
| * | | | am 4ce9f49c: am 17018c3f: Merge "Enable P2P 106 passive (again)." into ↵Jeff Hamilton2011-04-171-2/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit '4ce9f49c89e0ad124f950f535b63dc401117f0d8': Enable P2P 106 passive (again).
| | * | | am 17018c3f: Merge "Enable P2P 106 passive (again)." into gingerbreadJeff Hamilton2011-04-171-2/+2
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '17018c3fdfd2a3e17cb8ff950fea16ea1000506e': Enable P2P 106 passive (again).
| | | * | Merge "Enable P2P 106 passive (again)." into gingerbreadJeff Hamilton2011-04-171-2/+2
| | | |\ \
| | | | * | Enable P2P 106 passive (again).Nick Pelly2011-04-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabling P2P 106 passive caused a large P2P discovery regression. Change-Id: I9856ba1a29cd717da2f578abd073b341c54fce36
* | | | | | am 74c281e8: am 32e6c583: am 7b40e6d4: Avoid missing NFCIP inbound frame.Sylvain Fonteneau2011-04-141-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '74c281e8c87fec650ed32ac3aac977efce7454a0': Avoid missing NFCIP inbound frame.
| * | | | | am 32e6c583: am 7b40e6d4: Avoid missing NFCIP inbound frame.Sylvain Fonteneau2011-04-141-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '32e6c583a586eabb10bb68e2a6ce0d4b2640fd16': Avoid missing NFCIP inbound frame.
| | * | | | am 7b40e6d4: Avoid missing NFCIP inbound frame.Sylvain Fonteneau2011-04-141-1/+1
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '7b40e6d4b45110797cdea7d451d313af891bf6e3': Avoid missing NFCIP inbound frame.
| | | * | | Avoid missing NFCIP inbound frame.Sylvain Fonteneau2011-04-141-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a NFCIP frame is received (NXP_EVT_NFC_RCV_DATA event) before a call to phHal4Nfc_Receive() function, the frame was lost. This could happen if the local host acts as a Target and the remote peer sends its first frame too fast. The data is actually saved in a temporary buffer but, when the phHal4Nfc_Receive() is eventualy called, it triggers a callback with a status code NFCSTATUS_MORE_INFORMATION, which is handled as an error. This patch fixes this behaviour and makes sure that the correct status code is provided with the frame itself. Change-Id: I5311762ca70c71f98dea0287b0844eb1c8dddb6b
* | | | | am ef2cdb70: am fb23feb2: am 46dbed4e: Ignore unreadable TLVs during LLCP ↵Sylvain Fonteneau2011-04-112-9/+15
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | activation and CONNECT/CC. * commit 'ef2cdb70819d2ad7435f43d18aa92f219c741cc4': Ignore unreadable TLVs during LLCP activation and CONNECT/CC.
| * | | | am fb23feb2: am 46dbed4e: Ignore unreadable TLVs during LLCP activation and ↵Sylvain Fonteneau2011-04-112-9/+15
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | CONNECT/CC. * commit 'fb23feb29f91316502bc7ab95bbd0c8b968d0ed8': Ignore unreadable TLVs during LLCP activation and CONNECT/CC.
| | * | | am 46dbed4e: Ignore unreadable TLVs during LLCP activation and CONNECT/CC.Sylvain Fonteneau2011-04-082-9/+15
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '46dbed4e11700226e9b43ca17e5ad6f3d192bf63': Ignore unreadable TLVs during LLCP activation and CONNECT/CC.
| | | * | Ignore unreadable TLVs during LLCP activation and CONNECT/CC.Sylvain Fonteneau2011-04-082-9/+15
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The LLCP specification defines that if a TLV cannot be interpreted, it shall be ignored rather than generating an error. This patch removed all error reporting on TLV interpretation. The only error that can still happen is length inconsistency in the whole TLV array buffer. Change-Id: Ibf289fceb2283bfddcdc0ddee9e687ece3e90887
* | | | am e7ace88c: am 353aa40c: am b7e67c8d: Handle correctly LLCP aggregated frames.Sylvain Fonteneau2011-04-051-5/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'e7ace88c0a9cb46a28b1ee9c9ac98eafbed9c72c': Handle correctly LLCP aggregated frames.
| * | | am 353aa40c: am b7e67c8d: Handle correctly LLCP aggregated frames.Sylvain Fonteneau2011-04-041-5/+8
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '353aa40cedb09d4ef3494d0d6e9880c74c3d50b5': Handle correctly LLCP aggregated frames.
| | * | am b7e67c8d: Handle correctly LLCP aggregated frames.Sylvain Fonteneau2011-04-041-5/+8
| | |\ \ | | | |/ | | | | | | | | | | | | * commit 'b7e67c8dbd4aa5892815bfed4e7ff934cf49b904': Handle correctly LLCP aggregated frames.
| | | * Handle correctly LLCP aggregated frames.Sylvain Fonteneau2011-03-311-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parsing algorithm for AGF frames has been fixed. It was previously only working if aggregated frames were 4-bytes long. The current stack only support mandatory de-aggregation. It does not send aggregated frames, so there won't be interop issue with previous versions. This fix prevents reading erroneous de-aggregated frames and rejecting them using FRMR when communicating with an LLCP implementation using aggregation mechanism. Change-Id: Ia5728496a2917b6a57f478cc51dc0aaa0fcc165a
* | | | am 751f76d7: am 905172d7: am 00c98d51: Disable P2P target 106 passive mode.Nick Pelly2011-03-184-6/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '751f76d7a45584244f20ad7787e475da6a63f99f': Disable P2P target 106 passive mode.
| * | | am 905172d7: am 00c98d51: Disable P2P target 106 passive mode.Nick Pelly2011-03-184-6/+7
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '905172d7aa2b88fc10ebc129a93181bfedc60c90': Disable P2P target 106 passive mode.
| | * | am 00c98d51: Disable P2P target 106 passive mode.Nick Pelly2011-03-184-6/+7
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '00c98d516cac9dcdad6c22400267a2fd2bea3adf': Disable P2P target 106 passive mode.
| | | * Disable P2P target 106 passive mode.Nick Pelly2011-03-184-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | P2P target 106 passive appears as an ISO 14443-3A target to reader/writers in the field. This can confuse some terminals, especially when we also have card emulation turned on, since it looks like we have two -3A targets in the field. P2P target 106 passive is just one of many P2P sub-modes. We do not know of any P2P devices that only initiate using only 106 passive, so this should not present inter-op issues. Change-Id: I1cb84ed791a86a7f225a51806e99bab031dcb6ca
* | | | external/libnfc-nxp: remove LOCAL_PRELINK_MODULEIliyan Malchev2011-03-141-2/+2
|/ / / | | | | | | | | | | | | Change-Id: I7ab7e314cdafb547346f4c6b17c2d51d43e212d0 Signed-off-by: Iliyan Malchev <malchev@google.com>
* | | am 68ffddd6: am d625fb63: Minor tweaks.Jeff Hamilton2011-03-142-2/+1
|\ \ \ | |/ / | | | | | | | | | * commit '68ffddd63dc2d6725ffc2e9fb3a91252da9045bf': Minor tweaks.
| * | am d625fb63: Minor tweaks.Jeff Hamilton2011-03-122-2/+1
| |\ \ | | |/ | | | | | | | | | * commit 'd625fb631ee97e320400f0c763839d166048c54b': Minor tweaks.
generated by cgit v1.1 at 2025-09-13 19:58:20 +0000