diff options
| author | daniel_Tomas <daniel.tomas@trusted-logic.com> | 2010-11-25 15:48:33 +0100 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2010-12-05 18:33:31 -0800 |
| commit | 143acf0b768ce3c2f61de2add5ca339479defd57 (patch) | |
| tree | f14a2cc2cf6576907db79ee77864ca635d3959a0 /src/phHal4Nfc_ADD.c | |
| parent | bf52196cdecd0decc2f8deabb19bf5877794bc31 (diff) | |
| download | external_libnfc-nxp-143acf0b768ce3c2f61de2add5ca339479defd57.zip external_libnfc-nxp-143acf0b768ce3c2f61de2add5ca339479defd57.tar.gz external_libnfc-nxp-143acf0b768ce3c2f61de2add5ca339479defd57.tar.bz2 | |
Fix for LLCP concurence access with ConfigureDiscovery, NDEF read/write and Presence Check
Change-Id: Ie6fc7e26dde98ece2738dcad26f020833b4c0e93
Diffstat (limited to 'src/phHal4Nfc_ADD.c')
| -rw-r--r-- | src/phHal4Nfc_ADD.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/phHal4Nfc_ADD.c b/src/phHal4Nfc_ADD.c index e95d872..9fef2db 100644 --- a/src/phHal4Nfc_ADD.c +++ b/src/phHal4Nfc_ADD.c @@ -103,7 +103,11 @@ NFCSTATUS phHal4Nfc_ConfigParameters( else { /*Register Upper layer context*/ +#ifdef LLCP_DISCON_CHANGES + Hal4Ctxt->sUpperLayerInfo.psUpperLayerCfgDiscCtxt = pContext; +#else /* #ifdef LLCP_DISCON_CHANGES */ Hal4Ctxt->sUpperLayerInfo.psUpperLayerCtxt = pContext; +#endif /* #ifdef LLCP_DISCON_CHANGES */ switch(CfgType) { /*NFC_EMULATION_CONFIG*/ @@ -244,7 +248,11 @@ NFCSTATUS phHal4Nfc_ConfigureDiscovery( else { /*Register Upper layer context*/ +#ifdef LLCP_DISCON_CHANGES + Hal4Ctxt->sUpperLayerInfo.psUpperLayerCfgDiscCtxt = pContext; +#else /* #ifdef LLCP_DISCON_CHANGES */ Hal4Ctxt->sUpperLayerInfo.psUpperLayerCtxt = pContext; +#endif /* #ifdef LLCP_DISCON_CHANGES */ switch(discoveryMode) { case NFC_DISCOVERY_START: @@ -371,7 +379,12 @@ void phHal4Nfc_ConfigureComplete(phHal4Nfc_Hal4Ctxt_t *Hal4Ctxt, Hal4Ctxt->Hal4NextState = eHal4StateInvalid; Hal4Ctxt->sUpperLayerInfo.pConfigCallback = NULL; (*pConfigCallback)( - Hal4Ctxt->sUpperLayerInfo.psUpperLayerCtxt,Status +#ifdef LLCP_DISCON_CHANGES + Hal4Ctxt->sUpperLayerInfo.psUpperLayerCfgDiscCtxt, +#else /* #ifdef LLCP_DISCON_CHANGES */ + Hal4Ctxt->sUpperLayerInfo.psUpperLayerCtxt, +#endif /* #ifdef LLCP_DISCON_CHANGES */ + Status ); #ifdef MERGE_SAK_SW2 } |