summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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
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
2011-10-21Remove NFC I2C workaround for Prime (DO NOT MERGE).Martijn Coenen
2011-09-22am 6dd94832: Manual port of 6900b4 from gingerbread:Rob von Behren
2011-09-20Manual port of 6900b4 from gingerbread:Rob von Behren
2011-09-15Reconcile with gingerbread-release gingerbread-mr4-releaseThe Android Open Source Project
2011-09-15am df674e5f: (-s ours) am bcc8233b: resolved conflicts for merge of 6900b4e2 ...Jeff Hamilton
2011-09-14keep history after reset to GRK39Dandroid-2.3.6_r1gingerbread-releaseEd Heyl
2011-09-13Merge commit 'df34eb0e' into manualmergeJeff Hamilton
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
2011-09-12resolved conflicts for merge of 6900b4e2 to gingerbread-plus-aospJeff Hamilton
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
2011-09-09am df82c4dd: Patch to add an API to load a FW image in the libnfcDaniel TOMAS
2011-09-09Patch to add Secure Download Mechanism in the libnfcandroid-cts-2.3_r12android-cts-2.3_r11android-cts-2.3_r10gingerbreadDaniel TOMAS
2011-09-09Patch to add an API to load a FW image in the libnfcDaniel TOMAS
2011-09-01Merge "Felica system code related changes"Martijn Coenen
2011-08-24Add the NXP_EVT_SE_SWITCH_MODE event support in the libnfc.Daniel Tomas
2011-08-24Fix for removing unnecessary DESELECT before P2P activation in caseSunil Jogi
2011-08-18Revert "Add the NXP_EVT_SE_SWITCH_MODE event support in the libnfc."Nick Pelly
2011-08-16Add the NXP_EVT_SE_SWITCH_MODE event support in the libnfc.Daniel Tomas
2011-08-08Felica system code related changesSunil Jogi
2011-08-04Reconcile with gingerbread-mr4-releaseThe Android Open Source Project
2011-08-02ISO15693 Format fixSunil Jogi
2011-08-02Merge remote branch 'goog/gingerbread-release' into gingerbread-mr4-releaseThe Android Automerger
2011-07-27Reconcile with gingerbread-mr4-releaseThe Android Open Source Project
2011-07-27Print a warning message on NXP_EVT_INFO_MEM_VIOLATION.Nick Pelly
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
2011-07-26am 6c66debf: am af5fad81: am 90604ed6: Merge "Merge from gingerbread"Jean-Baptiste Queru
2011-07-26Add the ability to enable LLCP logging.Jeff Hamilton
2011-07-26Merge "Fixed LLCP receive function when accessing RW."Martijn Coenen
2011-07-26Merge "Deal with LLCP send errors properly (part 1)."Martijn Coenen
2011-07-25am af5fad81: am 90604ed6: Merge "Merge from gingerbread"Jean-Baptiste Queru
2011-07-25am 90604ed6: Merge "Merge from gingerbread"Jean-Baptiste Queru
2011-07-25Merge "Merge from gingerbread"Jean-Baptiste Queru
2011-07-25Merge from gingerbreadJean-Baptiste Queru
2011-07-25Fixed LLCP receive function when accessing RW.Sylvain Fonteneau
2011-07-25am 0c4a5508: am d8b82bee: am 34caeca8: Patch to support multiple connection o...Daniel Tomas
2011-07-25Deal with LLCP send errors properly (part 1).Martijn Coenen
2011-07-25Factorized and fixed code for automatic LLCP socket binding.Sylvain Fonteneau
2011-07-25am d8b82bee: am 34caeca8: Patch to support multiple connection on Multiple pr...Daniel Tomas
2011-07-25Patch to support multiple connection on Multiple protocol TAGDaniel Tomas
2011-07-25Increase number of LLCP sockets from 5 to 10.Martijn Coenen
2011-07-21am 34caeca8: Patch to support multiple connection on Multiple protocol TAGDaniel Tomas
2011-07-21Reconcile with gingerbread-mr4-releaseThe Android Open Source Project
2011-07-21Merge "getTimeout() support in libnfc-nxp."Martijn Coenen
2011-07-20getTimeout() support in libnfc-nxp.Martijn Coenen
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 10:39:14 +0000