commit 6e76961044c3a5be97c548ab32ba447950843d46
author Rohit Rangwani <rrangwan@codeaurora.org> Thu Jun 15 18:12:42 2017 +0530
committer Rohit Rangwani <rrangwan@codeaurora.org> Mon Jul 10 13:02:46 2017 +0530
tree 3be7f25141efabeaee5e2e0d3948765d8548a941
parent af14b6df9cb0cfe9063a0854e9a527782a0ce615

NFC: NQ3xx dynamic configuration support

Modifications done to support NQ3xx dynamic
configuration for MSM8953/37/40/17 platforms

Change-Id: I34b18acda2d4ba43f4c0199d2f7a1c296ca88041

halimpl/pn54x/utils/phNxpConfig.cpp

diff --git a/halimpl/pn54x/utils/phNxpConfig.cpp b/halimpl/pn54x/utils/phNxpConfig.cpp
index 6d5a490..b5eed29 100644
--- a/halimpl/pn54x/utils/phNxpConfig.cpp
+++ b/halimpl/pn54x/utils/phNxpConfig.cpp
@@ -339,14 +339,23 @@
             config_id = CONFIG_GENERIC;
             break;
         case TARGET_MSM8952:
-        case TARGET_MSM8953:
-        case TARGET_MSM8937:
         case TARGET_MSM8909:
-        case TARGET_MSM8917:
-        case TARGET_MSM8940:
             config_id = QRD_TYPE_DEFAULT;
             strlcpy(config_file, config_name_qrd, MAX_DATA_CONFIG_PATH_LEN);
             break;
+        case TARGET_MSM8953:
+        case TARGET_MSM8937:
+        case TARGET_MSM8917:
+        case TARGET_MSM8940:
+            if ((!strncmp(nq_chipid, NQ220, PROPERTY_VALUE_MAX)) || (!strncmp(nq_chipid, NQ210, PROPERTY_VALUE_MAX))) {
+                // NQ210 or NQ220
+                config_id = QRD_TYPE_DEFAULT;
+                strlcpy(config_file, config_name_qrd, MAX_DATA_CONFIG_PATH_LEN);
+            } else {
+                config_id = QRD_TYPE_NQ3XX;
+                strlcpy(config_file, config_name_qrd_NQ3XX, MAX_DATA_CONFIG_PATH_LEN);
+            }
+            break;
         case TARGET_MSM8976:
         case TARGET_MSM8996:
             strlcpy(config_file, config_name_qrd1, MAX_DATA_CONFIG_PATH_LEN);
@@ -379,6 +388,19 @@
         case TARGET_GENERIC:
             config_id = CONFIG_GENERIC;
             break;
+        case TARGET_MSM8953:
+        case TARGET_MSM8937:
+        case TARGET_MSM8917:
+        case TARGET_MSM8940:
+            if ((!strncmp(nq_chipid, NQ220, PROPERTY_VALUE_MAX)) || (!strncmp(nq_chipid, NQ210, PROPERTY_VALUE_MAX))) {
+                // NQ210 or NQ220
+                config_id = MTP_TYPE_DEFAULT;
+                strlcpy(config_file, config_name_mtp, MAX_DATA_CONFIG_PATH_LEN);
+            } else {
+                config_id = MTP_TYPE_NQ3XX;
+                strlcpy(config_file, config_name_mtp_NQ3XX, MAX_DATA_CONFIG_PATH_LEN);
+            }
+            break;
         case TARGET_SDM845:
         case TARGET_SDM660:
         case TARGET_SDM630: