espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 12:44:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/get_partition_count' into 'master'

Browse Source 
app_update: Expose API to get OTA partition count

Closes IDFGH-5591

See merge request espressif/esp-idf!14596
This commit is contained in:
Shubham Kulkarni
2021-08-02 09:12:58 +00:00
parent a0c548ccd4 c7361327be
commit 3244f9b894
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
components/app_update/esp_ota_ops.c
View File

@@ -371,7 +371,7 @@ static esp_err_t rewrite_ota_seq(esp_ota_select_entry_t *two_otadata, uint32_t s
} }
} }
static uint8_t get_ota_partition_count(void) uint8_t esp_ota_get_app_partition_count(void)
{ {
uint16_t ota_app_count = 0; uint16_t ota_app_count = 0;
while (esp_partition_find_first(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_APP_OTA_MIN + ota_app_count, NULL) != NULL) { while (esp_partition_find_first(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_APP_OTA_MIN + ota_app_count, NULL) != NULL) {
@@ -389,7 +389,7 @@ static esp_err_t esp_rewrite_ota_data(esp_partition_subtype_t subtype)
return ESP_ERR_NOT_FOUND; return ESP_ERR_NOT_FOUND;
} }
uint8_t ota_app_count = get_ota_partition_count(); uint8_t ota_app_count = esp_ota_get_app_partition_count();
if (SUB_TYPE_ID(subtype) >= ota_app_count) { if (SUB_TYPE_ID(subtype) >= ota_app_count) {
return ESP_ERR_INVALID_ARG; return ESP_ERR_INVALID_ARG;
} }
@@ -507,7 +507,7 @@ const esp_partition_t *esp_ota_get_boot_partition(void)
return NULL; return NULL;
} }
int ota_app_count = get_ota_partition_count(); int ota_app_count = esp_ota_get_app_partition_count();
ESP_LOGD(TAG, "found ota app max = %d", ota_app_count); ESP_LOGD(TAG, "found ota app max = %d", ota_app_count);
if ((bootloader_common_ota_select_invalid(&otadata[0]) && if ((bootloader_common_ota_select_invalid(&otadata[0]) &&
@@ -652,7 +652,7 @@ bool esp_ota_check_rollback_is_possible(void)
return false; return false;
} }
int ota_app_count = get_ota_partition_count(); int ota_app_count = esp_ota_get_app_partition_count();
if (ota_app_count == 0) { if (ota_app_count == 0) {
return false; return false;
} }
@@ -710,7 +710,7 @@ static esp_err_t esp_ota_current_ota_is_workable(bool valid)
} }
int active_otadata = bootloader_common_get_active_otadata(otadata); int active_otadata = bootloader_common_get_active_otadata(otadata);
if (active_otadata != -1 && get_ota_partition_count() != 0) { if (active_otadata != -1 && esp_ota_get_app_partition_count() != 0) {
if (valid == true && otadata[active_otadata].ota_state != ESP_OTA_IMG_VALID) { if (valid == true && otadata[active_otadata].ota_state != ESP_OTA_IMG_VALID) {
otadata[active_otadata].ota_state = ESP_OTA_IMG_VALID; otadata[active_otadata].ota_state = ESP_OTA_IMG_VALID;
ESP_LOGD(TAG, "OTA[current] partition is marked as VALID"); ESP_LOGD(TAG, "OTA[current] partition is marked as VALID");
@@ -779,7 +779,7 @@ const esp_partition_t* esp_ota_get_last_invalid_partition(void)
int invalid_otadata = get_last_invalid_otadata(otadata); int invalid_otadata = get_last_invalid_otadata(otadata);
int ota_app_count = get_ota_partition_count(); int ota_app_count = esp_ota_get_app_partition_count();
if (invalid_otadata != -1 && ota_app_count != 0) { if (invalid_otadata != -1 && ota_app_count != 0) {
int ota_slot = (otadata[invalid_otadata].ota_seq - 1) % ota_app_count; int ota_slot = (otadata[invalid_otadata].ota_seq - 1) % ota_app_count;
ESP_LOGD(TAG, "Find invalid ota_%d app", ESP_PARTITION_SUBTYPE_APP_OTA_MIN + ota_slot); ESP_LOGD(TAG, "Find invalid ota_%d app", ESP_PARTITION_SUBTYPE_APP_OTA_MIN + ota_slot);
@@ -807,7 +807,7 @@ esp_err_t esp_ota_get_state_partition(const esp_partition_t *partition, esp_ota_
} }
esp_ota_select_entry_t otadata[2]; esp_ota_select_entry_t otadata[2];
int ota_app_count = get_ota_partition_count(); int ota_app_count = esp_ota_get_app_partition_count();
if (read_otadata(otadata) == NULL || ota_app_count == 0) { if (read_otadata(otadata) == NULL || ota_app_count == 0) {
return ESP_ERR_NOT_FOUND; return ESP_ERR_NOT_FOUND;
} }
@@ -839,7 +839,7 @@ esp_err_t esp_ota_erase_last_boot_app_partition(void)
} }
int active_otadata = bootloader_common_get_active_otadata(otadata); int active_otadata = bootloader_common_get_active_otadata(otadata);
int ota_app_count = get_ota_partition_count(); int ota_app_count = esp_ota_get_app_partition_count();
if (active_otadata == -1 || ota_app_count == 0) { if (active_otadata == -1 || ota_app_count == 0) {
return ESP_FAIL; return ESP_FAIL;
} }

8
components/app_update/include/esp_ota_ops.h
View File

@@ -244,6 +244,14 @@ const esp_partition_t* esp_ota_get_next_update_partition(const esp_partition_t *
*/ */
esp_err_t esp_ota_get_partition_description(const esp_partition_t *partition, esp_app_desc_t *app_desc); esp_err_t esp_ota_get_partition_description(const esp_partition_t *partition, esp_app_desc_t *app_desc);
/**
* @brief Returns number of ota partitions provided in partition table.
*
* @return
* - Number of OTA partitions
*/
uint8_t esp_ota_get_app_partition_count(void);
/** /**
* @brief This function is called to indicate that the running app is working well. * @brief This function is called to indicate that the running app is working well.
* *