diff options
author | Ikjoon Jang <ikjn@google.com> | 2023-04-19 02:05:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-19 02:05:31 +0000 |
commit | f5ef31f5fd8461aa4159c48830151ae6ff52a073 (patch) | |
tree | 8affb11d37c2d4b050e4555764656f0e0ee2c68f | |
parent | 30357a4df37b3d43d511b2d913ffac89605c7ae6 (diff) | |
parent | e38f33ede2528cc47abedf7a1d0f7260416c0b73 (diff) | |
download | uwb-f5ef31f5fd8461aa4159c48830151ae6ff52a073.tar.gz |
Add NXP_UWB_DEVICE_NODE specifying a device node am: e38f33ede2
Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/uwb/+/2519779
Change-Id: Ieb3a8f9799ea70e7646a5d4d6f5f0168b44a0e92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | halimpl/config/SR1XX/libuwb-nxp-SR100S.conf | 4 | ||||
-rw-r--r-- | halimpl/config/SR1XX/libuwb-nxp.conf | 4 | ||||
-rw-r--r-- | halimpl/hal/phNxpUciHal.cc | 11 | ||||
-rw-r--r-- | halimpl/utils/phNxpConfig.h | 1 |
4 files changed, 16 insertions, 4 deletions
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 @@ tHAL_UWB_STATUS phNxpUciHal_open(uwb_stack_callback_t* p_cback, 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 @@ int GetNxpConfigCountryCodeByteArrayValue(const char* name,const char* fName, ch #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" |