diff options
| author | daniel_Tomas <daniel.tomas@trusted-logic.com> | 2010-11-19 09:51:28 +0100 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2010-12-05 18:33:18 -0800 |
| commit | 6e286043593b281d161dad4969e05ba9c53ef6d1 (patch) | |
| tree | b74fe3829b5be2fe04f5e5f76b832565368d5d56 /src/phLibNfc_target.c | |
| parent | 75b0473b9eedf7673ed4502978205f4fa5563357 (diff) | |
| download | external_libnfc-nxp-6e286043593b281d161dad4969e05ba9c53ef6d1.zip external_libnfc-nxp-6e286043593b281d161dad4969e05ba9c53ef6d1.tar.gz external_libnfc-nxp-6e286043593b281d161dad4969e05ba9c53ef6d1.tar.bz2 | |
LLCP modification for concurence accesses
Change-Id: I428c58dfc2c791f87e0f5761f11bb59d26ad85b1
Diffstat (limited to 'src/phLibNfc_target.c')
| -rw-r--r-- | src/phLibNfc_target.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/phLibNfc_target.c b/src/phLibNfc_target.c index 3013e2f..982d8dd 100644 --- a/src/phLibNfc_target.c +++ b/src/phLibNfc_target.c @@ -116,6 +116,13 @@ NFCSTATUS phLibNfc_RemoteDev_Receive(phLibNfc_Handle hRemoteDevice, { RetVal= NFCSTATUS_INVALID_DEVICE; } +#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 { if(eLibNfcHalStatePresenceChk == @@ -264,11 +271,17 @@ phLibNfc_RemoteDev_Send( { RetVal= NFCSTATUS_INVALID_DEVICE; } - else if((NULL!=gpphLibContext->sNfcIp_Context.pClientNfcIpTxCb)) { RetVal =NFCSTATUS_BUSY ; } +#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 { if(eLibNfcHalStatePresenceChk == |