commit d9364f328eb6cb4b04a07df3962263842e358e6f
author nxpandroid <srikrishna.pramoda@nxp.com> Fri Apr 07 15:34:22 2017 +0530
committer nxpandroid <srikrishna.pramoda@nxp.com> Fri Apr 07 15:34:22 2017 +0530
tree 5ae0bd7b96b3c4c23a940a74e9e5ae07afb57a3f
parent beb0b7f63ebd4c1f22722a6e5f6ba72e1d9b75ce

artf234376-PN551-COMPILATION-libnfc-nci-is-not-getti

halimpl/pn54x/configs/NXP_ESE_Features.h

diff --git a/halimpl/pn54x/configs/NXP_ESE_Features.h b/halimpl/pn54x/configs/NXP_ESE_Features.h
index 7ebb5d4..ba2b448 100755
--- a/halimpl/pn54x/configs/NXP_ESE_Features.h
+++ b/halimpl/pn54x/configs/NXP_ESE_Features.h
@@ -49,6 +49,7 @@
     #define NFC_NXP_TRIPLE_MODE_PROTECTION        TRUE
     #define NXP_ESE_FELICA_CLT                    FALSE
     #define NXP_WIRED_MODE_STANDBY_PROP           TRUE
+    #define NXP_WIRED_MODE_STANDBY                FALSE
     //dual mode prio scheme
     #define NXP_ESE_DUAL_MODE_PRIO_SCHEME         NXP_ESE_WIRED_MODE_TIMEOUT
      //Reset scheme
@@ -74,6 +75,7 @@
     #define NXP_ESE_P73_ISO_RST                   TRUE
     #define NXP_BLOCK_PROPRIETARY_APDU_GATE       FALSE
     #define NXP_WIRED_MODE_STANDBY                TRUE
+    #define NXP_WIRED_MODE_STANDBY_PROP           FALSE
     #define NXP_ESE_ETSI_READER_ENABLE            TRUE
     #define NXP_ESE_SVDD_SYNC                     FALSE
     #define NXP_LEGACY_APDU_GATE                  FALSE

src/include/NXP_ESE_Features.h

diff --git a/src/include/NXP_ESE_Features.h b/src/include/NXP_ESE_Features.h
index 8699808..317cce0 100755
--- a/src/include/NXP_ESE_Features.h
+++ b/src/include/NXP_ESE_Features.h
@@ -49,6 +49,7 @@
     #define NFC_NXP_TRIPLE_MODE_PROTECTION        TRUE
     #define NXP_ESE_FELICA_CLT                    FALSE
     #define NXP_WIRED_MODE_STANDBY_PROP           TRUE
+    #define NXP_WIRED_MODE_STANDBY                FALSE
     //dual mode prio scheme
     #define NXP_ESE_DUAL_MODE_PRIO_SCHEME         NXP_ESE_WIRED_MODE_TIMEOUT
      //Reset scheme
@@ -74,6 +75,7 @@
     #define NXP_ESE_P73_ISO_RST                   TRUE
     #define NXP_BLOCK_PROPRIETARY_APDU_GATE       FALSE
     #define NXP_WIRED_MODE_STANDBY                TRUE
+    #define NXP_WIRED_MODE_STANDBY_PROP           FALSE
     #define NXP_ESE_ETSI_READER_ENABLE            TRUE
     #define NXP_ESE_SVDD_SYNC                     FALSE
     #define NXP_ESE_DWP_SPI_SYNC_ENABLE           TRUE

src/nfc/nfc/nfc_ncif.c

diff --git a/src/nfc/nfc/nfc_ncif.c b/src/nfc/nfc/nfc_ncif.c
index 6ea7cfb..07b565b 100644
--- a/src/nfc/nfc/nfc_ncif.c
+++ b/src/nfc/nfc/nfc_ncif.c
@@ -1089,7 +1089,7 @@
 }
 #endif
 
-#if (NXP_EXTNS == TRUE)
+#if ((NXP_EXTNS == TRUE ) && (NXP_ESE_DUAL_MODE_PRIO_SCHEME == NXP_ESE_WIRED_MODE_RESUME))
 /*******************************************************************************
 **
 ** Function         nfc_ncif_allow_dwp_transmission

src/nfc/nfc/nfc_task.c

diff --git a/src/nfc/nfc/nfc_task.c b/src/nfc/nfc/nfc_task.c
index 0e08e71..470b911 100755
--- a/src/nfc/nfc/nfc_task.c
+++ b/src/nfc/nfc/nfc_task.c
@@ -150,9 +150,9 @@
         case NFC_TTYPE_WAIT_2_DEACTIVATE:
             nfc_wait_2_deactivate_timeout ();
             break;
+#if(NXP_EXTNS == TRUE)
         case NFC_TTYPE_NCI_WAIT_DATA_NTF:
         {
-#if(NXP_EXTNS == TRUE)
             if( get_i2c_fragmentation_enabled () == I2C_FRAGMENATATION_ENABLED)
             {
                 nfc_cb.i2c_data_t.nci_cmd_channel_busy = 0;
@@ -167,19 +167,17 @@
             nfc_ncif_modeSet_Ntf_timeout();
             break;
         }
-#endif
         case NFC_TYPE_NCI_WAIT_SETMODE_RSP:
         {
             nfc_ncif_modeSet_rsp_timeout();
             break;
         }
-#if(NXP_ESE_DUAL_MODE_PRIO_SCHEME == NXP_ESE_WIRED_MODE_RESUME)
         case NFC_TTYPE_NCI_WAIT_RF_FIELD_NTF:
-#endif
         {
             nfc_ncif_onWiredModeHold_timeout();
             break;
         }
+#endif
         case NFC_TTYPE_LISTEN_ACTIVATION:
             {
                 extern uint8_t sListenActivated;