artf221204-OSP-GEN-HAL-ETSI-12-dual-initialization-r
diff --git a/halimpl/pn54x/configs/NXP_ESE_Features.h b/halimpl/pn54x/configs/NXP_ESE_Features.h
index ba2b448..635f4c0 100755
--- a/halimpl/pn54x/configs/NXP_ESE_Features.h
+++ b/halimpl/pn54x/configs/NXP_ESE_Features.h
@@ -62,6 +62,7 @@
#define NXP_UICC_HANDLE_CLEAR_ALL_PIPES FALSE
#define NFC_NXP_GP_CONTINOUS_PROCESSING FALSE
#define NXP_ESE_DWP_SPI_SYNC_ENABLE TRUE
+ #define NFC_NXP_ESE_ETSI12_PROP_INIT FALSE
#elif(NFC_NXP_CHIP_TYPE == PN553)
#define NFC_NXP_TRIPLE_MODE_PROTECTION FALSE
#define NXP_ESE_FELICA_CLT TRUE
@@ -84,6 +85,7 @@
#define NXP_UICC_HANDLE_CLEAR_ALL_PIPES TRUE
#define NFC_NXP_GP_CONTINOUS_PROCESSING FALSE
#define NXP_ESE_DWP_SPI_SYNC_ENABLE TRUE
+ #define NFC_NXP_ESE_ETSI12_PROP_INIT TRUE
#endif
#else /*Else of #if(NFC_NXP_ESE == TRUE)*/
@@ -106,6 +108,7 @@
#define NXP_ESE_DUAL_MODE_PRIO_SCHEME NXP_ESE_WIRED_MODE_TIMEOUT
#define NXP_ESE_JCOP_DWNLD_PROTECTION FALSE
#define NXP_UICC_HANDLE_CLEAR_ALL_PIPES FALSE
+ #define NFC_NXP_ESE_ETSI12_PROP_INIT FALSE
#elif(NFC_NXP_CHIP_TYPE == PN553)
#define NFC_NXP_TRIPLE_MODE_PROTECTION FALSE
#define NXP_ESE_FELICA_CLT FALSE
@@ -124,6 +127,7 @@
#define NXP_ESE_DUAL_MODE_PRIO_SCHEME NXP_ESE_WIRED_MODE_TIMEOUT
#define NXP_ESE_JCOP_DWNLD_PROTECTION FALSE
#define NXP_UICC_HANDLE_CLEAR_ALL_PIPES FALSE
+ #define NFC_NXP_ESE_ETSI12_PROP_INIT TRUE
#endif
#endif /*End of #if(NFC_NXP_ESE == TRUE)*/
diff --git a/halimpl/pn54x/hal/phNxpNciHal.c b/halimpl/pn54x/hal/phNxpNciHal.c
index c8264d1..1de9cb4 100644
--- a/halimpl/pn54x/hal/phNxpNciHal.c
+++ b/halimpl/pn54x/hal/phNxpNciHal.c
@@ -1832,6 +1832,8 @@
goto retry_core_init;
}
}
+
+#if(NFC_NXP_ESE_ETSI12_PROP_INIT == TRUE)
uint8_t swp_info_buff[2];
uint8_t swp_intf_status = 0x00;
uint8_t swp1A_intf_status = 0x00;
@@ -1848,6 +1850,12 @@
status = request_EEPROM(&swp_intf_info);
if(status == NFCSTATUS_OK)
swp_info_buff[0] = swp_intf_status;
+ else
+ {
+ NXPLOG_NCIHAL_E("request_EEPROM error occured %d", status);
+ retry_core_init_cnt++;
+ goto retry_core_init;
+ }
#if (NFC_NXP_STAT_DUAL_UICC_WO_EXT_SWITCH == TRUE)
/*Read SWP1A data*/
memset(&swp_intf_info,0,sizeof(swp_intf_info));
@@ -1858,6 +1866,12 @@
status = request_EEPROM(&swp_intf_info);
if(status == NFCSTATUS_OK)
swp_info_buff[1] = swp1A_intf_status;
+ else
+ {
+ NXPLOG_NCIHAL_E("request_EEPROM error occured %d", status);
+ retry_core_init_cnt++;
+ goto retry_core_init;
+ }
#endif
phNxpNci_EEPROM_info_t mEEPROM_info = {.request_mode = 0};
mEEPROM_info.buffer = swp_info_buff;
@@ -1866,6 +1880,7 @@
mEEPROM_info.request_mode = SET_EEPROM_DATA;
status = request_EEPROM(&mEEPROM_info);
NXPLOG_NCIHAL_D ("Setting value %d %d",swp_info_buff[1],swp_info_buff[0]);
+#endif //END_OF_NFC_NXP_ESE_ETSI12_PROP_INIT
NXPLOG_NCIHAL_D ("Performing NAME_NXP_CORE_CONF Settings");
retlen = 0;