summaryrefslogtreecommitdiffstats
path: root/src/phLibNfc_discovery.c
diff options
context:
space:
mode:
authordaniel_Tomas <daniel.tomas@trusted-logic.com>2010-11-25 15:48:33 +0100
committerNick Pelly <npelly@google.com>2010-12-05 18:33:31 -0800
commit143acf0b768ce3c2f61de2add5ca339479defd57 (patch)
treef14a2cc2cf6576907db79ee77864ca635d3959a0 /src/phLibNfc_discovery.c
parentbf52196cdecd0decc2f8deabb19bf5877794bc31 (diff)
downloadexternal_libnfc-nxp-143acf0b768ce3c2f61de2add5ca339479defd57.zip
external_libnfc-nxp-143acf0b768ce3c2f61de2add5ca339479defd57.tar.gz
external_libnfc-nxp-143acf0b768ce3c2f61de2add5ca339479defd57.tar.bz2
Fix for LLCP concurence access with ConfigureDiscovery, NDEF read/write and Presence Check
Change-Id: Ie6fc7e26dde98ece2738dcad26f020833b4c0e93
Diffstat (limited to 'src/phLibNfc_discovery.c')
-rw-r--r--src/phLibNfc_discovery.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/phLibNfc_discovery.c b/src/phLibNfc_discovery.c
index ead278e..1fe4d8f 100644
--- a/src/phLibNfc_discovery.c
+++ b/src/phLibNfc_discovery.c
@@ -246,6 +246,13 @@ NFCSTATUS phLibNfc_RemoteDev_CheckPresence( phLibNfc_Handle hTargetDev,
{
RetVal = NFCSTATUS_INVALID_HANDLE;
}
+#ifdef LLCP_TRANSACT_CHANGES
+ else if ((LLCP_STATE_RESET_INIT != gpphLibContext->llcp_cntx.sLlcpContext.state)
+ && (LLCP_STATE_CHECKED != gpphLibContext->llcp_cntx.sLlcpContext.state))
+ {
+ RetVal= NFCSTATUS_BUSY;
+ }
+#endif /* #ifdef LLCP_TRANSACT_CHANGES */
else
{
ps_rem_dev_info = (phHal_sRemoteDevInformation_t *)