Snap for 4473011 from b0c793cc049ffc6c6590f9aeddaedf194105095f to pi-release
Change-Id: I583122e00bf11f42fbd5699a8ec8166a217004f6
diff --git a/halimpl/pn54x/hal/phNxpNciHal_ext.c b/halimpl/pn54x/hal/phNxpNciHal_ext.c
index d208c13..3529926 100644
--- a/halimpl/pn54x/hal/phNxpNciHal_ext.c
+++ b/halimpl/pn54x/hal/phNxpNciHal_ext.c
@@ -435,6 +435,16 @@
NXPLOG_NCIHAL_D("NxpNci> FW Version: %x.%x.%x", p_ntf[len - 2],
p_ntf[len - 1], p_ntf[len]);
} else {
+ uint32_t i;
+ char print_buffer[*p_len * 3 + 1];
+
+ memset(print_buffer, 0, sizeof(print_buffer));
+ for (i = 0; i < *p_len; i++) {
+ snprintf(&print_buffer[i * 2], 3, "%02X", p_ntf[i]);
+ }
+ NXPLOG_NCIHAL_E("CORE_RESET_NTF received !");
+ NXPLOG_NCIR_E("len = %3d > %s", *p_len, print_buffer);
+
#if (NFC_NXP_CHIP_TYPE == PN548C2)
if (nfcdep_detected &&
!(p_ntf[2] == 0x06 && p_ntf[3] == 0xA0 && p_ntf[4] == 0x00 &&
diff --git a/halimpl/pn54x/utils/phNxpConfig.cpp b/halimpl/pn54x/utils/phNxpConfig.cpp
index 9e8c7cb..05a26c4 100644
--- a/halimpl/pn54x/utils/phNxpConfig.cpp
+++ b/halimpl/pn54x/utils/phNxpConfig.cpp
@@ -87,6 +87,7 @@
return file_size;
}
+ delete[] buffer;
return 0;
}
diff --git a/src/nfc/nfc/nfc_ncif.cc b/src/nfc/nfc/nfc_ncif.cc
index 5601de0..f0af1f9 100644
--- a/src/nfc/nfc/nfc_ncif.cc
+++ b/src/nfc/nfc/nfc_ncif.cc
@@ -1392,7 +1392,7 @@
nfc_set_state(NFC_STATE_W4_POST_INIT_CPLT);
nfc_cb.p_nci_init_rsp = p_msg;
- nfc_cb.p_hal->core_initialized(p_msg->len - p_msg->offset, p);
+ nfc_cb.p_hal->core_initialized(p_msg->len, p);
}
} else {
if (nfc_cb.nci_version == NCI_VERSION_UNKNOWN) {