commit f10236b2ea6cc65a51eb3ce7f9fdedfaeedc18f7
author Rohit Rangwani <rrangwan@codeaurora.org> Thu Jul 27 17:31:23 2017 +0530
committer Rohit Rangwani <rrangwan@codeaurora.org> Fri Aug 04 18:34:19 2017 +0530
tree 29d85fc04ee512af9e9c140fc6dc28c59ea07db9
parent 73ba0f813cc8e84e436263c50db0abbbb8b81b89

NFC: Fix compile errors for PN548ad

Fix compile errors when PN548ad chipset
is selected to support NQ2xx

Change-Id: I63b6de2cbae7e33fb58f647a0ad3462cff642323

halimpl/pn54x/hal/phNxpNciHal_ext.c

diff --git a/halimpl/pn54x/hal/phNxpNciHal_ext.c b/halimpl/pn54x/hal/phNxpNciHal_ext.c
index 0bc9879..94daaf7 100644
--- a/halimpl/pn54x/hal/phNxpNciHal_ext.c
+++ b/halimpl/pn54x/hal/phNxpNciHal_ext.c
@@ -517,6 +517,7 @@
           rom_version = p_ntf[len - 2];
           NXPLOG_NCIHAL_D ("NxpNci> FW Version: %x.%x.%x", p_ntf[len-2], p_ntf[len-1], p_ntf[len]);
           }else {
+#ifdef AOSP_NFCDEP
 #if (NFC_NXP_CHIP_TYPE == PN548C2)
           if (nfcdep_detected &&
           !(p_ntf[2] == 0x06 && p_ntf[3] == 0xA0 && p_ntf[4] == 0x00 &&
@@ -527,6 +528,7 @@
           nfcdep_detected = 0x00;
         }
 #endif
+#endif
         phNxpNciHal_emergency_recovery();
         status = NFCSTATUS_FAILED;
       } /* Parsing CORE_INIT_RSP*/

src/nfa/ee/nfa_ee_act.c

diff --git a/src/nfa/ee/nfa_ee_act.c b/src/nfa/ee/nfa_ee_act.c
index 9b2b730..c449d63 100644
--- a/src/nfa/ee/nfa_ee_act.c
+++ b/src/nfa/ee/nfa_ee_act.c
@@ -3201,7 +3201,11 @@
                * ISO DEP Protocol*/
               if(nfa_ee_proto_mask_list[xx] == NFA_PROTOCOL_MASK_ISO_DEP || nfa_ee_proto_mask_list[xx] == NFC_PROTOCOL_MASK_ISO7816)
               {
+#if (NXP_NFCC_ROUTING_BLOCK_BIT == true)
                 *pp++ = NFC_ROUTE_TAG_PROTO | route_blacklist_mask;
+#else
+                *pp++ = NFC_ROUTE_TAG_PROTO;
+#endif
                 power_cfg |= NCI_ROUTE_PWR_STATE_SCREEN_ON_LOCK();
               }
               else
@@ -3272,7 +3276,11 @@
                             "nfa_ee_route_add_one_ecb_by_route_ordersuraj2 %x",p_cb->aid_info[xx] & NCI_ROUTE_QUAL_SHORT_SELECT);
                       route_qual |= NCI_ROUTE_QUAL_SHORT_SELECT;
                     }
+#if (NXP_NFCC_ROUTING_BLOCK_BIT == true)
                     *pp++ = NFC_ROUTE_TAG_AID | route_blacklist_mask | route_qual;
+#else
+                    *pp++ = NFC_ROUTE_TAG_AID | route_qual;
+#endif
                     *pp++ = len + 2;
                     *pp++ = p_cb->aid_rt_loc[xx];
                     *pp++ = p_cb->aid_pwr_cfg[xx];

src/nfc/nci/nci_hmsgs.c

diff --git a/src/nfc/nci/nci_hmsgs.c b/src/nfc/nci/nci_hmsgs.c
index 2e1d7dd..41b9d42 100644
--- a/src/nfc/nci/nci_hmsgs.c
+++ b/src/nfc/nci/nci_hmsgs.c
@@ -800,7 +800,9 @@
     pp                  = (uint8_t *) (p + 1) + p->offset;
 
     NCI_MSG_BLD_HDR0 (pp, NCI_MT_CMD, NCI_GID_EE_MANAGE);
+#if (NXP_EXTNS == TRUE) && (NXP_WIRED_MODE_STANDBY == true)
     NCI_MSG_BLD_HDR1 (pp, NCI_MSG_NFCEE_POWER_LINK_CTRL);
+#endif
     UINT8_TO_STREAM (pp, NCI_CORE_PARAM_SIZE_NFCEE_PL_CTRL);
     UINT8_TO_STREAM (pp, nfcee_id);
     UINT8_TO_STREAM (pp, pl_config);

src/nfc/nci/nci_hrcv.c

diff --git a/src/nfc/nci/nci_hrcv.c b/src/nfc/nci/nci_hrcv.c
index 878aabb..6ed0b49 100644
--- a/src/nfc/nci/nci_hrcv.c
+++ b/src/nfc/nci/nci_hrcv.c
@@ -392,7 +392,6 @@
       }
 #endif
       break;
-#endif
     case NCI_MSG_NFCEE_POWER_LINK_CTRL:
         p_evt                   = (tNFC_RESPONSE *) &pl_control;
         pl_control.status        = *pp;
@@ -400,6 +399,7 @@
         pl_control.pl_control    = *p_old++;
         event               = NFC_NFCEE_PL_CONTROL_REVT;
         break;
+#endif
     default:
       p_cback = NULL;
       NFC_TRACE_ERROR1("unknown opcode:0x%x", op_code);