From 42f5b41d22bbbad1b16b9cd3aba0512a399f32a6 Mon Sep 17 00:00:00 2001 From: Martijn Coenen Date: Thu, 25 Apr 2013 17:27:48 -0700 Subject: Return NFCSTATUS_BUSY in case of invalid state transition. This allows the caller to recovery by trying again. Bug: 8552749 Change-Id: Iff979c097d33f9adda06654de9e588595daf89a3 --- src/phHciNfc_Sequence.c | 2 +- src/phLibNfc_discovery.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/phHciNfc_Sequence.c b/src/phHciNfc_Sequence.c index 1ef7265..6d0bf13 100644 --- a/src/phHciNfc_Sequence.c +++ b/src/phHciNfc_Sequence.c @@ -456,7 +456,7 @@ phHciNfc_FSM_Validate( } /* End of State Validation Switch */ if( NFC_FSM_IN_PROGRESS == psHciContext->hci_state.transition ) { - status = PHNFCSTVAL(CID_NFC_HCI, NFCSTATUS_INVALID_STATE); + status = PHNFCSTVAL(CID_NFC_HCI, NFCSTATUS_BUSY); } break; } diff --git a/src/phLibNfc_discovery.c b/src/phLibNfc_discovery.c index 1fe4d8f..c512f73 100644 --- a/src/phLibNfc_discovery.c +++ b/src/phLibNfc_discovery.c @@ -194,7 +194,14 @@ NFCSTATUS phLibNfc_Mgt_ConfigureDiscovery ( } else { - RetVal=NFCSTATUS_FAILED; + if (PHNFCSTATUS(RetVal) == NFCSTATUS_BUSY) + { + RetVal = NFCSTATUS_BUSY; + } + else + { + RetVal=NFCSTATUS_FAILED; + } } } -- cgit v1.2.3