Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 11:10:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/esp_psram_init_fix_v5.5' into 'release/v5.5'

Browse Source 
fix(esp_psram): repeated call to init should return invalid state error (v5.5)

See merge request espressif/esp-idf!50275
This commit is contained in:
morris
2026-07-21 10:37:42 +08:00
parent 8186da07ae 4cf3f9c108
commit e04875807d
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_psram/system_layer/esp_psram.c
+4
View File
@@ -454,6 +454,10 @@ esp_err_t esp_psram_chip_init(void)
esp_err_t esp_psram_init(void) esp_err_t esp_psram_init(void)
{ {
if (s_psram_ctx.is_initialised) {
return ESP_ERR_INVALID_STATE;
}
esp_err_t ret = ESP_FAIL; esp_err_t ret = ESP_FAIL;
if (!s_psram_ctx.is_chip_initialised) { if (!s_psram_ctx.is_chip_initialised) {
components/esp_psram/test_apps/psram/main/test_psram_no_boot_init.c
+1
View File
@@ -17,6 +17,7 @@ TEST_CASE("test psram no boot init", "[psram_no_boot_init]")
#endif /* CONFIG_SPIRAM_PRE_CONFIGURE_MEMORY_PROTECTION */ #endif /* CONFIG_SPIRAM_PRE_CONFIGURE_MEMORY_PROTECTION */
TEST_ESP_OK(esp_psram_init()); TEST_ESP_OK(esp_psram_init());
TEST_ESP_ERR(ESP_ERR_INVALID_STATE, esp_psram_init());
#if CONFIG_SPIRAM_PRE_CONFIGURE_MEMORY_PROTECTION #if CONFIG_SPIRAM_PRE_CONFIGURE_MEMORY_PROTECTION
size_t final_psram_heap = esp_psram_get_heap_size_to_protect(); size_t final_psram_heap = esp_psram_get_heap_size_to_protect();