pioduino/esp-idf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/refactor_some_coexist_sections' into 'master'

Browse Source 
feature(coex): refactor some coexist sections

Closes WIFI-5976、WIFI-5464 以及 TZ-81

See merge request espressif/esp-idf!26706
This commit is contained in:
Liu Ning
2023-11-22 17:48:24 +08:00
parent 3e0700bfda c783332962
commit e50d9fca3a
5 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/bt/controller/esp32/bt.c
+6 -17
View File
@@ -1197,23 +1197,12 @@ static int coex_register_wifi_channel_change_callback_wrapper(void *cb)
static int coex_version_get_wrapper(unsigned int *major, unsigned int *minor, unsigned int *patch)
{
#if CONFIG_SW_COEXIST_ENABLE
const char *ver_str = esp_coex_version_get();
if (ver_str != NULL) {
unsigned int _major = 0, _minor = 0, _patch = 0;
if (sscanf(ver_str, "%u.%u.%u", &_major, &_minor, &_patch) != 3) {
return -1;
}
if (major != NULL) {
*major = _major;
}
if (minor != NULL) {
*minor = _minor;
}
if (patch != NULL) {
*patch = _patch;
}
return 0;
}
coex_version_t version;
ESP_ERROR_CHECK(coex_version_get_value(&version));
*major = (unsigned int)version.major;
*minor = (unsigned int)version.minor;
*patch = (unsigned int)version.patch;
return 0;
#endif
return -1;
}