summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-10-26undo reset to ics-mr1 until we have a better methodEd Heyl
2011-10-26reset to ics-mr1, but keep historyEd Heyl
2011-10-26merge in ics-release history after reset to masterThe Android Automerger
2011-10-26am 36623817: Merge remote branch \'goog/ics-mr0\' into ics-mr1Ed Heyl
* commit '366238178f7a6d26ce051150f4fb65e533c2fae4': Use a 10s timeout in uart_read() in FW download mode.
2011-10-26am b13b27aa: Use a 10s timeout in uart_read() in FW download mode.Nick Pelly
* commit 'b13b27aa9bb96897e996cf89ed8412c46ef2cf07': Use a 10s timeout in uart_read() in FW download mode.
2011-10-26merge in ics-mr1-release history after reset to ics-mr1The Android Automerger
2011-10-26Merge remote branch 'goog/ics-mr0' into ics-mr1Ed Heyl
2011-10-25Use a 10s timeout in uart_read() in FW download mode.Nick Pelly
This provides a path to flush RX, necessary when we enter FW download mode with bogus data already in RX. This fixes a problem where NFC was dead on several HSPA and LTE devices. Also decrease FW timeout completition from 120s to 60s. Typically FW download takes 30s, and 120 is unnecessarily large and causes a long delay to bring up NFC when we need to retry FW. Bug: 5468674 Change-Id: I0fd40c199daac861fe5acda4f2d214bdcff8e869
2011-10-25Use a 10s timeout in uart_read() in FW download mode.android-sdk-adt_r16.0.1android-cts-4.0_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1ics-mr0-releaseics-mr0ics-factoryrom-2-releaseNick Pelly
This provides a path to flush RX, necessary when we enter FW download mode with bogus data already in RX. This fixes a problem where NFC was dead on several HSPA and LTE devices. Also decrease FW timeout completition from 120s to 60s. Typically FW download takes 30s, and 120 is unnecessarily large and causes a long delay to bring up NFC when we need to retry FW. Bug: 5468674 Change-Id: I0fd40c199daac861fe5acda4f2d214bdcff8e869
2011-10-23merge in ics-release history after reset to masterThe Android Automerger
2011-10-21am ff39bc6d: (-s ours) am 17abc6eb: (-s ours) Merge "Remove NFC I2C ↵Martijn Coenen
workaround for Prime (DO NOT MERGE)." into ics-mr0 * commit 'ff39bc6d4fb3fa08fc55721a8962c713751fca09': Remove NFC I2C workaround for Prime (DO NOT MERGE).
2011-10-21am 17abc6eb: (-s ours) Merge "Remove NFC I2C workaround for Prime (DO NOT ↵Martijn Coenen
MERGE)." into ics-mr0 * commit '17abc6eb45b326f574c657e227670a8fddf9385e': Remove NFC I2C workaround for Prime (DO NOT MERGE).
2011-10-21Merge "Remove NFC I2C workaround for Prime (DO NOT MERGE)." into ics-mr0Martijn Coenen
2011-10-21Fixes to LLC and DAL to handle unreliable UART.Nick Pelly
Use a 100ms timeout in uart_read() when reading LLC payload only. Allow 200 retries on host. Note that we use pn544 timeout retransmit instead of an explicit REJ (do not use CRC_ERROR_REJ). The reason is that after a dropped frame, a host timeout on read() is the only reliable way to recover frame alignment, but if we send an immediate REJ then we are constantly reading and can never regain frame alignment. Also note that the pn544 timeout (200ms) is higher than the host (100ms). This allows the host to abort a partial read and return to known state before the pn544 re-transmits. We have to turn off timeout for FW mode. Typical read time is ~100ms, but some are 1 second+ Modify DAL & LLC layer to more reliably handle partial frames by searching for a LLC length byte again, and log the various error paths. Also introduce debugging tools: debug.nfc.LOW_LEVEL_TRACES 2 Will enable LLC header decoding in the trace output. Only read at NFC init time, use /data/local.prop to enable. debug.nfc.UART_ERROR_RATE X Will randomly inject errors at the uart transport, with a probability of X/1000 for every byte. 50% of those errors will be a dropped byte, 50% will be corrupted. Recommend X=10. FW mode can't handle any errors. Can be enabled after boot. adb shell dumpsys nfc Will now print the number of errors detected at the LLC layer. Change-Id: I739ed193e3d4caa563a866b6a9d834c154917962
2011-10-21Remove NFC I2C workaround for Prime (DO NOT MERGE).Martijn Coenen
Change-Id: Ie0855f147030552cc1bec0ea05e59576650fa417
2011-09-25merge in ics-release history after reset to masterThe Android Automerger
2011-09-22am 6dd94832: Manual port of 6900b4 from gingerbread:Rob von Behren
* commit '6dd948323de0f31b413c9f19a905f1c145c9c456': Manual port of 6900b4 from gingerbread:
2011-09-20Manual port of 6900b4 from gingerbread:Rob von Behren
Patch to add Secure Download Mechanism in the libnfc This patch permit to support secure download update and also to avoid locking states in case of download failures Bug: 5331837 Change-Id: Ia5b6d9baf57231b0193bbbe85c88c7df557017c6
2011-09-15Reconcile with gingerbread-release gingerbread-mr4-releaseThe Android Open Source Project
Change-Id: Ibcd6e2299e3f03df1a5320041404a42a20546a57
2011-09-15am df674e5f: (-s ours) am bcc8233b: resolved conflicts for merge of 6900b4e2 ↵Jeff Hamilton
to gingerbread-plus-aosp * commit 'df674e5f0385f09d962a2659032ab1afb592b43b': Patch to add Secure Download Mechanism in the libnfc
2011-09-14merge in ics-release history after reset to masterThe Android Automerger
2011-09-14keep history after reset to GRK39Dandroid-2.3.6_r1gingerbread-releaseEd Heyl
2011-09-13Merge commit 'df34eb0e' into manualmergeJeff Hamilton
Change-Id: I9807e540bad19933452f4a9f86b74021265f29cf
2011-09-12keep history after reconcile of gingerbread-releaseandroid-2.3.7_r1gingerbread-mr4-releaseThe Android Automerger
2011-09-12am bcc8233b: resolved conflicts for merge of 6900b4e2 to gingerbread-plus-aospJeff Hamilton
* commit 'bcc8233be93ce2be4e8946ddcd5c33232c9f7a93': Patch to add Secure Download Mechanism in the libnfc
2011-09-12resolved conflicts for merge of 6900b4e2 to gingerbread-plus-aospJeff Hamilton
Change-Id: I54b2b420552d876a5a39a1af7bf29436c16667a9
2011-09-09keep historyandroid-merger
2011-09-09am dd163fe4: am df82c4dd: Patch to add an API to load a FW image in the libnfcDaniel TOMAS
* commit 'dd163fe4ad38d2064de2913697907e45229a8dce': Patch to add an API to load a FW image in the libnfc
2011-09-09am df82c4dd: Patch to add an API to load a FW image in the libnfcDaniel TOMAS
* commit 'df82c4dd7c6d5ad232b5628edf73aa9ea3f8c2c0': Patch to add an API to load a FW image in the libnfc
2011-09-09Patch to add Secure Download Mechanism in the libnfcandroid-cts-2.3_r12android-cts-2.3_r11android-cts-2.3_r10gingerbreadDaniel TOMAS
This patch permit to support secure download update and also to avoid locking states in case of download failures Change-Id: I98aa80976a67b18562ddcff4d085ed415dac4933
2011-09-09Patch to add an API to load a FW image in the libnfcDaniel TOMAS
This new API permit to load the PN544 FW image when a download is needed at boot time. Change-Id: I2b3406d7ae0f0211123bd680ef914e9948c81eef
2011-09-02merge in ics-release history after reset to masterThe Android Automerger
2011-09-01Merge "Felica system code related changes"Martijn Coenen
2011-08-25merge in ics-release history after reset to masterThe Android Automerger
2011-08-24Add the NXP_EVT_SE_SWITCH_MODE event support in the libnfc.Daniel Tomas
This event is used in the SE SetMode API to be able to enable/disable card emulation with not writting the EEPROM area. Change-Id: I80047d678f683c4dd364544c690440eb8d807793
2011-08-24Fix for removing unnecessary DESELECT before P2P activation in caseSunil Jogi
devices are moving in to the range and moving out of the range quickly Change-Id: I090367ad17de443c6af41c9ad507557e3eaaf7f9
2011-08-22merge in ics-release history after reset to masterThe Android Automerger
2011-08-18Revert "Add the NXP_EVT_SE_SWITCH_MODE event support in the libnfc."Nick Pelly
This reverts commit 39038381fd4a9922cdd07251ce1a0a8840681bcd.
2011-08-17merge in ics-release history after reset to masterThe Android Automerger
2011-08-16Add the NXP_EVT_SE_SWITCH_MODE event support in the libnfc.Daniel Tomas
This event is used in the SE SetMode API to be able to enable/disable card emulation with not writting the EEPROM area. Change-Id: Iace438c3625f6a084c8bcc66d787a7a60d56b8f8
2011-08-08Felica system code related changesSunil Jogi
Modified implementation for Felica card handling includes following: - SENSF_REQ with RC=0x00 during discovery - T3T NDEF detection with SC = 0x12FC - If card is not NDEF then poll for primary SC - NFC-F presence check with check for expected IDm Change-Id: I8e7e83a36ec2c6e8e423df751c4bc73badb6edb5
2011-08-04Reconcile with gingerbread-mr4-releaseThe Android Open Source Project
Change-Id: I23cc7b0d87009f561a4b0dae352b5fb445530c91
2011-08-03merge in ics-release history after reset to masterThe Android Automerger
2011-08-02ISO15693 Format fixSunil Jogi
Added for check of first 4 bytes 0x00 before performing NDEF format of ISO15693 tag. Updated with usage of Read one block. Change-Id: I7a5299edb67ca70f7af5ef5a0909225c0bdf8cb0
2011-08-02Merge remote branch 'goog/gingerbread-release' into gingerbread-mr4-releaseThe Android Automerger
2011-07-28merge in ics-release history after reset to masterThe Android Automerger
2011-07-27Reconcile with gingerbread-mr4-releaseThe Android Open Source Project
Change-Id: I4370e0216d87765c3ccb2df760327a38228b3fe8
2011-07-27Print a warning message on NXP_EVT_INFO_MEM_VIOLATION.Nick Pelly
This indicates the pn544 trim values were over-written by the faulty FW procedure, I have a FW to reset trim values to default. Revert this commit before ship. It should only be needed for dev phones. Change-Id: I77d3d66b6937f181c83022a0e0791a44974c51ae
2011-07-27Merge "Don't wait for timeout to send SYMM PDU's."Martijn Coenen
2011-07-27Don't wait for timeout to send SYMM PDU's.Martijn Coenen
The LLCP stack was holding onto the "I'm allowed to send" token for the full link time-out, even if there was nothing to send. This caused very bad round-trip delays. This fix just gives the token back immediately if there's nothing to send. Change-Id: Ib7bf87bd5fada2b682d28c9502b5ef010cd39815
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 10:07:16 +0000