summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Misc changes for Nexus Prime bringup.Nick Pelly2011-06-144-31/+33
| | | | | | | | | | o Fix uart read() implementation o Temporarily disable firmware update o Rename ttySx to ttyOx (this should be properly abstracted later) o Bug fix in #ifdef code o Update verbose logging arguments Change-Id: I87814e2be9ddbf5036d5586a2fd82311d56ec47f
* Merge "Make NfcA timeout configurable in libnfc."Martijn Coenen2011-06-104-2/+19
|\
| * Make NfcA timeout configurable in libnfc.Martijn Coenen2011-06-094-2/+19
| | | | | | | | | | | | | | | | | | Adds an interface for setting the NfcA timeout, which is called "mifare raw" in libnfc. Also changed the default, since it was set to only 2 ms, which is too short for most commands. Current setting is around 600ms. Change-Id: I00ccd85cd47a70895a3aca0f0bc34e1b0eab82c7
* | Reconcile with gingerbread-releaseJean-Baptiste Queru2011-06-090-0/+0
|\ \ | | | | | | | | | Change-Id: Ia22f150d863ffb9227d00402b23429b636c54eb4
| * \ merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-06-090-0/+0
| |\ \
* | \ \ am 252aedb3: am 6a7a2870: am 99141cdd: Sleep 500us between i2c writes, as ↵Nick Pelly2011-06-091-0/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | per latest advice from NXP. * commit '252aedb3edd2c04adedeb5c9f8369af504411dad': Sleep 500us between i2c writes, as per latest advice from NXP.
| * | | am 6a7a2870: am 99141cdd: Sleep 500us between i2c writes, as per latest ↵Nick Pelly2011-06-081-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | advice from NXP. * commit '6a7a2870596a7b82ed4a7720a13e1d02db7eb3cf': Sleep 500us between i2c writes, as per latest advice from NXP.
| | * \ \ am 99141cdd: Sleep 500us between i2c writes, as per latest advice from NXP.Nick Pelly2011-06-081-0/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '99141cdd942973bc0cb8ef208ef717b14eb73b8e': Sleep 500us between i2c writes, as per latest advice from NXP.
| | | * | Sleep 500us between i2c writes, as per latest advice from NXP.Nick Pelly2011-06-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix pn544 lock-ups seen during wired-mode stress tests. Change-Id: I606b5909338dc889a475ad880df8646546b9ba40
* | | | | am 055a5f95: am b76c80da: am 80c2d409: Merge "Prevent NFC crash-loop if ↵Jean-Baptiste Queru2011-06-082-5/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | firmware cannot be loaded." * commit '055a5f9542ba8fcfd2972111b707049732255ebe': Prevent NFC crash-loop if firmware cannot be loaded.
| * | | | am b76c80da: am 80c2d409: Merge "Prevent NFC crash-loop if firmware cannot ↵Jean-Baptiste Queru2011-06-072-5/+9
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | be loaded." * commit 'b76c80da03e33425722d52e8499ce3c97ab2b17c': Prevent NFC crash-loop if firmware cannot be loaded.
| | * | | am 80c2d409: Merge "Prevent NFC crash-loop if firmware cannot be loaded."Jean-Baptiste Queru2011-06-032-5/+9
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '80c2d4090d6292a3fd2e20a18a981bc19e0a0429': Prevent NFC crash-loop if firmware cannot be loaded.
| | | * \ \ Merge "Prevent NFC crash-loop if firmware cannot be loaded."Jean-Baptiste Queru2011-06-022-5/+9
| | | |\ \ \
| | | | * | | Prevent NFC crash-loop if firmware cannot be loaded.Martijn Coenen2011-06-022-5/+9
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't crash - just run off whatever firmware is in the chip now. Change-Id: I0d24c13452271aed63a5a0aea236db7b1cbd432c
* | | | | | Patch to dynamically enable NFC LOW_LEVEL_TRACESNick Pelly2011-06-081-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | low level traces can be enabled at run-time with: adb shell setprop debug.nfc.LOW_LEVEL_TRACES 1 and disabled with adb shell setprop debug.nfc.LOW_LEVEL_TRACES 0 NFC must be turned off and on again for this change to take affect. Change-Id: Iefdc4873b3ee5bc697f34b307c22c06a6eda0667 Signed-off-by: Nick Pelly <npelly@google.com>
* | | | | | Reconcile with gingerbread-releaseJean-Baptiste Queru2011-06-070-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | Change-Id: I39908f99bc7be01b37f96796af4eda04f6810802
| * | | | | merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-05-250-0/+0
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
* | | | | | am 5da30972: am 3860b6c3: am ffef6844: Merge "Guard some code by ↵Nick Pelly2011-06-071-0/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | LOW_LEVEL_TRACES; see c1f33130d9d2100e6232f8f3c782949c75205be6" into gingerbread * commit '5da3097267251b46bb3391bfcf4ecb3ef3390a4f': Guard some code by LOW_LEVEL_TRACES; see c1f33130d9d2100e6232f8f3c782949c75205be6
| * | | | | am 3860b6c3: am ffef6844: Merge "Guard some code by LOW_LEVEL_TRACES; see ↵Nick Pelly2011-06-061-0/+2
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | c1f33130d9d2100e6232f8f3c782949c75205be6" into gingerbread * commit '3860b6c3d17ec10628e57c4f4c288d16f9c591c1': Guard some code by LOW_LEVEL_TRACES; see c1f33130d9d2100e6232f8f3c782949c75205be6
| | * | | | am ffef6844: Merge "Guard some code by LOW_LEVEL_TRACES; see ↵Nick Pelly2011-05-251-0/+2
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c1f33130d9d2100e6232f8f3c782949c75205be6" into gingerbread * commit 'ffef684400a6420e365efeb77f5fffb747045c35': Guard some code by LOW_LEVEL_TRACES; see c1f33130d9d2100e6232f8f3c782949c75205be6
| | | * | | Merge "Guard some code by LOW_LEVEL_TRACES; see ↵Nick Pelly2011-05-251-0/+2
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | c1f33130d9d2100e6232f8f3c782949c75205be6" into gingerbread
| | | | * | | Guard some code by LOW_LEVEL_TRACES; see ↵Robert Tsai2011-05-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c1f33130d9d2100e6232f8f3c782949c75205be6 Change-Id: I8c2bd923d9dedf89c784199f03fba0e2cfc12009
* | | | | | | Merge "Implement Felica timeout handling (libNFC)."Martijn Coenen2011-06-063-2/+13
|\ \ \ \ \ \ \
| * | | | | | | Implement Felica timeout handling (libNFC).Martijn Coenen2011-06-033-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1a88ae0807d5ba53a635e31f3c5284906bd40ea2
* | | | | | | | Add support for connecting to NfcA on IsoDep tags.Martijn Coenen2011-06-061-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always add a ISO14443-3A device handle for tags that are found through the A-gate. This allows the upper stack to connect and maintain a connection to the NfcA technology, even if the tag has IsoDep on top of NfcA. The reason this can work is that libnfc does do the IsoDep activation in software, and if the NfcA target is on a separate handle this activation will not take place if you connect to this handle. Bug: 4195403 Change-Id: I00015e74bdadc6666c2971f8102244670a76e340
* | | | | | | | Update V(RA) counter in LLCP sockets any time it is needed.Sylvain Fonteneau2011-06-031-173/+56
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At some points, the V(RA) socket counter (used for Receive Window checking in connection-oriented sockets) was not properly updated, thus leading to sometimes reject (FRMR) inbound I-frames with valid sequence numbers. This patch factorize the I-frame emission and update V(RA) in the factorized code to ensure this is done at any time. Change-Id: Ic7ef92cb136c32e524a14e31a8d350f7b165c367
* | | | | | | am ddc02ca4: am 53e86a53: am 4be773ca: Update P2P Modes.Nick Pelly2011-06-022-7/+9
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'ddc02ca4ec8d93f17d63c2fb09a3b9ef1919b352': Update P2P Modes.
| * | | | | | am 53e86a53: am 4be773ca: Update P2P Modes.Nick Pelly2011-05-292-7/+9
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '53e86a536b5cc4b80703115aa4fd478ce4ac470b': Update P2P Modes.
| | * | | | | am 4be773ca: Update P2P Modes.Nick Pelly2011-05-232-7/+9
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '4be773cac714184b24bc9d4191b778efefe16472': Update P2P Modes.
| | | * | | | Update P2P Modes.Nick Pelly2011-05-232-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o Fix DEFAULT_NFCIP_INITIATOR_MODE_SUPPORT, DEFAULT_NFCIP_TARGET_MODE_SUPPORT to allow all possible modes (actual modes selected by Nfc.apk). o Fix phNfc_eP2PMode_t enum to list initiator modes. Change-Id: I841b6f1387ac536f47d357a0430eb9362b419810
* | | | | | | 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.
generated by cgit v1.1 at 2025-01-11 10:23:42 +0000