nfc storage location changed from /data/nfc/ to /data/vendor/nfc/
diff --git a/halimpl/pn54x/hal/phNxpNciHal.c b/halimpl/pn54x/hal/phNxpNciHal.c
index 1271540..052a602 100644
--- a/halimpl/pn54x/hal/phNxpNciHal.c
+++ b/halimpl/pn54x/hal/phNxpNciHal.c
@@ -1230,7 +1230,7 @@
*******************************************************************************/
void phNxpNciHal_check_delete_nfaStorage_DHArea() {
struct stat st;
- const char config_eseinfo_path[] = "/data/nfc/nfaStorage.bin1";
+ const char config_eseinfo_path[] = "/data/vendor/nfc/nfaStorage.bin1";
if (stat(config_eseinfo_path, &st) == -1) {
ALOGD("%s file not present = %s", __func__, config_eseinfo_path);
} else {
@@ -2299,7 +2299,7 @@
struct stat st;
int ret = 0;
NFCSTATUS status = NFCSTATUS_FAILED;
- const char config_eseinfo_path[] = "/data/nfc/nfaStorage.bin1";
+ const char config_eseinfo_path[] = "/data/vendor/nfc/nfaStorage.bin1";
static uint8_t session_identity[8] = {0x00};
uint8_t default_session[8] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
uint8_t swp2_intf_status = 0x00;
@@ -3504,7 +3504,7 @@
struct stat st;
int ret = 0;
NFCSTATUS status = NFCSTATUS_FAILED;
- const char config_eseinfo_path[] = "/data/nfc/nfaStorage.bin1";
+ const char config_eseinfo_path[] = "/data/vendor/nfc/nfaStorage.bin1";
#if (NFC_NXP_STAT_DUAL_UICC_WO_EXT_SWITCH == true || \
NXP_NFCC_DYNAMIC_DUAL_UICC == true)
static uint8_t reset_ese_session_identity_set[] = {
diff --git a/halimpl/pn54x/libnfc-brcm.conf b/halimpl/pn54x/libnfc-brcm.conf
index 94f8781..c32dbfc 100644
--- a/halimpl/pn54x/libnfc-brcm.conf
+++ b/halimpl/pn54x/libnfc-brcm.conf
@@ -14,7 +14,7 @@
###############################################################################
# File used for NFA storage
-NFA_STORAGE="/data/nfc"
+NFA_STORAGE="/data/vendor/nfc"
###############################################################################
# Snooze Mode Settings
diff --git a/halimpl/pn54x/utils/phNxpConfig.cpp b/halimpl/pn54x/utils/phNxpConfig.cpp
index 7daca6b..5bb57ae 100644
--- a/halimpl/pn54x/utils/phNxpConfig.cpp
+++ b/halimpl/pn54x/utils/phNxpConfig.cpp
@@ -53,7 +53,7 @@
#if 1
const char* transport_config_paths[] = {"/odm/etc/", "/vendor/etc/", "/etc/"};
-const char transit_config_path[] = "/data/nfc/libnfc-nxpTransit.conf";
+const char transit_config_path[] = "/data/vendor/nfc/libnfc-nxpTransit.conf";
#else
const char* transport_config_paths[] = {"res/"};
#endif
diff --git a/halimpl/pn54x/utils/phNxpConfig.h b/halimpl/pn54x/utils/phNxpConfig.h
index d8c34a1..2493cce 100644
--- a/halimpl/pn54x/utils/phNxpConfig.h
+++ b/halimpl/pn54x/utils/phNxpConfig.h
@@ -115,7 +115,5 @@
#if (NXP_ESE_SVDD_SYNC == true)
#define NAME_NXP_SVDD_SYNC_OFF_DELAY "NXP_SVDD_SYNC_OFF_DELAY"
#endif
-/* default configuration */
-#define default_storage_location "/data/vendor/nfc"
#endif
diff --git a/src/adaptation/NfcAdaptation.cpp b/src/adaptation/NfcAdaptation.cpp
index c202879..de21ad5 100644
--- a/src/adaptation/NfcAdaptation.cpp
+++ b/src/adaptation/NfcAdaptation.cpp
@@ -200,7 +200,7 @@
}
if (!GetStrValue(NAME_NFA_STORAGE, bcm_nfc_location,
sizeof(bcm_nfc_location))) {
- strlcpy(bcm_nfc_location, "/data/nfc", sizeof(bcm_nfc_location));
+ strlcpy(bcm_nfc_location, "/data/vendor/nfc", sizeof(bcm_nfc_location));
}
initializeProtocolLogLevel();
diff --git a/src/adaptation/config.cpp b/src/adaptation/config.cpp
index d610e51..5f2cb3d 100644
--- a/src/adaptation/config.cpp
+++ b/src/adaptation/config.cpp
@@ -50,7 +50,7 @@
(sizeof(transport_config_paths) / sizeof(transport_config_paths[0]));
#if (NXP_EXTNS == TRUE)
-const char transit_config_path[] = "/data/nfc/";
+const char transit_config_path[] = "/data/vendor/nfc/";
#endif
#define config_name "libnfc-brcm.conf"
diff --git a/src/include/config.h b/src/include/config.h
index 44aeaaa..8a4dcd3 100644
--- a/src/include/config.h
+++ b/src/include/config.h
@@ -162,7 +162,6 @@
// default configuration
#define default_transport "/dev/bcm2079x"
-#define default_storage_location "/data/nfc"
struct tUART_CONFIG {
int m_iBaudrate; // 115200