commit 3f09bd20c5fa1bd2c199b0167a709a99426212c6
author nxpandroid <srikrishna.pramoda@nxp.com> Fri Apr 07 15:51:05 2017 +0530
committer nxpandroid <srikrishna.pramoda@nxp.com> Fri Apr 07 15:51:05 2017 +0530
tree 1540e8e2a98cafcbabff5fb1f65b5104e63bc9b1
parent 4e0a2d66d76e85889a38a9de0f1644cae6399d5a

Revert-artf239728-NFC-initialisation-is-slow-due-to-

halimpl/pn54x/configs/NXP_NFCC_Features.h

diff --git a/halimpl/pn54x/configs/NXP_NFCC_Features.h b/halimpl/pn54x/configs/NXP_NFCC_Features.h
index e8718f7..7792c73 100755
--- a/halimpl/pn54x/configs/NXP_NFCC_Features.h
+++ b/halimpl/pn54x/configs/NXP_NFCC_Features.h
@@ -41,14 +41,10 @@
 #define NXP_UICC_CREATE_CONNECTIVITY_PIPE       TRUE
 #if(NFC_NXP_ESE == TRUE)
 #define NXP_NFCC_SPI_FW_DOWNLOAD_SYNC           TRUE
-#if((NFC_NXP_STAT_DUAL_UICC_EXT_SWITCH == TRUE) ||\
-   (NFC_NXP_STAT_DUAL_UICC_WO_EXT_SWITCH == TRUE) ||\
-   (NXP_NFCC_DYNAMIC_DUAL_UICC == TRUE))
 #define NFA_EE_MAX_EE_SUPPORTED                 4
 #else
 #define NFA_EE_MAX_EE_SUPPORTED                 3
 #endif
-#endif
 #elif(NFC_NXP_CHIP_TYPE == PN551)
 #define NXP_NFCC_I2C_READ_WRITE_IMPROVEMENT     TRUE
 #define NXP_NFCC_AID_MATCHING_PLATFORM_CONFIG   TRUE
@@ -63,14 +59,10 @@
 #define NXP_NFCC_FORCE_FW_DOWNLOAD              FALSE
 #define NXP_UICC_CREATE_CONNECTIVITY_PIPE       FALSE
 #if(NFC_NXP_ESE == TRUE)
-#if((NFC_NXP_STAT_DUAL_UICC_EXT_SWITCH == TRUE) ||\
-   (NFC_NXP_STAT_DUAL_UICC_WO_EXT_SWITCH == TRUE) ||\
-   (NXP_NFCC_DYNAMIC_DUAL_UICC == TRUE))
 #define NFA_EE_MAX_EE_SUPPORTED                 3
 #else
 #define NFA_EE_MAX_EE_SUPPORTED                 2
 #endif
-#endif
 #elif(NFC_NXP_CHIP_TYPE == PN548C2)
 #define NXP_NFCC_I2C_READ_WRITE_IMPROVEMENT     TRUE
 #define NXP_NFCC_AID_MATCHING_PLATFORM_CONFIG   TRUE
@@ -85,14 +77,10 @@
 #define NXP_NFCC_FORCE_FW_DOWNLOAD              FALSE
 #define NXP_UICC_CREATE_CONNECTIVITY_PIPE       FALSE
 #if(NFC_NXP_ESE == TRUE)
-#if((NFC_NXP_STAT_DUAL_UICC_EXT_SWITCH == TRUE) ||\
-   (NFC_NXP_STAT_DUAL_UICC_WO_EXT_SWITCH == TRUE) ||\
-   (NXP_NFCC_DYNAMIC_DUAL_UICC == TRUE))
 #define NFA_EE_MAX_EE_SUPPORTED                 3
 #else
 #define NFA_EE_MAX_EE_SUPPORTED                 2
 #endif
-#endif
 #elif(NFC_NXP_CHIP_TYPE  == PN547C2)
 #define NXP_NFCC_I2C_READ_WRITE_IMPROVEMENT     FALSE
 #define NXP_NFCC_AID_MATCHING_PLATFORM_CONFIG   TRUE
@@ -103,13 +91,9 @@
 #define NXP_NFCC_FORCE_FW_DOWNLOAD              FALSE
 #define NXP_UICC_CREATE_CONNECTIVITY_PIPE       FALSE
 #if(NFC_NXP_ESE == TRUE)
-#if((NFC_NXP_STAT_DUAL_UICC_EXT_SWITCH == TRUE) ||\
-   (NFC_NXP_STAT_DUAL_UICC_WO_EXT_SWITCH == TRUE) ||\
-   (NXP_NFCC_DYNAMIC_DUAL_UICC == TRUE))
 #define NFA_EE_MAX_EE_SUPPORTED                 3
 #else
 #define NFA_EE_MAX_EE_SUPPORTED                 2
 #endif
 #endif
-#endif
 #endif                          /* end of #ifndef NXP_NFCC_FEATURES_H */

src/include/NXP_NFCC_Features.h

diff --git a/src/include/NXP_NFCC_Features.h b/src/include/NXP_NFCC_Features.h
index e8718f7..7792c73 100755
--- a/src/include/NXP_NFCC_Features.h
+++ b/src/include/NXP_NFCC_Features.h
@@ -41,14 +41,10 @@
 #define NXP_UICC_CREATE_CONNECTIVITY_PIPE       TRUE
 #if(NFC_NXP_ESE == TRUE)
 #define NXP_NFCC_SPI_FW_DOWNLOAD_SYNC           TRUE
-#if((NFC_NXP_STAT_DUAL_UICC_EXT_SWITCH == TRUE) ||\
-   (NFC_NXP_STAT_DUAL_UICC_WO_EXT_SWITCH == TRUE) ||\
-   (NXP_NFCC_DYNAMIC_DUAL_UICC == TRUE))
 #define NFA_EE_MAX_EE_SUPPORTED                 4
 #else
 #define NFA_EE_MAX_EE_SUPPORTED                 3
 #endif
-#endif
 #elif(NFC_NXP_CHIP_TYPE == PN551)
 #define NXP_NFCC_I2C_READ_WRITE_IMPROVEMENT     TRUE
 #define NXP_NFCC_AID_MATCHING_PLATFORM_CONFIG   TRUE
@@ -63,14 +59,10 @@
 #define NXP_NFCC_FORCE_FW_DOWNLOAD              FALSE
 #define NXP_UICC_CREATE_CONNECTIVITY_PIPE       FALSE
 #if(NFC_NXP_ESE == TRUE)
-#if((NFC_NXP_STAT_DUAL_UICC_EXT_SWITCH == TRUE) ||\
-   (NFC_NXP_STAT_DUAL_UICC_WO_EXT_SWITCH == TRUE) ||\
-   (NXP_NFCC_DYNAMIC_DUAL_UICC == TRUE))
 #define NFA_EE_MAX_EE_SUPPORTED                 3
 #else
 #define NFA_EE_MAX_EE_SUPPORTED                 2
 #endif
-#endif
 #elif(NFC_NXP_CHIP_TYPE == PN548C2)
 #define NXP_NFCC_I2C_READ_WRITE_IMPROVEMENT     TRUE
 #define NXP_NFCC_AID_MATCHING_PLATFORM_CONFIG   TRUE
@@ -85,14 +77,10 @@
 #define NXP_NFCC_FORCE_FW_DOWNLOAD              FALSE
 #define NXP_UICC_CREATE_CONNECTIVITY_PIPE       FALSE
 #if(NFC_NXP_ESE == TRUE)
-#if((NFC_NXP_STAT_DUAL_UICC_EXT_SWITCH == TRUE) ||\
-   (NFC_NXP_STAT_DUAL_UICC_WO_EXT_SWITCH == TRUE) ||\
-   (NXP_NFCC_DYNAMIC_DUAL_UICC == TRUE))
 #define NFA_EE_MAX_EE_SUPPORTED                 3
 #else
 #define NFA_EE_MAX_EE_SUPPORTED                 2
 #endif
-#endif
 #elif(NFC_NXP_CHIP_TYPE  == PN547C2)
 #define NXP_NFCC_I2C_READ_WRITE_IMPROVEMENT     FALSE
 #define NXP_NFCC_AID_MATCHING_PLATFORM_CONFIG   TRUE
@@ -103,13 +91,9 @@
 #define NXP_NFCC_FORCE_FW_DOWNLOAD              FALSE
 #define NXP_UICC_CREATE_CONNECTIVITY_PIPE       FALSE
 #if(NFC_NXP_ESE == TRUE)
-#if((NFC_NXP_STAT_DUAL_UICC_EXT_SWITCH == TRUE) ||\
-   (NFC_NXP_STAT_DUAL_UICC_WO_EXT_SWITCH == TRUE) ||\
-   (NXP_NFCC_DYNAMIC_DUAL_UICC == TRUE))
 #define NFA_EE_MAX_EE_SUPPORTED                 3
 #else
 #define NFA_EE_MAX_EE_SUPPORTED                 2
 #endif
 #endif
-#endif
 #endif                          /* end of #ifndef NXP_NFCC_FEATURES_H */