diff options
| -rw-r--r-- | src/phHal4Nfc_ADD.c | 11 | ||||
| -rw-r--r-- | src/phHal4Nfc_Reader.c | 5 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/phHal4Nfc_ADD.c b/src/phHal4Nfc_ADD.c index 727b7c4..d2040ea 100644 --- a/src/phHal4Nfc_ADD.c +++ b/src/phHal4Nfc_ADD.c @@ -493,13 +493,10 @@ void phHal4Nfc_TargetDiscoveryComplete( Count++; } } - if ( !(Sak & NFCIP_BITMASK) ) - { - // Always add a separate 3A target on a separate - // handle, so the upper layers can connect to it. - aRemoteDevTypes[Count] = phHal_eISO14443_3A_PICC; - Count++; - } + // Always add a separate 3A target on a separate + // handle, so the upper layers can connect to it. + aRemoteDevTypes[Count] = phHal_eISO14443_3A_PICC; + Count++; } /*Check for P2P target passive*/ if((Sak & NFCIP_BITMASK) && diff --git a/src/phHal4Nfc_Reader.c b/src/phHal4Nfc_Reader.c index f27bb09..526d0fc 100644 --- a/src/phHal4Nfc_Reader.c +++ b/src/phHal4Nfc_Reader.c @@ -237,6 +237,11 @@ NFCSTATUS phHal4Nfc_Connect( } } + if(NFCSTATUS_PENDING != RetStatus) + { + Hal4Ctxt->sUpperLayerInfo.psUpperLayerCtxt = NULL; + Hal4Ctxt->sTgtConnectInfo.pUpperConnectCb = NULL; + } return RetStatus; } |