Merge branch 'fix/fix_ble_retention_dependency_order' into 'master'

fix(ble): fix ble retention dependency order

See merge request espressif/esp-idf!52461
This commit is contained in:
Island
2026-09-07 11:56:46 +08:00
4 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -738,7 +738,7 @@ static esp_err_t sleep_modem_ble_mac_modem_state_init(uint8_t extra)
sleep_retention_module_init_param_t init_param = {
.cbs = { .create = { .handle = sleep_modem_ble_mac_retention_init, .arg = &retention_args } },
.attribute = SLEEP_RETENTION_MODULE_ATTR_ATTACH,
.depends = RETENTION_MODULE_BITMAP_INIT(BT_BB)
.depends = RETENTION_MODULE_BITMAP_INIT(CLOCK_MODEM)
};
esp_err_t err = sleep_retention_module_init(SLEEP_RETENTION_MODULE_BLE_MAC, &init_param);
if (err != ESP_OK) {
+1 -1
View File
@@ -798,7 +798,7 @@ static esp_err_t sleep_modem_ble_mac_modem_state_init(uint8_t extra)
sleep_retention_module_init_param_t init_param = {
.cbs = { .create = { .handle = sleep_modem_ble_mac_retention_init, .arg = &retention_args } },
.attribute = SLEEP_RETENTION_MODULE_ATTR_ATTACH,
.depends = RETENTION_MODULE_BITMAP_INIT(BT_BB)
.depends = RETENTION_MODULE_BITMAP_INIT(CLOCK_MODEM)
};
esp_err_t err = sleep_retention_module_init(SLEEP_RETENTION_MODULE_BLE_MAC, &init_param);
if (err != ESP_OK) {
+1 -1
View File
@@ -793,7 +793,7 @@ static esp_err_t sleep_modem_ble_mac_modem_state_init(uint8_t extra)
sleep_retention_module_init_param_t init_param = {
.cbs = { .create = { .handle = sleep_modem_ble_mac_retention_init, .arg = &retention_args } },
.attribute = SLEEP_RETENTION_MODULE_ATTR_ATTACH,
.depends = RETENTION_MODULE_BITMAP_INIT(BT_BB)
.depends = RETENTION_MODULE_BITMAP_INIT(CLOCK_MODEM)
};
esp_err_t err = sleep_retention_module_init(SLEEP_RETENTION_MODULE_BLE_MAC, &init_param);
if (err != ESP_OK) {