Snap for 9972617 from 6b6909abfea624a4db727c34add3e36f2d89907d to udc-d1-release
Change-Id: I37e418194fe83541a38afab3984cb65672480e69
diff --git a/halimpl/config/SR1XX/libuwb-nxp-SR100S.conf b/halimpl/config/SR1XX/libuwb-nxp-SR100S.conf
index 5879d2b..a938f07 100644
--- a/halimpl/config/SR1XX/libuwb-nxp-SR100S.conf
+++ b/halimpl/config/SR1XX/libuwb-nxp-SR100S.conf
@@ -9,6 +9,10 @@
UWB_BOARD_VARIANT_CONFIG=0x01
UWB_BOARD_VARIANT_VERSION=0x01
+#Default device node is /dev/srxxx,
+#you can override it if your kernel driver is exposing it as another name.
+#NXP_UWB_DEVICE_NODE="/dev/sr100"
+
###############################################################################
# Extended CofigID
#DELAY_CALIBRATION_VALUE E400
diff --git a/halimpl/config/SR1XX/libuwb-nxp.conf b/halimpl/config/SR1XX/libuwb-nxp.conf
index a07fa04..fa31233 100644
--- a/halimpl/config/SR1XX/libuwb-nxp.conf
+++ b/halimpl/config/SR1XX/libuwb-nxp.conf
@@ -9,6 +9,10 @@
UWB_BOARD_VARIANT_CONFIG=0x01
UWB_BOARD_VARIANT_VERSION=0x01
+#Default device node is /dev/srxxx,
+#you can override it if your kernel driver is exposing it as another name.
+#NXP_UWB_DEVICE_NODE="/dev/sr100"
+#
###############################################################################
# Extended CofigID
#DELAY_CALIBRATION_VALUE E400
diff --git a/halimpl/hal/phNxpUciHal.cc b/halimpl/hal/phNxpUciHal.cc
index 5fccbcf..fd5ad99 100644
--- a/halimpl/hal/phNxpUciHal.cc
+++ b/halimpl/hal/phNxpUciHal.cc
@@ -329,10 +329,13 @@
if (uwb_dev_node == NULL) {
NXPLOG_UCIHAL_E("malloc of uwb_dev_node failed ");
goto clean_and_return;
- } else {
- NXPLOG_UCIHAL_E("Assinging the default helios Node: dev/srxxx");
- strcpy(uwb_dev_node, "/dev/srxxx");
- }
+ }
+
+ if (!GetNxpConfigStrValue(NAME_NXP_UWB_DEVICE_NODE, uwb_dev_node, max_len)) {
+ strcpy(uwb_dev_node, "/dev/srxxx");
+ }
+ NXPLOG_UCIHAL_E("Assigning the helios Node: %s", uwb_dev_node);
+
/* By default HAL status is HAL_STATUS_OPEN */
nxpucihal_ctrl.halStatus = HAL_STATUS_OPEN;
diff --git a/halimpl/utils/phNxpConfig.h b/halimpl/utils/phNxpConfig.h
index a3537da..9d91ff1 100644
--- a/halimpl/utils/phNxpConfig.h
+++ b/halimpl/utils/phNxpConfig.h
@@ -51,6 +51,7 @@
#define NAME_UWB_CORE_EXT_DEVICE_SR1XX_T_CONFIG "UWB_CORE_EXT_DEVICE_SR1XX_T_CONFIG"
#define NAME_UWB_CORE_EXT_DEVICE_SR1XX_S_CONFIG "UWB_CORE_EXT_DEVICE_SR1XX_S_CONFIG"
+#define NAME_NXP_UWB_DEVICE_NODE "NXP_UWB_DEVICE_NODE"
#define NAME_NXP_UWB_PROD_FW_FILENAME "NXP_UWB_PROD_FW_FILENAME"
#define NAME_NXP_UWB_DEV_FW_FILENAME "NXP_UWB_DEV_FW_FILENAME"
#define NAME_NXP_UWB_FW_FILENAME "NXP_UWB_FW_FILENAME"
