summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Delay 5ms after FW SW reset command due to clock instability.Nick Pelly2011-07-141-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was preventing reliable FW download. Change-Id: I28e5cb1e5855974f51578f5d45f2c581a75b2d07
* | | | | | | | | am 47de55ab: am 0ca6912a: resolved conflicts for merge of a0cd2ea1 to ↵David 'Digit' Turner2011-07-130-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | / / / / / | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | gingerbread-plus-aosp * commit '47de55ab634c08a1554adb50423cefc15235d600': Don't set ARM flags for non arm builds
| * | | | | | | am 0ca6912a: resolved conflicts for merge of a0cd2ea1 to gingerbread-plus-aospDavid 'Digit' Turner2011-07-110-0/+0
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '0ca6912acf53a4081b9312d3b628a87f81dadc52': Don't set ARM flags for non arm builds
| | * | | | | | resolved conflicts for merge of a0cd2ea1 to gingerbread-plus-aospDavid 'Digit' Turner2011-07-120-0/+0
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | Change-Id: I1ddde3dc5c8f78a99b7181be9146b2097c7d10ed
| | | * | | | | 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
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia57a9aa018a4a5d1cd5b9a4bc562bc5cc061484a Orig-Change-Id: Iee47aaa4c341812ed6671abc8b19bdd9dc4f77cf Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
* | | | | | | Patch to decrease the maximum packet size for NFC firmware downloadDaniel Tomas2011-07-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch permit to decrease the max packet size to 64 bytes from 512 bytes and to fix an issue faced in response_data buffer with the new packet size. Change-Id: Ifc5cc9910b3b1a71b88624cd04c2bada7f1a413f
* | | | | | | Return partial response on timeout during uart read()Nick Pelly2011-07-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is just to match the behavior in the old uart read DAL. It does not actually fix any problems, just pushes errors higher in stack. Change-Id: Iee065f39a006804be2618c3704e32b3f41a8a59e
* | | | | | | Check SAP range in LLCP sockets.Sylvain Fonteneau2011-07-042-11/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LLCP specification mentions that SAP numbers are allocated as follows: - from 0x00 to 0x0F, used for well-known services - from 0x10 to 0x1F, used for SDP advertised services - from 0x20 to 0x3F, used for *non* SDP advertised services This patch enforce this restriction. Change-Id: Idd8ab4da4cfa9ad9e2dbf7eddc3c66900bcf9ff8
* | | | | | | 2 second timeout on read().Nick Pelly2011-07-012-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This restores the previous DAL behavior for read. It turns out this is a necessary hack to allow us to abort a pending read when switching to FW download mode due to a non-responsive NFC controller. Change-Id: Ief6f82600bb0603daaa50097a54a5ac42ae0f6b4
* | | | | | | am 51c0ca53: am f1612434: am 967359c8: Patch to support the new PN544 ↵Daniel Tomas2011-06-285-5/+88
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | firmware events * commit '51c0ca53011b86464dcf14aeb33944a69861a8f4': Patch to support the new PN544 firmware events
| * | | | | | am f1612434: am 967359c8: Patch to support the new PN544 firmware eventsDaniel Tomas2011-06-285-5/+88
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'f16124343b080a2f188350de5d5006d14a6eb1bb': Patch to support the new PN544 firmware events
| | * | | | | am 967359c8: Patch to support the new PN544 firmware eventsDaniel Tomas2011-06-285-5/+88
| | |\ \ \ \ \ | | | |/ / / / | | | | | | / | | | |_|_|/ | | |/| | | * commit '967359c892ff74962b4f4243d989f447ffe4ae11': Patch to support the new PN544 firmware events
| | | * | | Patch to support the new PN544 firmware eventsDaniel Tomas2011-06-285-5/+88
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6e5a976721fb52f2da30081276bb2ac15d27d186
* | | | | | Patch to add the windowing support in the libnfcDaniel Tomas2011-06-288-196/+340
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch enables windowing of LLC packets send from chipset to host. The host will now wait for up to 4 LLC packets from the chipset before sending an ACK (S-Frame RR). Change-Id: I6a70e1d780847a104e3ec8e403593a69e222aec9
* | | | | | Print warning if no FW file found.Nick Pelly2011-06-272-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id1ab6a1176fe4e7c559e2348261d0902bdffb03c
* | | | | | Improve LOW_LEVEL_TRACES logging.Nick Pelly2011-06-272-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Log ALL buffers (including size 1 and long buffers). Use a more concise format. This is helpful for debugging FW download failures. Change-Id: I97370e8daf93ce851a036274ffa2856af05b6941
* | | | | | libnfc spring cleaningNick Pelly2011-06-2722-101/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o Fix most libnfc warnings, from 360 to 18 o Make DAL_DEBUG much less verbose and more useful o Clean up Android.mk Done with minimal textual diff to minimize merge conflicts. Change-Id: I918645500723ff7bb092ad9959628fcabac45bec
* | | | | | Implement power control and firmware download for UART.Nick Pelly2011-06-225-104/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also clean up some UART and I2C DAL functions. o Re-enable FW download o Use /system/vendor/firmware for pn544 firmware now o Clean up read() and write() paths for both I2C and UART o Use new sysfs entry for power and FW control on I2C platforms o Remove userspace sleep()'s on power control toggle. They are now done in the kernel as they should be. Change-Id: I39956d36e02c1eb526a5c546bd3cb74edce4ff18
* | | | | | Do not allow run-time LOW_LEVEL_TRACES on user builds.Nick Pelly2011-06-201-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie78432b46ded168c72b5f00dd05ea72287ab155d
* | | | | | Misc changes for Nexus Prime bringup.Nick Pelly2011-06-144-31/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o Fix uart read() implementation o Temporarily disable firmware update o Rename ttySx to ttyOx (this should be properly abstracted later) o Bug fix in #ifdef code o Update verbose logging arguments Change-Id: I87814e2be9ddbf5036d5586a2fd82311d56ec47f
* | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds an interface for setting the NfcA timeout, which is called "mifare raw" in libnfc. Also changed the default, since it was set to only 2 ms, which is too short for most commands. Current setting is around 600ms. Change-Id: I00ccd85cd47a70895a3aca0f0bc34e1b0eab82c7
* | | | | | | Reconcile with gingerbread-releaseJean-Baptiste Queru2011-06-090-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | Change-Id: Ia22f150d863ffb9227d00402b23429b636c54eb4
| * | | | | | 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 ↵Nick Pelly2011-06-091-0/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | / / / | | |_|/ / / | |/| | | | | | | | | | | | | | | | per latest advice from NXP. * commit '252aedb3edd2c04adedeb5c9f8369af504411dad': Sleep 500us between i2c writes, as per latest advice from NXP.
| * | | | | am 6a7a2870: am 99141cdd: Sleep 500us between i2c writes, as per latest ↵Nick Pelly2011-06-081-0/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | advice from NXP. * commit '6a7a2870596a7b82ed4a7720a13e1d02db7eb3cf': Sleep 500us between i2c writes, as per latest advice from NXP.
| | * | | | am 99141cdd: Sleep 500us between i2c writes, as per latest advice from NXP.Nick Pelly2011-06-081-0/+1
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '99141cdd942973bc0cb8ef208ef717b14eb73b8e': Sleep 500us between i2c writes, as per latest advice from NXP.
| | | * | | Sleep 500us between i2c writes, as per latest advice from NXP.Nick Pelly2011-06-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix pn544 lock-ups seen during wired-mode stress tests. Change-Id: I606b5909338dc889a475ad880df8646546b9ba40
* | | | | | am 055a5f95: am b76c80da: am 80c2d409: Merge "Prevent NFC crash-loop if ↵Jean-Baptiste Queru2011-06-082-5/+9
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | firmware cannot be loaded." * commit '055a5f9542ba8fcfd2972111b707049732255ebe': Prevent NFC crash-loop if firmware cannot be loaded.
| * | | | | am b76c80da: am 80c2d409: Merge "Prevent NFC crash-loop if firmware cannot ↵Jean-Baptiste Queru2011-06-072-5/+9
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be loaded." * commit 'b76c80da03e33425722d52e8499ce3c97ab2b17c': Prevent NFC crash-loop if firmware cannot be loaded.
| | * | | | am 80c2d409: Merge "Prevent NFC crash-loop if firmware cannot be loaded."Jean-Baptiste Queru2011-06-032-5/+9
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '80c2d4090d6292a3fd2e20a18a981bc19e0a0429': Prevent NFC crash-loop if firmware cannot be loaded.
| | | * \ \ \ 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
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't crash - just run off whatever firmware is in the chip now. Change-Id: I0d24c13452271aed63a5a0aea236db7b1cbd432c
* | | | | | | Patch to dynamically enable NFC LOW_LEVEL_TRACESNick Pelly2011-06-081-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | low level traces can be enabled at run-time with: adb shell setprop debug.nfc.LOW_LEVEL_TRACES 1 and disabled with adb shell setprop debug.nfc.LOW_LEVEL_TRACES 0 NFC must be turned off and on again for this change to take affect. Change-Id: Iefdc4873b3ee5bc697f34b307c22c06a6eda0667 Signed-off-by: Nick Pelly <npelly@google.com>
* | | | | | | Reconcile with gingerbread-releaseJean-Baptiste Queru2011-06-070-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | Change-Id: I39908f99bc7be01b37f96796af4eda04f6810802
| * | | | | | 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 ↵Nick Pelly2011-06-071-0/+2
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LOW_LEVEL_TRACES; see c1f33130d9d2100e6232f8f3c782949c75205be6" into gingerbread * commit '5da3097267251b46bb3391bfcf4ecb3ef3390a4f': Guard some code by LOW_LEVEL_TRACES; see c1f33130d9d2100e6232f8f3c782949c75205be6
| * | | | | | am 3860b6c3: am ffef6844: Merge "Guard some code by LOW_LEVEL_TRACES; see ↵Nick Pelly2011-06-061-0/+2
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c1f33130d9d2100e6232f8f3c782949c75205be6" into gingerbread * commit '3860b6c3d17ec10628e57c4f4c288d16f9c591c1': Guard some code by LOW_LEVEL_TRACES; see c1f33130d9d2100e6232f8f3c782949c75205be6
| | * | | | | am ffef6844: Merge "Guard some code by LOW_LEVEL_TRACES; see ↵Nick Pelly2011-05-251-0/+2
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c1f33130d9d2100e6232f8f3c782949c75205be6" into gingerbread * commit 'ffef684400a6420e365efeb77f5fffb747045c35': Guard some code by LOW_LEVEL_TRACES; see c1f33130d9d2100e6232f8f3c782949c75205be6
| | | * | | | Merge "Guard some code by LOW_LEVEL_TRACES; see ↵Nick Pelly2011-05-251-0/+2
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c1f33130d9d2100e6232f8f3c782949c75205be6" into gingerbread
| | | | * | | | Guard some code by LOW_LEVEL_TRACES; see ↵Robert Tsai2011-05-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c1f33130d9d2100e6232f8f3c782949c75205be6 Change-Id: I8c2bd923d9dedf89c784199f03fba0e2cfc12009
* | | | | | | | Merge "Implement Felica timeout handling (libNFC)."Martijn Coenen2011-06-063-2/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Implement Felica timeout handling (libNFC).Martijn Coenen2011-06-033-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1a88ae0807d5ba53a635e31f3c5284906bd40ea2
* | | | | | | | | Add support for connecting to NfcA on IsoDep tags.Martijn Coenen2011-06-061-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always add a ISO14443-3A device handle for tags that are found through the A-gate. This allows the upper stack to connect and maintain a connection to the NfcA technology, even if the tag has IsoDep on top of NfcA. The reason this can work is that libnfc does do the IsoDep activation in software, and if the NfcA target is on a separate handle this activation will not take place if you connect to this handle. Bug: 4195403 Change-Id: I00015e74bdadc6666c2971f8102244670a76e340
* | | | | | | | | Update V(RA) counter in LLCP sockets any time it is needed.Sylvain Fonteneau2011-06-031-173/+56
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At some points, the V(RA) socket counter (used for Receive Window checking in connection-oriented sockets) was not properly updated, thus leading to sometimes reject (FRMR) inbound I-frames with valid sequence numbers. This patch factorize the I-frame emission and update V(RA) in the factorized code to ensure this is done at any time. Change-Id: Ic7ef92cb136c32e524a14e31a8d350f7b165c367
* | | | | | | | am ddc02ca4: am 53e86a53: am 4be773ca: Update P2P Modes.Nick Pelly2011-06-022-7/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ddc02ca4ec8d93f17d63c2fb09a3b9ef1919b352': Update P2P Modes.
| * | | | | | | am 53e86a53: am 4be773ca: Update P2P Modes.Nick Pelly2011-05-292-7/+9
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '53e86a536b5cc4b80703115aa4fd478ce4ac470b': Update P2P Modes.
| | * | | | | | am 4be773ca: Update P2P Modes.Nick Pelly2011-05-232-7/+9
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '4be773cac714184b24bc9d4191b778efefe16472': Update P2P Modes.
| | | * | | | | Update P2P Modes.Nick Pelly2011-05-232-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o Fix DEFAULT_NFCIP_INITIATOR_MODE_SUPPORT, DEFAULT_NFCIP_TARGET_MODE_SUPPORT to allow all possible modes (actual modes selected by Nfc.apk). o Fix phNfc_eP2PMode_t enum to list initiator modes. Change-Id: I841b6f1387ac536f47d357a0430eb9362b419810
generated by cgit v1.1 at 2025-09-13 18:04:49 +0000