Skip to content

Commit

Permalink
Merge branch 'feature/expose_unload_partitions_v5.1' into 'release/v5.1'
Browse files Browse the repository at this point in the history
refactor(esp_partition): Expose function for unloading partitions (v5.1)

See merge request espressif/esp-idf!27426
  • Loading branch information
pacucha42 committed Nov 29, 2023
2 parents 958d98c + 5e140f4 commit a165b5c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
7 changes: 6 additions & 1 deletion components/esp_partition/include/esp_partition.h
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down Expand Up @@ -454,6 +454,11 @@ esp_err_t esp_partition_register_external(esp_flash_t* flash_chip, size_t offset
*/
esp_err_t esp_partition_deregister_external(const esp_partition_t* partition);

/**
* @brief Unload partitions and free space allocated by them
*/
void esp_partition_unload_all(void);

#ifdef __cplusplus
}
#endif
Expand Down
Expand Up @@ -236,10 +236,6 @@ esp_partition_file_mmap_ctrl_t* esp_partition_get_file_mmap_ctrl_input(void);
*/
esp_partition_file_mmap_ctrl_t* esp_partition_get_file_mmap_ctrl_act(void);

// private function in partition.c to unload partitions and free space allocated by them
void unload_partitions(void);


#ifdef __cplusplus
}
#endif
2 changes: 1 addition & 1 deletion components/esp_partition/partition.c
Expand Up @@ -233,7 +233,7 @@ static esp_err_t load_partitions(void)
return err;
}

void unload_partitions(void)
void esp_partition_unload_all(void)
{
_lock_acquire(&s_partition_list_lock);
partition_list_item_t *it;
Expand Down
2 changes: 1 addition & 1 deletion components/esp_partition/partition_linux.c
Expand Up @@ -329,7 +329,7 @@ esp_err_t esp_partition_file_munmap(void)
return ESP_ERR_NOT_FOUND;
}

unload_partitions();
esp_partition_unload_all();

#ifdef CONFIG_ESP_PARTITION_ENABLE_STATS
free(s_esp_partition_stat_sector_erase_count);
Expand Down

0 comments on commit a165b5c

Please sign in to comment.