1. 18985d0 Use a 10s timeout in uart_read() in FW download mode. by Nick Pelly · 13 years ago ics-factoryrom-2-release ics-mr0 ics-mr0-release android-4.0.1_r1 android-4.0.1_r1.1 android-4.0.1_r1.2 android-4.0.2_r1 android-cts-4.0_r1 android-sdk-adt_r16.0.1
  2. 17abc6e Merge "Remove NFC I2C workaround for Prime (DO NOT MERGE)." into ics-mr0 by Martijn Coenen · 13 years ago
  3. 5ea62ad Fixes to LLC and DAL to handle unreliable UART. by Nick Pelly · 13 years ago
  4. bb6fce1 Remove NFC I2C workaround for Prime (DO NOT MERGE). by Martijn Coenen · 13 years ago
  5. 31e4d8b am 6dd94832: Manual port of 6900b4 from gingerbread: by Rob von Behren · 13 years ago
  6. 6dd9483 Manual port of 6900b4 from gingerbread: by Rob von Behren · 13 years ago
  7. f3c6581 Reconcile with gingerbread-release gingerbread-mr4-release by The Android Open Source Project · 13 years ago
  8. 2f293c7 am df674e5f: (-s ours) am bcc8233b: resolved conflicts for merge of 6900b4e2 to gingerbread-plus-aosp by Jeff Hamilton · 13 years ago
  9. d531c36 keep history after reset to GRK39D by Ed Heyl · 13 years ago gingerbread-release android-2.3.6_r1
  10. 71b688d Merge commit 'df34eb0e' into manualmerge by Jeff Hamilton · 13 years ago
  11. f9c00ef keep history after reconcile of gingerbread-release by The Android Automerger · 13 years ago gingerbread-mr4-release android-2.3.7_r1
  12. df674e5 am bcc8233b: resolved conflicts for merge of 6900b4e2 to gingerbread-plus-aosp by Jeff Hamilton · 13 years ago
  13. bcc8233 resolved conflicts for merge of 6900b4e2 to gingerbread-plus-aosp by Jeff Hamilton · 13 years ago
  14. f99b85b keep history by android-merger · 13 years ago
  15. df34eb0 am dd163fe4: am df82c4dd: Patch to add an API to load a FW image in the libnfc by Daniel TOMAS · 13 years ago
  16. dd163fe am df82c4dd: Patch to add an API to load a FW image in the libnfc by Daniel TOMAS · 13 years ago
  17. 6900b4e Patch to add Secure Download Mechanism in the libnfc by Daniel TOMAS · 13 years ago gingerbread android-cts-2.3_r10 android-cts-2.3_r11 android-cts-2.3_r12
  18. df82c4d Patch to add an API to load a FW image in the libnfc by Daniel TOMAS · 13 years ago
  19. 76a56ba Merge "Felica system code related changes" by Martijn Coenen · 13 years ago
  20. 868cc2d Add the NXP_EVT_SE_SWITCH_MODE event support in the libnfc. by Daniel Tomas · 13 years ago
  21. e13ca0d Fix for removing unnecessary DESELECT before P2P activation in case by Sunil Jogi · 13 years ago
  22. 5b80cbb Revert "Add the NXP_EVT_SE_SWITCH_MODE event support in the libnfc." by Nick Pelly · 13 years ago
  23. 3903838 Add the NXP_EVT_SE_SWITCH_MODE event support in the libnfc. by Daniel Tomas · 13 years ago
  24. dd7125f Felica system code related changes by Sunil Jogi · 13 years ago
  25. 34af960 Reconcile with gingerbread-mr4-release by The Android Open Source Project · 13 years ago
  26. 34093f2 ISO15693 Format fix by Sunil Jogi · 13 years ago
  27. c7643ea Merge remote branch 'goog/gingerbread-release' into gingerbread-mr4-release by The Android Automerger · 13 years ago
  28. e24fff5 Reconcile with gingerbread-mr4-release by The Android Open Source Project · 13 years ago
  29. 4ae1db7 Print a warning message on NXP_EVT_INFO_MEM_VIOLATION. by Nick Pelly · 13 years ago
  30. 979c4c6 Merge "Don't wait for timeout to send SYMM PDU's." by Martijn Coenen · 13 years ago
  31. 54b847c Don't wait for timeout to send SYMM PDU's. by Martijn Coenen · 13 years ago
  32. 9ce2972 am 6c66debf: am af5fad81: am 90604ed6: Merge "Merge from gingerbread" by Jean-Baptiste Queru · 13 years ago
  33. 57d2464 Add the ability to enable LLCP logging. by Jeff Hamilton · 13 years ago
  34. f70efa7 Merge "Fixed LLCP receive function when accessing RW." by Martijn Coenen · 13 years ago
  35. cdfcf68 Merge "Deal with LLCP send errors properly (part 1)." by Martijn Coenen · 13 years ago
  36. 6c66deb am af5fad81: am 90604ed6: Merge "Merge from gingerbread" by Jean-Baptiste Queru · 13 years ago
  37. af5fad8 am 90604ed6: Merge "Merge from gingerbread" by Jean-Baptiste Queru · 13 years ago
  38. 90604ed Merge "Merge from gingerbread" by Jean-Baptiste Queru · 13 years ago
  39. 9d52bfc Merge from gingerbread by Jean-Baptiste Queru · 13 years ago
  40. 3792627 Fixed LLCP receive function when accessing RW. by Sylvain Fonteneau · 13 years ago
  41. cb9d6b8 am 0c4a5508: am d8b82bee: am 34caeca8: Patch to support multiple connection on Multiple protocol TAG by Daniel Tomas · 13 years ago
  42. 4510126 Deal with LLCP send errors properly (part 1). by Martijn Coenen · 13 years ago
  43. fbff1ec Factorized and fixed code for automatic LLCP socket binding. by Sylvain Fonteneau · 13 years ago
  44. 0c4a550 am d8b82bee: am 34caeca8: Patch to support multiple connection on Multiple protocol TAG by Daniel Tomas · 13 years ago
  45. 67d73fb Patch to support multiple connection on Multiple protocol TAG by Daniel Tomas · 13 years ago
  46. 3002430 Increase number of LLCP sockets from 5 to 10. by Martijn Coenen · 13 years ago
  47. d8b82be am 34caeca8: Patch to support multiple connection on Multiple protocol TAG by Daniel Tomas · 13 years ago
  48. 0c4bea9 Reconcile with gingerbread-mr4-release by The Android Open Source Project · 13 years ago
  49. 2b72906 Merge "getTimeout() support in libnfc-nxp." by Martijn Coenen · 13 years ago
  50. b783229 getTimeout() support in libnfc-nxp. by Martijn Coenen · 13 years ago
  51. 8c9b94d Latest phDnldNfc.c code from NXP. by Nick Pelly · 13 years ago
  52. 9be5ac5 Reconcile with gingerbread-release by The Android Open Source Project · 13 years ago
  53. 8e65f6b Revert "Patch to decrease the maximum packet size for NFC firmware download" by Nick Pelly · 13 years ago
  54. 193b150 Disable read() timeout. by Nick Pelly · 13 years ago
  55. 34caeca Patch to support multiple connection on Multiple protocol TAG by Daniel Tomas · 13 years ago
  56. 709ed1d Merge "Delay 5ms after FW SW reset command due to clock instability." by Nick Pelly · 13 years ago
  57. f15b457 Delay 5ms after FW SW reset command due to clock instability. by Nick Pelly · 13 years ago
  58. 6c3019d reset back to latest, and keep history by android-merger · 13 years ago android-2.3.6_r0.9
  59. 23a22e9 am 47de55ab: am 0ca6912a: resolved conflicts for merge of a0cd2ea1 to gingerbread-plus-aosp by David 'Digit' Turner · 13 years ago
  60. 294b456 Patch to decrease the maximum packet size for NFC firmware download by Daniel Tomas · 13 years ago
  61. 7def4be temp reset to 39, and keep history by android-merger · 13 years ago
  62. 47de55a am 0ca6912a: resolved conflicts for merge of a0cd2ea1 to gingerbread-plus-aosp by David 'Digit' Turner · 13 years ago
  63. 0ca6912 resolved conflicts for merge of a0cd2ea1 to gingerbread-plus-aosp by David 'Digit' Turner · 13 years ago
  64. a0cd2ea merge intel x86 patches into gingerbread branch by David 'Digit' Turner · 13 years ago
  65. a2f8fdd Return partial response on timeout during uart read() by Nick Pelly · 13 years ago
  66. 7623b0c Don't set ARM flags for non arm builds by Bruce Beare · 13 years ago
  67. 3a9d18f Check SAP range in LLCP sockets. by Sylvain Fonteneau · 13 years ago
  68. a74fcf0 2 second timeout on read(). by Nick Pelly · 13 years ago
  69. e86173f Patch to support the new PN544 firmware events by Daniel Tomas · 13 years ago
  70. f6ee24c am 51c0ca53: am f1612434: am 967359c8: Patch to support the new PN544 firmware events by Daniel Tomas · 13 years ago
  71. 51c0ca5 am f1612434: am 967359c8: Patch to support the new PN544 firmware events by Daniel Tomas · 13 years ago
  72. f161243 am 967359c8: Patch to support the new PN544 firmware events by Daniel Tomas · 13 years ago
  73. b313c3d Patch to add the windowing support in the libnfc by Daniel Tomas · 13 years ago
  74. 967359c Patch to support the new PN544 firmware events by Daniel Tomas · 13 years ago android-cts-2.3_r5
  75. 8d4d6a1 Print warning if no FW file found. by Nick Pelly · 13 years ago
  76. fafed3c Improve LOW_LEVEL_TRACES logging. by Nick Pelly · 13 years ago
  77. 34ff48f libnfc spring cleaning by Nick Pelly · 13 years ago
  78. d4cb91e Implement power control and firmware download for UART. by Nick Pelly · 13 years ago
  79. 23482d0 Do not allow run-time LOW_LEVEL_TRACES on user builds. by Nick Pelly · 13 years ago
  80. 4b276c9 Misc changes for Nexus Prime bringup. by Nick Pelly · 13 years ago
  81. f93b21f Merge "Make NfcA timeout configurable in libnfc." by Martijn Coenen · 13 years ago
  82. ad0b7fc Reconcile with gingerbread-release by Jean-Baptiste Queru · 13 years ago
  83. 178bcc3 merge in gingerbread-release history after reset to gingerbread by The Android Automerger · 13 years ago android-2.3.5_r1
  84. d66c8b1 am 252aedb3: am 6a7a2870: am 99141cdd: Sleep 500us between i2c writes, as per latest advice from NXP. by Nick Pelly · 13 years ago
  85. 01a91ea Make NfcA timeout configurable in libnfc. by Martijn Coenen · 13 years ago
  86. 5a84ba3 am 055a5f95: am b76c80da: am 80c2d409: Merge "Prevent NFC crash-loop if firmware cannot be loaded." by Jean-Baptiste Queru · 13 years ago
  87. 4812a72 Patch to dynamically enable NFC LOW_LEVEL_TRACES by Nick Pelly · 13 years ago
  88. 252aedb am 6a7a2870: am 99141cdd: Sleep 500us between i2c writes, as per latest advice from NXP. by Nick Pelly · 13 years ago
  89. 6a7a287 am 99141cdd: Sleep 500us between i2c writes, as per latest advice from NXP. by Nick Pelly · 13 years ago
  90. 99141cd Sleep 500us between i2c writes, as per latest advice from NXP. by Nick Pelly · 13 years ago
  91. 055a5f9 am b76c80da: am 80c2d409: Merge "Prevent NFC crash-loop if firmware cannot be loaded." by Jean-Baptiste Queru · 13 years ago
  92. 76ca357 Reconcile with gingerbread-release by Jean-Baptiste Queru · 13 years ago
  93. 643a774 am 5da30972: am 3860b6c3: am ffef6844: Merge "Guard some code by LOW_LEVEL_TRACES; see c1f33130d9d2100e6232f8f3c782949c75205be6" into gingerbread by Nick Pelly · 13 years ago
  94. a66737d Merge "Implement Felica timeout handling (libNFC)." by Martijn Coenen · 13 years ago
  95. 5da3097 am 3860b6c3: am ffef6844: Merge "Guard some code by LOW_LEVEL_TRACES; see c1f33130d9d2100e6232f8f3c782949c75205be6" into gingerbread by Nick Pelly · 13 years ago
  96. 97ffda5 Add support for connecting to NfcA on IsoDep tags. by Martijn Coenen · 13 years ago
  97. 1db6f8e Implement Felica timeout handling (libNFC). by Martijn Coenen · 13 years ago
  98. 60d8ea8 Update V(RA) counter in LLCP sockets any time it is needed. by Sylvain Fonteneau · 13 years ago
  99. b76c80d am 80c2d409: Merge "Prevent NFC crash-loop if firmware cannot be loaded." by Jean-Baptiste Queru · 13 years ago
  100. 577a6bc am ddc02ca4: am 53e86a53: am 4be773ca: Update P2P Modes. by Nick Pelly · 13 years ago