commit acf1ec0cfce2d61dcab8560cad5072fa30afeb82
author Jizhou Liao <Jizhou.Liao@nxp.com> Tue Jun 30 10:25:41 2015 -0700
committer Martijn Coenen <maco@google.com> Mon Aug 03 09:52:28 2015 +0200
tree 9d635d3c3dd47d36f6af7b9c5f718b46d3fe3f13
parent 2ef0896fb71d2a3bcde1fff34a8d24c2e74340c2

Fix conflict vendor proprietary Protocol and Discovery technology definitions

A new configuration option is added.
Vendor should provide their own definition in libnfc-brcm.conf file.

Change-Id: I8204fbb97bcb59ecf7b450b701546646e1952a78

src/adaptation/NfcAdaptation.cpp

diff --git a/src/adaptation/NfcAdaptation.cpp b/src/adaptation/NfcAdaptation.cpp
index 99bc87d..841c04a 100644
--- a/src/adaptation/NfcAdaptation.cpp
+++ b/src/adaptation/NfcAdaptation.cpp
@@ -22,6 +22,7 @@
     #include "gki.h"
     #include "nfa_api.h"
     #include "nfc_int.h"
+    #include "vendor_cfg.h"
 }
 #include "config.h"
 #include "android_logmsg.h"
@@ -47,7 +48,9 @@
 char nci_hal_module[64];
 
 static UINT8 nfa_dm_cfg[sizeof ( tNFA_DM_CFG ) ];
+static UINT8 nfa_proprietary_cfg[sizeof ( tNFA_PROPRIETARY_CFG )];
 extern tNFA_DM_CFG *p_nfa_dm_cfg;
+extern tNFA_PROPRIETARY_CFG *p_nfa_proprietary_cfg;
 extern UINT8 nfa_ee_max_ee_cfg;
 extern const UINT8  nfca_version_string [];
 extern const UINT8  nfa_version_string [];
@@ -148,6 +151,11 @@
         ALOGD("%s: Overriding NFA_POLL_BAIL_OUT_MODE to use %d", func, nfa_poll_bail_out_mode);
     }
 
+    if ( GetStrValue ( NAME_NFA_PROPRIETARY_CFG, (char*)nfa_proprietary_cfg, sizeof ( tNFA_PROPRIETARY_CFG ) ) )
+    {
+        p_nfa_proprietary_cfg = (tNFA_PROPRIETARY_CFG*) &nfa_proprietary_cfg[0];
+    }
+
     //configure device host whitelist of HCI host ID's; see specification ETSI TS 102 622 V11.1.10
     //(2012-10), section 6.1.3.1
     num = GetStrValue ( NAME_DEVICE_HOST_WHITE_LIST, (char*) deviceHostWhiteList, sizeof ( deviceHostWhiteList ) );