summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/phFriNfc_LlcpMacNfcip.c36
1 files changed, 17 insertions, 19 deletions
diff --git a/src/phFriNfc_LlcpMacNfcip.c b/src/phFriNfc_LlcpMacNfcip.c
index 6fc7cf6..611571a 100644
--- a/src/phFriNfc_LlcpMacNfcip.c
+++ b/src/phFriNfc_LlcpMacNfcip.c
@@ -104,9 +104,9 @@ static NFCSTATUS phFriNfc_LlcpMac_Nfcip_Chk(phFriNfc_LlcpMac_t
{
status = PHNFCSTVAL(CID_FRI_NFC_LLCP_MAC, NFCSTATUS_FAILED);
}
+ ChkLlcpMac_Cb(pContext,status);
}
- ChkLlcpMac_Cb(pContext,status);
return status;
}
@@ -142,29 +142,27 @@ static NFCSTATUS phFriNfc_LlcpMac_Nfcip_Deactivate (phFriNfc_LlcpMac_t *LlcpMa
{
/* Set the flag of LinkStatus to deactivate */
LlcpMac->LinkState = phFriNfc_LlcpMac_eLinkDeactivated;
- }
-
- if (LlcpMac->SendPending)
- {
- /* Reset Flag */
- LlcpMac->SendPending = FALSE;
- phFriNfc_LlcpMac_Nfcip_TriggerSendCb(LlcpMac, NFCSTATUS_FAILED);
- }
+ if (LlcpMac->SendPending)
+ {
+ /* Reset Flag */
+ LlcpMac->SendPending = FALSE;
+ phFriNfc_LlcpMac_Nfcip_TriggerSendCb(LlcpMac, NFCSTATUS_FAILED);
+ }
- if (LlcpMac->RecvPending)
- {
- /* Reset Flag */
- LlcpMac->RecvPending = FALSE;
+ if (LlcpMac->RecvPending)
+ {
+ /* Reset Flag */
+ LlcpMac->RecvPending = FALSE;
+ phFriNfc_LlcpMac_Nfcip_TriggerRecvCb(LlcpMac, NFCSTATUS_FAILED);
+ }
- phFriNfc_LlcpMac_Nfcip_TriggerRecvCb(LlcpMac, NFCSTATUS_FAILED);
+ LlcpMac->LinkStatus_Cb(LlcpMac->LinkStatus_Context,
+ LlcpMac->LinkState,
+ NULL,
+ LlcpMac->PeerRemoteDevType);
}
- LlcpMac->LinkStatus_Cb(LlcpMac->LinkStatus_Context,
- LlcpMac->LinkState,
- NULL,
- LlcpMac->PeerRemoteDevType);
-
return status;
}