Skip to content

Return error code instead of crashing on failed initialization (EHM-106) #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Return error code instead of crashing on failed initialization (EHM-106) #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 55 additions & 9 deletions host/api/src/esp_hosted_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ static void set_host_modules_log_level(void)
}
int esp_hosted_init(void)
{
esp_err_t res;

if (esp_hosted_init_done)
return ESP_OK;

Expand All @@ -117,23 +119,62 @@ int esp_hosted_init(void)
if (esp_hosted_is_config_valid()) {
ESP_LOGW(TAG, "Transport already initialized, skipping initialization");
} else {
ESP_ERROR_CHECK(esp_hosted_set_default_config());
res = esp_hosted_set_default_config();
if (res != ESP_OK) {
ESP_LOGE(TAG, "Failed to set default config");
return res;
}
}
res = add_esp_wifi_remote_channels();
if (res != ESP_OK) {
ESP_LOGE(TAG, "Failed to add esp-wifi-remote channels");
return res;
}

res = setup_transport(transport_active_cb);
if (res != ESP_OK) {
ESP_LOGE(TAG, "Failed to setup transport");
return res;
}

res = rpc_init();
if (res != ESP_OK) {
ESP_LOGE(TAG, "Failed to initialize RPC");
teardown_transport();
return res;
}

res = rpc_register_event_callbacks();
if (res != ESP_OK) {
ESP_LOGE(TAG, "Failed to register RPC event callbacks");
rpc_deinit();
teardown_transport();
return res;
}
ESP_ERROR_CHECK(add_esp_wifi_remote_channels());
ESP_ERROR_CHECK(setup_transport(transport_active_cb));
ESP_ERROR_CHECK(rpc_init());
rpc_register_event_callbacks();

esp_hosted_init_done = 1;
return ESP_OK;
}

int esp_hosted_deinit(void)
{
esp_err_t res;
ESP_LOGI(TAG, "ESP-Hosted deinit\n");
rpc_unregister_event_callbacks();
ESP_ERROR_CHECK(rpc_deinit());
ESP_ERROR_CHECK(teardown_transport());
res = rpc_unregister_event_callbacks();
if (res != ESP_OK) {
ESP_LOGE(TAG, "Failed to unregister RPC event callbacks");
return res;
}
res = rpc_deinit();
if (res != ESP_OK) {
ESP_LOGE(TAG, "Failed to deinitialize RPC");
return res;
}
res = teardown_transport();
if (res != ESP_OK) {
ESP_LOGE(TAG, "Failed to teardown transport");
return res;
}
esp_hosted_init_done = 0;
return ESP_OK;
}
Expand All @@ -145,7 +186,12 @@ static inline esp_err_t esp_hosted_reconfigure(void)
return ESP_FAIL;
}

ESP_ERROR_CHECK_WITHOUT_ABORT(transport_drv_reconfigure());
esp_err_t res = transport_drv_reconfigure();
if (res != ESP_OK) {
ESP_LOGE(TAG, "Failed to reconfigure transport");
return res;
}

return ESP_OK;
}

Expand Down
6 changes: 5 additions & 1 deletion host/drivers/transport/transport_drv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,11 @@ esp_err_t transport_drv_reconfigure(void)
/* This would come into picture, only if the host has
* reset pin connected to slave's 'EN' or 'RST' GPIO */
if (!is_transport_tx_ready()) {
ensure_slave_bus_ready(bus_handle);
esp_err_t res = ensure_slave_bus_ready(bus_handle);
if (res != ESP_OK) {
ESP_LOGE(TAG, "Slave bus is not ready");
return res;
}
transport_state = TRANSPORT_RX_ACTIVE;
ESP_LOGI(TAG, "Waiting for esp_hosted slave to be ready");
while (!is_transport_tx_ready()) {
Expand Down