commit 4e862f34b5ff9f017e677e017d7eb10615845666
author Jizhou Liao <Jizhou.Liao@nxp.com> Fri Jun 24 09:21:29 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 24 09:21:29 2016 +0000
tree 8e708b6386b3fa8b5bb85b735477559b9979add7
parent a1a16d4c147ecd487694899e9657a65e0c51878a
parent 1d38b130f3c88f16ee6ca12c58c31b1066bb0f58

Merge \"Fix warnings in HAL.\"
am: 1d38b130f3

Change-Id: I14715b308bbf760d5de72348b15d30284e509457

halimpl/pn54x/hal/phNxpNciHal.c

diff --git a/halimpl/pn54x/hal/phNxpNciHal.c b/halimpl/pn54x/hal/phNxpNciHal.c
index f3bc10a..f66a806 100644
--- a/halimpl/pn54x/hal/phNxpNciHal.c
+++ b/halimpl/pn54x/hal/phNxpNciHal.c
@@ -73,11 +73,11 @@
 uint32_t timeoutTimerId = 0;
 phNxpNciHal_Sem_t config_data;
 
-phNxpNciClock_t phNxpNciClock={0,};
+phNxpNciClock_t phNxpNciClock={0, {0}, FALSE};
 
-phNxpNciRfSetting_t phNxpNciRfSet={0,};
+phNxpNciRfSetting_t phNxpNciRfSet={FALSE, {0} };
 
-phNxpNciMwEepromArea_t phNxpNciMwEepromArea = {0,};
+phNxpNciMwEepromArea_t phNxpNciMwEepromArea = {FALSE, {0} };
 
 /**************** local methods used in this file only ************************/
 static NFCSTATUS phNxpNciHal_fw_download(void);