summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | Delay 5ms after FW SW reset command due to clock instability.Nick Pelly2011-07-141-0/+6
* | | | | | | | | am 47de55ab: am 0ca6912a: resolved conflicts for merge of a0cd2ea1 to gingerb...David 'Digit' Turner2011-07-130-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | / / / / / | | |_|/ / / / / | |/| | | | | |
| * | | | | | | am 0ca6912a: resolved conflicts for merge of a0cd2ea1 to gingerbread-plus-aospDavid 'Digit' Turner2011-07-110-0/+0
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | resolved conflicts for merge of a0cd2ea1 to gingerbread-plus-aospDavid 'Digit' Turner2011-07-120-0/+0
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | merge intel x86 patches into gingerbread branchDavid 'Digit' Turner2011-07-081-1/+4
| | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | | * | | | Don't set ARM flags for non arm buildsBruce Beare2011-07-071-1/+4
| | | |/ / / /
* | | | | | | Patch to decrease the maximum packet size for NFC firmware downloadDaniel Tomas2011-07-121-3/+3
* | | | | | | Return partial response on timeout during uart read()Nick Pelly2011-07-081-1/+1
* | | | | | | Check SAP range in LLCP sockets.Sylvain Fonteneau2011-07-042-11/+49
* | | | | | | 2 second timeout on read().Nick Pelly2011-07-012-0/+40
* | | | | | | am 51c0ca53: am f1612434: am 967359c8: Patch to support the new PN544 firmwar...Daniel Tomas2011-06-285-5/+88
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am f1612434: am 967359c8: Patch to support the new PN544 firmware eventsDaniel Tomas2011-06-285-5/+88
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 967359c8: Patch to support the new PN544 firmware eventsDaniel Tomas2011-06-285-5/+88
| | |\ \ \ \ \ | | | |/ / / / | | | | | | / | | | |_|_|/ | | |/| | |
| | | * | | Patch to support the new PN544 firmware eventsDaniel Tomas2011-06-285-5/+88
* | | | | | Patch to add the windowing support in the libnfcDaniel Tomas2011-06-288-196/+340
* | | | | | Print warning if no FW file found.Nick Pelly2011-06-272-2/+7
* | | | | | Improve LOW_LEVEL_TRACES logging.Nick Pelly2011-06-272-11/+10
* | | | | | 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