commit 07d5d524819c15d1793ae2b72e648b65808f2079
author Ruchi Kandoi <kandoiruchi@google.com> Thu Jul 06 22:14:58 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 06 22:14:58 2017 +0000
tree 59bc8c750b62598bf536d4e3914ec1354aa22d54
parent c8b9c065b2590905f43c4a38ec516a4fd90a28c4
parent da97c414f7fc421a0c6ea1a3b246e49e46fc938b

Merge "Remove GKI_USE_DYNAMIC_BUFFERS #define"

halimpl/pn54x/hal/phNxpNciHal.c

diff --git a/halimpl/pn54x/hal/phNxpNciHal.c b/halimpl/pn54x/hal/phNxpNciHal.c
index 978be4f..57fbab4 100644
--- a/halimpl/pn54x/hal/phNxpNciHal.c
+++ b/halimpl/pn54x/hal/phNxpNciHal.c
@@ -859,8 +859,8 @@
     if (nxpncihal_ctrl.retry_cnt++ < MAX_RETRY_COUNT) {
       NXPLOG_NCIHAL_E(
           "write_unlocked failed - PN54X Maybe in Standby Mode - Retry");
-      /* 1ms delay to give NFCC wake up delay */
-      usleep(1000);
+      /* 10ms delay to give NFCC wake up delay */
+      usleep(1000 * 10);
       goto retry;
     } else {
       NXPLOG_NCIHAL_E(

halimpl/pn54x/log/phNxpLog.c

diff --git a/halimpl/pn54x/log/phNxpLog.c b/halimpl/pn54x/log/phNxpLog.c
index 4b3661c..49d6911 100644
--- a/halimpl/pn54x/log/phNxpLog.c
+++ b/halimpl/pn54x/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"

halimpl/pn54x/log/phNxpLog.h

diff --git a/halimpl/pn54x/log/phNxpLog.h b/halimpl/pn54x/log/phNxpLog.h
index c2e1d33..5037a4c 100644
--- a/halimpl/pn54x/log/phNxpLog.h
+++ b/halimpl/pn54x/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;