diff options
author | Ikjoon Jang <ikjn@google.com> | 2023-04-19 04:28:17 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-19 04:28:17 +0000 |
commit | 2292d1ab595eb57286c7f3b8c7c3d73f9db8dd3c (patch) | |
tree | 8affb11d37c2d4b050e4555764656f0e0ee2c68f | |
parent | 25916018755640196e76ac748888953b31173896 (diff) | |
parent | 837919b23b4a9eb85eb248352b46eaf6e669eb4e (diff) | |
download | uwb-android14-mainline-adservices-release.tar.gz |
Add NXP_UWB_DEVICE_NODE specifying a device node am: e38f33ede2 am: f5ef31f5fd am: ea50a4521a am: 837919b23baml_wif_341610000aml_wif_341510000aml_wif_341410080aml_wif_341310010aml_wif_341110010aml_wif_341011010aml_wif_340913010aml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000aml_tet_341610020aml_tet_341511010aml_tet_341411060aml_tet_341310230aml_tet_341112070aml_tet_341010040aml_tet_340913030aml_swc_341619000aml_swc_341513600aml_swc_341312300aml_swc_341312020aml_swc_341111000aml_swc_341011020aml_swc_340922010aml_sta_341615000aml_sta_341511040aml_sta_341410000aml_sta_341311010aml_sta_341114000aml_sta_341111000aml_sta_341010020aml_sta_340912000aml_sta_340911000aml_sdk_341510000aml_sdk_341410000aml_sdk_341110080aml_sdk_341110000aml_sdk_341010000aml_sdk_340912010aml_sch_341510000aml_res_341510000aml_res_341410010aml_res_341311030aml_res_341110000aml_res_340912000aml_per_341614000aml_per_341510010aml_per_341410020aml_per_341311000aml_per_341110020aml_per_341110010aml_per_341011100aml_per_341011020aml_per_340916010aml_odp_341610000aml_neu_341510000aml_neu_341010080aml_neu_341010000aml_net_341610030aml_net_341510050aml_net_341510000aml_net_341411030aml_net_341311010aml_net_341310020aml_net_341111030aml_net_341014000aml_net_340913000aml_mpr_341614010aml_mpr_341511070aml_mpr_341411070aml_mpr_341313030aml_mpr_341111030aml_mpr_341111020aml_mpr_341015090aml_mpr_341015030aml_mpr_340919000aml_med_341619000aml_med_341513600aml_med_341312300aml_med_341312020aml_med_341111000aml_med_341011000aml_med_340922010aml_ips_341611000aml_ips_341510000aml_ips_340914280aml_ips_340914200aml_ips_340914000aml_ext_341620040aml_ext_341518010aml_ext_341414010aml_ext_341317010aml_ext_341131030aml_ext_341027030aml_doc_341610010aml_doc_341510050aml_doc_341312010aml_doc_341112000aml_doc_341012000aml_doc_340916000aml_con_341614000aml_con_341511080aml_con_341410300aml_con_341310090aml_con_341110000aml_cbr_341610000aml_cbr_341510010aml_cbr_341410010aml_cbr_341311010aml_cbr_341110000aml_cbr_341011000aml_cbr_340914000aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000aml_art_341615020aml_art_341514450aml_art_341514410aml_art_341411300aml_art_341311100aml_art_341110110aml_art_341110060aml_art_341010050aml_art_340915060aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_adb_341520010aml_adb_341517070aml_adb_340912530aml_adb_340912350aml_adb_340912200aml_adb_340912000android14-mainline-wifi-releaseandroid14-mainline-uwb-releaseandroid14-mainline-tethering-releaseandroid14-mainline-sdkext-releaseandroid14-mainline-resolv-releaseandroid14-mainline-permission-releaseandroid14-mainline-os-statsd-releaseandroid14-mainline-networking-releaseandroid14-mainline-mediaprovider-releaseandroid14-mainline-media-swcodec-releaseandroid14-mainline-media-releaseandroid14-mainline-extservices-releaseandroid14-mainline-conscrypt-releaseandroid14-mainline-cellbroadcast-releaseandroid14-mainline-art-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseandroid14-mainline-adbd-release
Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/uwb/+/2519779
Change-Id: I6626e659156532f16a89d46f301cfe21eafcbccc
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" |