espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-09-14 05:00:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

[posix] fix region configuration loading order (#11585)

Browse Source 
Fix the initialization order in ProcessRadioUrl() to ensure that
configuration files are loaded before region settings are applied.

Previously, the region code was set before configuration files
(product-config-file and factory-config-file) were processed. This
caused region-specific settings such as target power to be applied
from stale configuration data rather than the newly loaded
configuration file.

The fix reorders the parameter processing sequence:
1. Basic radio parameters (fem-lnagain, cca-threshold)
2. Configuration file loading (product-config-file, factory-config-file)
3. Region setting (region)
4. Other parameters (bus-latency, max-power-table, coex settings)

This ensures that when a region is set, it will use the correct
configuration data from the newly loaded files, allowing region-specific
power settings and other parameters to be properly refreshed.

Change-Id: Idcf16d194eea65d3efe3ae380d6fa90e71bd5499
This commit is contained in:
Jason Zhang
2025-06-11 06:38:06 +09:00
committed by GitHub
parent 6b03321cb2
commit baf13fc994
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/posix/platform/radio.cpp
+15 -14
View File
@@ -154,6 +154,21 @@ void Radio::ProcessRadioUrl(const RadioUrl &aRadioUrl)
SuccessOrDie(mRadioSpinel.SetCcaEnergyDetectThreshold(value)); SuccessOrDie(mRadioSpinel.SetCcaEnergyDetectThreshold(value));
} }
#if OPENTHREAD_POSIX_CONFIG_CONFIGURATION_FILE_ENABLE
// config files should be parsed before the region parameter
if (aRadioUrl.HasParam("product-config-file"))
{
const char *configFile = aRadioUrl.GetValue("product-config-file");
SuccessOrDie(sConfig.SetProductConfigFile(configFile));
}
if (aRadioUrl.HasParam("factory-config-file"))
{
const char *configFile = aRadioUrl.GetValue("factory-config-file");
SuccessOrDie(sConfig.SetFactoryConfigFile(configFile));
}
#endif // OPENTHREAD_POSIX_CONFIG_CONFIGURATION_FILE_ENABLE
if ((region = aRadioUrl.GetValue("region")) != nullptr) if ((region = aRadioUrl.GetValue("region")) != nullptr)
{ {
uint16_t regionCode; uint16_t regionCode;
@@ -170,20 +185,6 @@ void Radio::ProcessRadioUrl(const RadioUrl &aRadioUrl)
mRadioSpinel.SetBusLatency(busLatency); mRadioSpinel.SetBusLatency(busLatency);
} }
#if OPENTHREAD_POSIX_CONFIG_CONFIGURATION_FILE_ENABLE
if (aRadioUrl.HasParam("product-config-file"))
{
const char *configFile = aRadioUrl.GetValue("product-config-file");
SuccessOrDie(sConfig.SetProductConfigFile(configFile));
}
if (aRadioUrl.HasParam("factory-config-file"))
{
const char *configFile = aRadioUrl.GetValue("factory-config-file");
SuccessOrDie(sConfig.SetFactoryConfigFile(configFile));
}
#endif // OPENTHREAD_POSIX_CONFIG_CONFIGURATION_FILE_ENABLE
ProcessMaxPowerTable(aRadioUrl); ProcessMaxPowerTable(aRadioUrl);
#if OPENTHREAD_CONFIG_PLATFORM_RADIO_COEX_ENABLE #if OPENTHREAD_CONFIG_PLATFORM_RADIO_COEX_ENABLE