contrib/espressif: add using the error codes

antmak · antmak · commit 119cef50359c · 2025-06-19T09:28:47.000+07:00
diff --git a/contrib/loaders/flash/espressif/include/esp_stub.h b/contrib/loaders/flash/espressif/include/esp_stub.h
@@ -52,8 +52,8 @@ enum esp_stub_cmd {
 
 // TODO: remove or move upper when they are completely ready to replace the old ones
 /****************************************************************************************/
-#define ESP_STUB_ERR_OK                         0
-#define ESP_STUB_ERR_FAIL                       (-1)
+#define ESP_STUB_OK                             0
+#define ESP_STUB_FAIL                           (-1)
 #define ESP_STUB_ERR_NOT_SUPPORTED              (-2)
 #define ESP_STUB_ERR_INFLATE                    (-3)
 #define ESP_STUB_ERR_NOT_ENOUGH_DATA            (-4)
diff --git a/contrib/loaders/flash/espressif/src/stub_main.c b/contrib/loaders/flash/espressif/src/stub_main.c
@@ -8,6 +8,7 @@
 #include <esp-stub-lib/flash.h>
 #include <esp-stub-lib/log.h>
 #include <esp-stub-lib/bit_utils.h>
+#include <esp-stub-lib/err.h>
 
 #include "esp_stub.h"
 #include "stub_apptrace.h"
@@ -49,7 +50,7 @@ static __maybe_unused int handle_test1(va_list ap)
 	STUB_LOG_TRACE();
 	STUB_LOG_TRACEF("foo:%u\n", 0x2A);
 
-	return ESP_STUB_ERR_OK;
+	return ESP_STUB_OK;
 }
 
 static int stub_apptrace_process_recvd_data(const uint8_t *buf, uint32_t size)
@@ -64,7 +65,7 @@ static int stub_apptrace_process_recvd_data(const uint8_t *buf, uint32_t size)
 
 	STUB_LOG("\n");
 
-	return ESP_STUB_ERR_OK;
+	return ESP_STUB_OK;
 }
 
 static __maybe_unused int handle_apptrace_read_from_host(va_list ap)
@@ -90,7 +91,7 @@ static  __maybe_unused int stub_apptrace_process_write_data(uint32_t addr, uint8
 	for (uint32_t i = 0; i < size; i++)
 		buf[i] = data++;
 
-	return ESP_STUB_ERR_OK;
+	return ESP_STUB_OK;
 }
 
 static __maybe_unused int handle_apptrace_write_to_host(va_list ap)
@@ -122,6 +123,7 @@ int stub_main(int cmd, ...)
 	va_list ap;
 	void *flash_state = NULL;
 	int ret = ESP_STUB_ERR_NOT_SUPPORTED;
+	stub_lib_err_t rc = STUB_LIB_FAIL;
 
 	/* zero bss */
 	for (uint32_t *p = &_bss_start; p < &_bss_end; p++)
@@ -131,23 +133,32 @@ int stub_main(int cmd, ...)
 
 	STUB_LOG_INIT();
 
-	stub_lib_flash_init(&flash_state);
+	rc = stub_lib_flash_init(&flash_state);
+	if (rc != STUB_LIB_OK) {
+		STUB_LOGE("Flash initialization failed\n");
+		return ESP_STUB_FAIL;
+	}
 
-	STUB_LOGD("Command: %x\n", cmd);
+	STUB_LOGD("Command: 0x%x\n", cmd);
 
 	const struct stub_cmd_handler *handler = cmd_handlers;
 	while (handler->handler) {
 		if (handler->cmd == cmd) {
-			STUB_LOGI("Executing command: %s\n", handler->name);
+			STUB_LOGI("Executing command: %s (0x%x)\n", handler->name, handler->cmd);
 			ret = handler->handler(ap);
+			if (ret != ESP_STUB_OK) {
+				STUB_LOGE("Command %s (0x%x) failed\n", handler->name, handler->cmd);
+				goto flash_va_end;
+			}
 			break;
 		}
 		handler++;
 	}
 
 	if (!handler->handler)
-		STUB_LOG("Unknown command!\n");
+		STUB_LOGE("Unknown command: 0x%x\n", cmd);
 
+flash_va_end:
 	va_end(ap);
 
 	if (flash_state)
diff --git a/src/flash/nor/esp_flash.c b/src/flash/nor/esp_flash.c
@@ -328,7 +328,7 @@ int esp_algo_flash_blank_check(struct flash_bank *bank)
 		destroy_mem_param(&mp);
 		return ret;
 	}
-	if (run.ret_code != ESP_STUB_ERR_OK) {
+	if (run.ret_code != ESP_STUB_OK) {
 		LOG_ERROR("Failed to check erase flash (%" PRId32 ")!", run.ret_code);
 		ret = ERROR_FAIL;
 	} else {
@@ -380,7 +380,7 @@ static int esp_algo_flash_get_mappings(struct flash_bank *bank,
 	flash_map->flash_size = target_buffer_get_u32(bank->target, mp.value + ESP_STUB_FLASHMAP_FLASH_SIZE);
 	flash_map->retcode = target_buffer_get_u32(bank->target, mp.value + ESP_STUB_FLASHMAP_RETCODE);
 
-	if (flash_map->retcode != ESP_STUB_ERR_OK) {
+	if (flash_map->retcode != ESP_STUB_OK) {
 		LOG_WARNING("Failed to get flash maps (%" PRId32 ")!", flash_map->retcode);
 		if (flash_map->retcode == ESP_STUB_ERR_INVALID_IMAGE)
 			LOG_WARNING(
@@ -463,7 +463,7 @@ int esp_algo_flash_erase(struct flash_bank *bank, unsigned int first, unsigned i
 		LOG_ERROR("Failed to run flasher stub (%d)!", ret);
 		return ret;
 	}
-	if (run.ret_code != ESP_STUB_ERR_OK) {
+	if (run.ret_code != ESP_STUB_OK) {
 		LOG_ERROR("Failed to erase flash (%" PRId32 ")!", run.ret_code);
 		ret = ERROR_FAIL;
 	} else {
@@ -781,7 +781,7 @@ int esp_algo_flash_write(struct flash_bank *bank, const uint8_t *buffer,
 		LOG_ERROR("Failed to run flasher stub (%d)!", ret);
 		return ret;
 	}
-	if (run.ret_code != ESP_STUB_ERR_OK) {
+	if (run.ret_code != ESP_STUB_OK) {
 		LOG_ERROR("Failed to write flash (%" PRId32 ")!", run.ret_code);
 		ret = ERROR_FAIL;
 	} else {
@@ -933,7 +933,7 @@ int esp_algo_flash_read(struct flash_bank *bank, uint8_t *buffer,
 		LOG_ERROR("Failed to run flasher stub (%d)!", ret);
 		return ret;
 	}
-	if (run.ret_code != ESP_STUB_ERR_OK) {
+	if (run.ret_code != ESP_STUB_OK) {
 		LOG_ERROR("Failed to read flash (%" PRId32 ")!", run.ret_code);
 		ret = ERROR_FAIL;
 	}
@@ -1300,7 +1300,7 @@ int esp_algo_flash_breakpoint_remove(struct target *target, struct esp_flash_bre
 		LOG_ERROR("Failed to run flasher stub (%d)!", ret);
 		return ret;
 	}
-	if (run.ret_code != ESP_STUB_ERR_OK) {
+	if (run.ret_code != ESP_STUB_OK) {
 		LOG_ERROR("Failed to clear bp (%" PRId32 ")!", run.ret_code);
 		return ERROR_FAIL;
 	}
@@ -1367,7 +1367,7 @@ static int esp_algo_flash_calc_hash(struct flash_bank *bank, uint8_t *hash,
 		destroy_mem_param(&mp);
 		return ret;
 	}
-	if (run.ret_code != ESP_STUB_ERR_OK) {
+	if (run.ret_code != ESP_STUB_OK) {
 		LOG_ERROR("Failed to get hash value (%" PRId32 ")!", run.ret_code);
 		ret = ERROR_FAIL;
 	} else {
