Merge branch 'bugfix/timeout_error' into 'feature/esp_as_mcu_host'

bugfix/timeout_error Fix printing of RPC timeout error See merge request app-frameworks/esp_hosted!482
espressif · Aug 14, 2024 · 66d5371 · 66d5371
2 parents 8490dfa + a34e58c
commit 66d5371
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/host/drivers/rpc/core/rpc_core.c b/host/drivers/rpc/core/rpc_core.c
@@ -587,8 +587,8 @@ static ctrl_cmd_t * get_response(int *read_len, ctrl_cmd_t *app_req)
 	/* Wait for response */
 	ret = wait_for_sync_response(app_req);
 	if (ret) {
-		if (errno == ETIMEDOUT)
-			ESP_LOGW(TAG, "Resp timedout for req[0x%x]", app_req->msg_id);
+		if (ret == RET_FAIL_TIMEOUT)
+			ESP_LOGW(TAG, "Timeout waiting for Resp for Req[0x%x]", app_req->msg_id);
 		else
 			ESP_LOGE(TAG, "ERR [%u] ret[%d] for Req[0x%x]", errno, ret, app_req->msg_id);
 		return NULL;

diff --git a/host/port/os_wrapper.c b/host/port/os_wrapper.c
@@ -535,7 +535,7 @@ int hosted_get_semaphore(void * semaphore_handle, int timeout)
 	if (sem_acquired == pdTRUE)
 		return 0;
 
-	return RET_FAIL;
+	return RET_FAIL_TIMEOUT;
 }
 
 int hosted_destroy_semaphore(void * semaphore_handle)

diff --git a/host/port/os_wrapper.h b/host/port/os_wrapper.h
@@ -96,6 +96,7 @@ enum {
 #define RET_INVALID                                  -2
 #define RET_FAIL_MEM                                 -3
 #define RET_FAIL4                                    -4
+#define RET_FAIL_TIMEOUT                             -5
 
 /* without alignment */
 #define MALLOC(x)                        malloc(x)

diff --git a/host/port/sdio_wrapper.c b/host/port/sdio_wrapper.c
@@ -290,11 +290,18 @@ int hosted_sdio_card_init(void *ctx)
 	config.max_freq_khz = H_SDIO_CLOCK_FREQ_KHZ;
 	ESP_LOGI(TAG, "SDIO master: Data-Lines: %d-bit Freq(KHz)[%u KHz]", H_SDIO_BUS_WIDTH==4? 4:1,
 			config.max_freq_khz);
+#if (H_SDIO_BUS_WIDTH == 4)
 	ESP_LOGI(TAG, "GPIOs: CLK[%u] CMD[%u] D0[%u] D1[%u] D2[%u] D3[%u] Slave_Reset[%u]",
 			CONFIG_ESP_SDIO_PIN_CLK, CONFIG_ESP_SDIO_PIN_CMD,
 			CONFIG_ESP_SDIO_PIN_D0, CONFIG_ESP_SDIO_PIN_D1,
 			CONFIG_ESP_SDIO_PIN_D2, CONFIG_ESP_SDIO_PIN_D3,
 			CONFIG_ESP_GPIO_SLAVE_RESET_SLAVE);
+#else
+	ESP_LOGI(TAG, "GPIOs: CLK[%u] CMD[%u] D0[%u] D1[%u] Slave_Reset[%u]",
+			CONFIG_ESP_SDIO_PIN_CLK, CONFIG_ESP_SDIO_PIN_CMD,
+			CONFIG_ESP_SDIO_PIN_D0, CONFIG_ESP_SDIO_PIN_D1,
+			CONFIG_ESP_GPIO_SLAVE_RESET_SLAVE);
+#endif
 	ESP_LOGI(TAG, "Queues: Tx[%u] Rx[%u] SDIO-Rx-Mode[%u]",
 			CONFIG_ESP_SDIO_TX_Q_SIZE, CONFIG_ESP_SDIO_RX_Q_SIZE,
 			H_SDIO_HOST_RX_MODE);