From 6bd5058796097ae40ed41c283a69e7874f2e9db2 Mon Sep 17 00:00:00 2001 From: Martijn Coenen Date: Sun, 5 Feb 2012 20:32:21 +0100 Subject: Fix NFCSTATUS_BUSY responses after doing p2p. LLCP state was not reset properly. Bug: 5971895 Change-Id: I4fda6ef7c78ae2730359cf5c90d887d205e57799 --- src/phFriNfc_Llcp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/phFriNfc_Llcp.c b/src/phFriNfc_Llcp.c index 1f66216..8138cd3 100644 --- a/src/phFriNfc_Llcp.c +++ b/src/phFriNfc_Llcp.c @@ -627,7 +627,7 @@ static void phFriNfc_Llcp_HandleMACLinkDeactivated( phFriNfc_Llcp_t *Llcp ) } /* Reset state */ - Llcp->state = PHFRINFC_LLCP_STATE_DEACTIVATION; + Llcp->state = PHFRINFC_LLCP_STATE_RESET_INIT; switch (state) { @@ -717,7 +717,8 @@ static void phFriNfc_Llcp_ResetLTO( phFriNfc_Llcp_t *Llcp ) { Llcp->state = PHFRINFC_LLCP_STATE_OPERATION_RECV; } - else if (Llcp->state != PHFRINFC_LLCP_STATE_DEACTIVATION) + else if (Llcp->state != PHFRINFC_LLCP_STATE_DEACTIVATION && + Llcp->state != PHFRINFC_LLCP_STATE_RESET_INIT) { /* Not yet in OPERATION state, perform first reset */ if (Llcp->eRole == phFriNfc_LlcpMac_ePeerTypeInitiator) -- cgit v1.1