platform: rename mender-ota to mender-flash and cleanup of the apis

Author: joelguittet

components/mender-mcu-client/mender-mcu-client

@@ -35,8 +35,8 @@
 #include <freertos/task.h>
 #include "mender-client.h"
 #include "mender-configure.h"
+#include "mender-flash.h"
 #include "mender-inventory.h"
-#include "mender-ota.h"
 #include "mender-troubleshoot.h"
 #include <nvs_flash.h>
 #include <protocol_examples_common.h>
@@ -89,7 +89,7 @@ authentication_success_cb(void) {
     /* Validate the image if it is still pending */
     /* Note it is possible to do multiple diagnosic tests before validating the image */
     /* In this example, authentication success with the mender-server is enough */
-    if (MENDER_OK != (ret = mender_ota_mark_app_valid_cancel_rollback())) {
+    if (MENDER_OK != (ret = mender_flash_confirm_image())) {
         ESP_LOGE(TAG, "Unable to validate the image");
         return ret;
     }
@@ -104,24 +104,22 @@ authentication_success_cb(void) {
 static mender_err_t
 authentication_failure_cb(void) {
 
-    static int   tries = 0;
-    mender_err_t ret   = MENDER_OK;
+    static int tries = 0;
+
+    /* Check if confirmation of the image is still pending */
+    if (true == mender_flash_is_image_confirmed()) {
+        ESP_LOGE(TAG, "Mender client authentication failed");
+        return MENDER_OK;
+    }
 
     /* Increment number of failures */
     tries++;
-    ESP_LOGI(TAG, "Mender client authentication failed (%d/%d)", tries, CONFIG_EXAMPLE_AUTHENTICATION_FAILS_MAX_TRIES);
-
-    /* Invalidate the image if it is still pending */
-    /* Note it is possible to invalid the image later to permit clean closure before reboot */
-    /* In this example, several authentication failures with the mender-server is enough */
-    if (tries >= CONFIG_EXAMPLE_AUTHENTICATION_FAILS_MAX_TRIES) {
-        if (MENDER_OK != (ret = mender_ota_mark_app_invalid_rollback_and_reboot())) {
-            ESP_LOGE(TAG, "Unable to invalidate the image");
-            return ret;
-        }
-    }
+    ESP_LOGE(TAG, "Mender client authentication failed (%d/%d)", tries, CONFIG_EXAMPLE_AUTHENTICATION_FAILS_MAX_TRIES);
 
-    return ret;
+    /* Restart the application after several authentication failures with the mender-server */
+    /* The image has not been confirmed and the bootloader will now rollback to the previous working image */
+    /* Note it is possible to customize this depending of the wanted behavior */
+    return (tries >= CONFIG_EXAMPLE_AUTHENTICATION_FAILS_MAX_TRIES) ? MENDER_FAIL : MENDER_OK;
 }
 
 /**
@@ -417,15 +415,15 @@ app_main(void) {
                                                     .authentication_poll_interval = 0,
                                                     .update_poll_interval         = 0,
                                                     .recommissioning              = false };
-    mender_client_callbacks_t mender_client_callbacks = { .authentication_success = authentication_success_cb,
-                                                          .authentication_failure = authentication_failure_cb,
-                                                          .deployment_status      = deployment_status_cb,
-                                                          .ota_begin              = mender_ota_begin,
-                                                          .ota_write              = mender_ota_write,
-                                                          .ota_abort              = mender_ota_abort,
-                                                          .ota_end                = mender_ota_end,
-                                                          .ota_set_boot_partition = mender_ota_set_boot_partition,
-                                                          .restart                = restart_cb };
+    mender_client_callbacks_t mender_client_callbacks = { .authentication_success  = authentication_success_cb,
+                                                          .authentication_failure  = authentication_failure_cb,
+                                                          .deployment_status       = deployment_status_cb,
+                                                          .flash.open              = mender_flash_open,
+                                                          .flash.write             = mender_flash_write,
+                                                          .flash.close             = mender_flash_close,
+                                                          .flash.set_pending_image = mender_flash_set_pending_image,
+                                                          .flash.abort_deployment  = mender_flash_abort_deployment,
+                                                          .restart                 = restart_cb };
     ESP_ERROR_CHECK(mender_client_init(&mender_client_config, &mender_client_callbacks));
     ESP_LOGI(TAG, "Mender client initialized");