summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 34caeca8: Patch to support multiple connection on Multiple protocol TAGDaniel Tomas2011-07-213-0/+12
|\
| * Patch to support multiple connection on Multiple protocol TAGDaniel Tomas2011-07-143-0/+12
* | 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
| |/
* | 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
* | 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 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
| |/ /
* | | 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
* | | | am 4be773ca: Update P2P Modes.Nick Pelly2011-05-232-7/+9
|\ \ \ \ | |/ / /
| * | | Update P2P Modes.Nick Pelly2011-05-232-7/+9
* | | | 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
| |/ /
* | | Properly merge 'Patch to enable low level traces.'Daniel Tomas2011-05-231-6/+4
* | | Merge from gingerbreadJean-Baptiste Queru2011-05-234-0/+48
|\ \ \ | |/ /
| * | Patch to enable low level traces.Daniel Tomas2011-05-194-0/+46
* | | am 65179442: Fixed LLCP SAP value range.Sylvain Fonteneau2011-05-181-1/+1
|\ \ \ | |/ /
| * | Fixed LLCP SAP value range.Sylvain Fonteneau2011-05-161-1/+1
* | | am 92c7e014: Retry i2c read 5 times on i2c read error.Nick Pelly2011-05-121-0/+11
|\ \ \ | |/ / | | / | |/ |/|
| * Retry i2c read 5 times on i2c read error.Nick Pelly2011-05-121-0/+11
* | am e5201c15: Patch to perform a recover in case of a transaction failureDaniel Tomas2011-04-261-11/+23
|\ \ | |/
| * Patch to perform a recover in case of a transaction failureDaniel Tomas2011-04-261-11/+23
* | am 17018c3f: Merge "Enable P2P 106 passive (again)." into gingerbreadJeff Hamilton2011-04-171-2/+2
|\ \ | |/
| * Merge "Enable P2P 106 passive (again)." into gingerbreadJeff Hamilton2011-04-171-2/+2
| |\
| | * Enable P2P 106 passive (again).Nick Pelly2011-04-151-2/+2
* | | am 7b40e6d4: Avoid missing NFCIP inbound frame.Sylvain Fonteneau2011-04-141-1/+1
|\ \ \ | |/ /
| * | Avoid missing NFCIP inbound frame.Sylvain Fonteneau2011-04-141-1/+1
| |/
* | am 46dbed4e: Ignore unreadable TLVs during LLCP activation and CONNECT/CC.Sylvain Fonteneau2011-04-082-9/+15
|\ \ | |/
| * Ignore unreadable TLVs during LLCP activation and CONNECT/CC.Sylvain Fonteneau2011-04-082-9/+15
* | am b7e67c8d: Handle correctly LLCP aggregated frames.Sylvain Fonteneau2011-04-041-5/+8
|\ \ | |/
| * Handle correctly LLCP aggregated frames.Sylvain Fonteneau2011-03-311-5/+8
* | am 00c98d51: Disable P2P target 106 passive mode.Nick Pelly2011-03-184-6/+7
|\ \ | |/
| * Disable P2P target 106 passive mode.Nick Pelly2011-03-184-6/+7
* | am d625fb63: Minor tweaks.Jeff Hamilton2011-03-122-2/+1
|\ \ | |/
| * Minor tweaks.Jeff Hamilton2011-03-122-2/+1
* | am 354aeee4: Fix a compilation bug with PHDBG_TRACES enabled.Jeff Hamilton2011-03-111-1/+1
|\ \ | |/
| * Fix a compilation bug with PHDBG_TRACES enabled.Jeff Hamilton2011-03-111-1/+1
* | am 4f3ef022: Support formatting / makeReadOnly() of NDEF on ICODE.Martijn Coenen2011-02-2410-52/+958
|\ \ | |/
| * Support formatting / makeReadOnly() of NDEF on ICODE.Martijn Coenen2011-02-2510-52/+958
* | am a6e012a7: Added support for NDEF on ICODE.Martijn Coenen2011-02-246-8/+2016
|\ \ | |/
| * Added support for NDEF on ICODE.Martijn Coenen2011-02-256-8/+2016
* | am 29e144eb: Fix to prevent accidental stopping of timers.Jan Brands2011-02-181-0/+5
|\ \ | |/
| * Fix to prevent accidental stopping of timers.Jan Brands2011-02-181-0/+5
* | am a61bf7e2: Narrow down NFCSTATUS_TARGET_LOST responses from libNFC.Martijn Coenen2011-02-181-2/+9
|\ \ | |/