From b844df8c852e2b147279e0dcd185f80247288741 Mon Sep 17 00:00:00 2001 From: Marius Vikhammer Date: Fri, 26 Aug 2022 11:41:11 +0800 Subject: [PATCH] uart: fixed sclk_freq not init warning when compiling with asserts disabled Closes https://github.com/espressif/esp-idf/issues/9642 --- components/driver/uart.c | 9 +++------ .../system/build_test/sdkconfig.ci.o2_no_asserts | 2 ++ 2 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 tools/test_apps/system/build_test/sdkconfig.ci.o2_no_asserts diff --git a/components/driver/uart.c b/components/driver/uart.c index b68b2900e1..40ae0ee997 100644 --- a/components/driver/uart.c +++ b/components/driver/uart.c @@ -303,8 +303,7 @@ esp_err_t uart_set_baudrate(uart_port_t uart_num, uint32_t baud_rate) uint32_t sclk_freq; uart_hal_get_sclk(&(uart_context[uart_num].hal), &src_clk); - esp_err_t err = uart_get_sclk_freq(src_clk, &sclk_freq); - assert(err == ESP_OK); + ESP_RETURN_ON_ERROR(uart_get_sclk_freq(src_clk, &sclk_freq), UART_TAG, "Invalid src_clk"); UART_ENTER_CRITICAL(&(uart_context[uart_num].spinlock)); uart_hal_set_baudrate(&(uart_context[uart_num].hal), baud_rate, sclk_freq); @@ -320,8 +319,7 @@ esp_err_t uart_get_baudrate(uart_port_t uart_num, uint32_t *baudrate) uint32_t sclk_freq; uart_hal_get_sclk(&(uart_context[uart_num].hal), &src_clk); - esp_err_t err = uart_get_sclk_freq(src_clk, &sclk_freq); - assert(err == ESP_OK); + ESP_RETURN_ON_ERROR(uart_get_sclk_freq(src_clk, &sclk_freq), UART_TAG, "Invalid src_clk"); UART_ENTER_CRITICAL(&(uart_context[uart_num].spinlock)); uart_hal_get_baudrate(&(uart_context[uart_num].hal), baudrate, sclk_freq); @@ -747,8 +745,7 @@ esp_err_t uart_param_config(uart_port_t uart_num, const uart_config_t *uart_conf } #endif uint32_t sclk_freq; - esp_err_t err = uart_get_sclk_freq(uart_config->source_clk, &sclk_freq); - assert(err == ESP_OK); + ESP_RETURN_ON_ERROR(uart_get_sclk_freq(uart_config->source_clk, &sclk_freq), UART_TAG, "Invalid src_clk"); UART_ENTER_CRITICAL(&(uart_context[uart_num].spinlock)); uart_hal_init(&(uart_context[uart_num].hal), uart_num); diff --git a/tools/test_apps/system/build_test/sdkconfig.ci.o2_no_asserts b/tools/test_apps/system/build_test/sdkconfig.ci.o2_no_asserts new file mode 100644 index 0000000000..e267df30e6 --- /dev/null +++ b/tools/test_apps/system/build_test/sdkconfig.ci.o2_no_asserts @@ -0,0 +1,2 @@ +CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y +CONFIG_COMPILER_OPTIMIZATION_PERF=y