summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* libnfc spring cleaningNick Pelly2011-06-2722-101/+139
* Implement power control and firmware download for UART.Nick Pelly2011-06-225-104/+123
* Do not allow run-time LOW_LEVEL_TRACES on user builds.Nick Pelly2011-06-201-6/+16
* Misc changes for Nexus Prime bringup.Nick Pelly2011-06-144-31/+33
* 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
* | Reconcile with gingerbread-releaseJean-Baptiste Queru2011-06-090-0/+0
|\ \
| * \ 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 per...Nick Pelly2011-06-091-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | am 6a7a2870: am 99141cdd: Sleep 500us between i2c writes, as per latest advic...Nick Pelly2011-06-081-0/+1
| |\ \ \
| | * \ \ am 99141cdd: Sleep 500us between i2c writes, as per latest advice from NXP.Nick Pelly2011-06-081-0/+1
| | |\ \ \ | | | |/ /
| | | * | Sleep 500us between i2c writes, as per latest advice from NXP.Nick Pelly2011-06-081-0/+1
* | | | | am 055a5f95: am b76c80da: am 80c2d409: Merge "Prevent NFC crash-loop if firmw...Jean-Baptiste Queru2011-06-082-5/+9
|\ \ \ \ \ | |/ / / /
| * | | | am b76c80da: am 80c2d409: Merge "Prevent NFC crash-loop if firmware cannot be...Jean-Baptiste Queru2011-06-072-5/+9
| |\ \ \ \ | | |/ / /
| | * | | am 80c2d409: Merge "Prevent NFC crash-loop if firmware cannot be loaded."Jean-Baptiste Queru2011-06-032-5/+9
| | |\ \ \
| | | * \ \ 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
| | | |/ / /
* | | | | | Patch to dynamically enable NFC LOW_LEVEL_TRACESNick Pelly2011-06-081-6/+29
* | | | | | Reconcile with gingerbread-releaseJean-Baptiste Queru2011-06-070-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | 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 LOW_LEVEL_TR...Nick Pelly2011-06-071-0/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am 3860b6c3: am ffef6844: Merge "Guard some code by LOW_LEVEL_TRACES; see c1f...Nick Pelly2011-06-061-0/+2
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | am ffef6844: Merge "Guard some code by LOW_LEVEL_TRACES; see c1f33130d9d2100e...Nick Pelly2011-05-251-0/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Guard some code by LOW_LEVEL_TRACES; see c1f33130d9d2100e6232f8f3c7829...Nick Pelly2011-05-251-0/+2
| | | |\ \ \
| | | | * | | Guard some code by LOW_LEVEL_TRACES; see c1f33130d9d2100e6232f8f3c782949c7520...Robert Tsai2011-05-241-0/+2
* | | | | | | Merge "Implement Felica timeout handling (libNFC)."Martijn Coenen2011-06-063-2/+13
|\ \ \ \ \ \ \
| * | | | | | | Implement Felica timeout handling (libNFC).Martijn Coenen2011-06-033-2/+13
* | | | | | | | Add support for connecting to NfcA on IsoDep tags.Martijn Coenen2011-06-061-8/+4
* | | | | | | | Update V(RA) counter in LLCP sockets any time it is needed.Sylvain Fonteneau2011-06-031-173/+56
|/ / / / / / /
* | | | | | | am ddc02ca4: am 53e86a53: am 4be773ca: Update P2P Modes.Nick Pelly2011-06-022-7/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 53e86a53: am 4be773ca: Update P2P Modes.Nick Pelly2011-05-292-7/+9
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 4be773ca: Update P2P Modes.Nick Pelly2011-05-232-7/+9
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Update P2P Modes.Nick Pelly2011-05-232-7/+9
* | | | | | | am 91710ed9: am 59827416: am 74decc93: Do not wait 3ms before each write.Nick Pelly2011-06-021-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 59827416: am 74decc93: Do not wait 3ms before each write.Nick Pelly2011-05-291-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 74decc93: Do not wait 3ms before each write.Nick Pelly2011-05-231-1/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Do not wait 3ms before each write.Nick Pelly2011-05-231-1/+1
| | | |/ / /
* | | | | | am 5d96b2d2: am 5a9fc269: Properly merge \'Patch to enable low level traces.\'Daniel Tomas2011-06-021-6/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 5a9fc269: Properly merge \'Patch to enable low level traces.\'Daniel Tomas2011-05-291-6/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Properly merge 'Patch to enable low level traces.'Daniel Tomas2011-05-231-6/+4
* | | | | | am d9ebeefb: am 944e51f4: Merge from gingerbreadJean-Baptiste Queru2011-05-244-0/+48
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 944e51f4: Merge from gingerbreadJean-Baptiste Queru2011-05-234-0/+48
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge from gingerbreadJean-Baptiste Queru2011-05-234-0/+48
| | |\ \ \ \ | | | |/ / /
| | | * | | Patch to enable low level traces.Daniel Tomas2011-05-194-0/+46
* | | | | | Reconcile with gingerbread-releaseThe Android Open Source Project2011-05-200-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | 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
* | | | | | | am ec4b865b: am f4770c64: am 65179442: Fixed LLCP SAP value range.Sylvain Fonteneau2011-05-191-1/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am f4770c64: am 65179442: Fixed LLCP SAP value range.Sylvain Fonteneau2011-05-181-1/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | am 65179442: Fixed LLCP SAP value range.Sylvain Fonteneau2011-05-181-1/+1
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |