| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | | | | | | | | | | | | | | | keep history | android-merger | 2011-09-09 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | am df674e5f: (-s ours) am bcc8233b: resolved conflicts for merge of 6900b4e2 ... | Jeff Hamilton | 2011-09-15 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | am bcc8233b: resolved conflicts for merge of 6900b4e2 to gingerbread-plus-aosp | Jeff Hamilton | 2011-09-12 | 10 | -373/+1582 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of 6900b4e2 to gingerbread-plus-aosp | Jeff Hamilton | 2011-09-12 | 10 | -373/+1582 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | Patch to add Secure Download Mechanism in the libnfc | Daniel TOMAS | 2011-09-09 | 10 | -373/+1582 | |
| * | | | | | | | | | | | | | | | | | | | | Merge commit 'df34eb0e' into manualmerge | Jeff Hamilton | 2011-09-13 | 3 | -23/+50 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | / / / / / / / / / / / / / / | |_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | am dd163fe4: am df82c4dd: Patch to add an API to load a FW image in the libnfc | Daniel TOMAS | 2011-09-09 | 3 | -23/+50 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | am df82c4dd: Patch to add an API to load a FW image in the libnfc | Daniel TOMAS | 2011-09-09 | 3 | -23/+50 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | | | | | | | Patch to add an API to load a FW image in the libnfc | Daniel TOMAS | 2011-09-09 | 3 | -23/+50 | |
| * | | | | | | | | | | | | | | | | | | | Merge "Felica system code related changes" | Martijn Coenen | 2011-09-01 | 6 | -79/+230 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | Felica system code related changes | Sunil Jogi | 2011-08-08 | 6 | -79/+230 | |
| * | | | | | | | | | | | | | | | | | | | Add the NXP_EVT_SE_SWITCH_MODE event support in the libnfc. | Daniel Tomas | 2011-08-24 | 2 | -2/+67 | |
| * | | | | | | | | | | | | | | | | | | | Fix for removing unnecessary DESELECT before P2P activation in case | Sunil Jogi | 2011-08-24 | 1 | -0/+4 | |
| | |_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Revert "Add the NXP_EVT_SE_SWITCH_MODE event support in the libnfc." | Nick Pelly | 2011-08-18 | 2 | -67/+2 | |
| | |_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Add the NXP_EVT_SE_SWITCH_MODE event support in the libnfc. | Daniel Tomas | 2011-08-16 | 2 | -2/+67 | |
| |/ / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | Reconcile with gingerbread-mr4-release | The Android Open Source Project | 2011-08-04 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / | |/| | | | / / / / / / / / / / | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Merge remote branch 'goog/gingerbread-release' into gingerbread-mr4-release | The Android Automerger | 2011-08-02 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | ISO15693 Format fix | Sunil Jogi | 2011-08-02 | 1 | -80/+66 | |
| | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Reconcile with gingerbread-mr4-release | The Android Open Source Project | 2011-07-27 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | Patch to support multiple connection on Multiple protocol TAG | Daniel Tomas | 2011-07-25 | 3 | -0/+12 | |
| * | | | | | | | | | | | | | | Print a warning message on NXP_EVT_INFO_MEM_VIOLATION. | Nick Pelly | 2011-07-27 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | Merge "Don't wait for timeout to send SYMM PDU's." | Martijn Coenen | 2011-07-27 | 1 | -17/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Don't wait for timeout to send SYMM PDU's. | Martijn Coenen | 2011-07-27 | 1 | -17/+9 | |
| * | | | | | | | | | | | | | | am 6c66debf: am af5fad81: am 90604ed6: Merge "Merge from gingerbread" | Jean-Baptiste Queru | 2011-07-26 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | am af5fad81: am 90604ed6: Merge "Merge from gingerbread" | Jean-Baptiste Queru | 2011-07-25 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | am 90604ed6: Merge "Merge from gingerbread" | Jean-Baptiste Queru | 2011-07-25 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge "Merge from gingerbread" | Jean-Baptiste Queru | 2011-07-25 | 5 | -5/+88 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge from gingerbread | Jean-Baptiste Queru | 2011-07-25 | 5 | -5/+88 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | Add the ability to enable LLCP logging. | Jeff Hamilton | 2011-07-26 | 3 | -4/+8 | |
| * | | | | | | | | | | | | | | | | Merge "Fixed LLCP receive function when accessing RW." | Martijn Coenen | 2011-07-26 | 1 | -21/+20 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Fixed LLCP receive function when accessing RW. | Sylvain Fonteneau | 2011-07-25 | 1 | -21/+20 | |
| * | | | | | | | | | | | | | | | | Merge "Deal with LLCP send errors properly (part 1)." | Martijn Coenen | 2011-07-26 | 2 | -51/+30 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | / / / / / / / | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Deal with LLCP send errors properly (part 1). | Martijn Coenen | 2011-07-25 | 2 | -51/+30 | |
| * | | | | | | | | | | | | | | | am 0c4a5508: am d8b82bee: am 34caeca8: Patch to support multiple connection o... | Daniel Tomas | 2011-07-25 | 3 | -0/+12 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| / / / / / / / / / / / / / | |/ / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | am d8b82bee: am 34caeca8: Patch to support multiple connection on Multiple pr... | Daniel Tomas | 2011-07-25 | 3 | -0/+12 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | am 34caeca8: Patch to support multiple connection on Multiple protocol TAG | Daniel Tomas | 2011-07-21 | 3 | -0/+12 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | Patch to support multiple connection on Multiple protocol TAG | Daniel Tomas | 2011-07-14 | 3 | -0/+12 | |
| * | | | | | | | | | | | | | | Factorized and fixed code for automatic LLCP socket binding. | Sylvain Fonteneau | 2011-07-25 | 1 | -18/+41 | |
| * | | | | | | | | | | | | | | Increase number of LLCP sockets from 5 to 10. | Martijn Coenen | 2011-07-25 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Reconcile with gingerbread-mr4-release | The Android Open Source Project | 2011-07-21 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | / / / / / | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Patch to support the new PN544 firmware events | Daniel Tomas | 2011-06-30 | 5 | -5/+88 | |
| * | | | | | | | | | | | | Merge "getTimeout() support in libnfc-nxp." | Martijn Coenen | 2011-07-21 | 2 | -0/+22 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | getTimeout() support in libnfc-nxp. | Martijn Coenen | 2011-07-20 | 2 | -0/+22 | |
| | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | Latest phDnldNfc.c code from NXP. | Nick Pelly | 2011-07-19 | 1 | -76/+224 | |
| | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Reconcile with gingerbread-release | The Android Open Source Project | 2011-07-18 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | / / | | |_|_|_|_|_|/ / | |/| | | | | | | | ||||||
| | * | | | | | | | | reset back to latest, and keep history | android-merger | 2011-07-13 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| | | * | | | | | | | temp reset to 39, and keep history | android-merger | 2011-07-12 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | | Revert "Patch to decrease the maximum packet size for NFC firmware download" | Nick Pelly | 2011-07-14 | 1 | -3/+3 | |
| * | | | | | | | | | Disable read() timeout. | Nick Pelly | 2011-07-14 | 1 | -1/+1 | |
| * | | | | | | | | | Merge "Delay 5ms after FW SW reset command due to clock instability." | Nick Pelly | 2011-07-14 | 1 | -0/+6 | |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
 |
index : external_libnfc-nxp.git | |
| external/libnfc-nxp | git repository hosting |
| summaryrefslogtreecommitdiffstats |