commit 4e0a2d66d76e85889a38a9de0f1644cae6399d5a
author nxpandroid <srikrishna.pramoda@nxp.com> Fri Apr 07 15:50:28 2017 +0530
committer nxpandroid <srikrishna.pramoda@nxp.com> Fri Apr 07 15:50:28 2017 +0530
tree c9a8d87c60802e6346fef8f9b3c56b8b05bf60d0
parent 5604fd0ed509f38b0329eb0af1e7ec395c7f068b

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

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 7792c73..e8718f7 100755
--- a/halimpl/pn54x/configs/NXP_NFCC_Features.h
+++ b/halimpl/pn54x/configs/NXP_NFCC_Features.h
@@ -41,10 +41,14 @@
 #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
@@ -59,10 +63,14 @@
 #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
@@ -77,10 +85,14 @@
 #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
@@ -91,9 +103,13 @@
 #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 7792c73..e8718f7 100755
--- a/src/include/NXP_NFCC_Features.h
+++ b/src/include/NXP_NFCC_Features.h
@@ -41,10 +41,14 @@
 #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
@@ -59,10 +63,14 @@
 #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
@@ -77,10 +85,14 @@
 #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
@@ -91,9 +103,13 @@
 #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 */