commit 7015eae6b1bd4415cb23a8e34b78a0768fe3bc07
author Ruchi Kandoi <kandoiruchi@google.com> Wed Aug 09 20:10:20 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 09 20:10:20 2017 +0000
tree ffaa18d3a52bf21799eeefd13434d149ac1d659e
parent 287c01b6aae7df26237b255604e514d5a4168c97
parent efdb0e6348ab3682a0291f12f600a91f512c4ba2

Fix NXP_CHIP_TYPE and compile errors am: 615a7be8d8
am: 3cf270a278

Change-Id: I96c4caba3401f9a5873dc1887443f3c037a51c8d

hal/phNxpNciHal.c

diff --git a/hal/phNxpNciHal.c b/hal/phNxpNciHal.c
index be26279..0a4c372 100644
--- a/hal/phNxpNciHal.c
+++ b/hal/phNxpNciHal.c
@@ -2633,7 +2633,7 @@
     retry_core_init_cnt++;
     goto retry_core_init;
   }
-  if (nxpncihal_ctrl.nci_data.nci_version == NCI_VERSION_2_0) {
+  if (nxpncihal_ctrl.nci_info.nci_version == NCI_VERSION_2_0) {
     status = phNxpNciHal_send_ext_cmd(sizeof(cmd_init_nci2_0), cmd_init_nci2_0);
   } else {
     status = phNxpNciHal_send_ext_cmd(sizeof(cmd_init_nci), cmd_init_nci);

log/phNxpLog.c

diff --git a/log/phNxpLog.c b/log/phNxpLog.c
index 4b3661c..49d6911 100644
--- a/log/phNxpLog.c
+++ b/log/phNxpLog.c
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <stdio.h>
 #include <string.h>
 #if !defined(NXPLOG__H_INCLUDED)
 #include "phNxpConfig.h"

log/phNxpLog.h

diff --git a/log/phNxpLog.h b/log/phNxpLog.h
index c2e1d33..5037a4c 100644
--- a/log/phNxpLog.h
+++ b/log/phNxpLog.h
@@ -17,7 +17,7 @@
 #if !defined(NXPLOG__H_INCLUDED)
 #define NXPLOG__H_INCLUDED
 
-#include <cutils/log.h>
+#include <log/log.h>
 
 typedef struct nci_log_level {
   uint8_t global_log_level;