espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 10:47:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

uart: fixed sclk_freq not init warning when compiling with asserts disabled

Browse Source 
Closes https://github.com/espressif/esp-idf/issues/9642
This commit is contained in:
Marius Vikhammer
2022-08-26 11:41:11 +08:00
parent 4532e6e0b2
commit a43850ca17
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/driver/uart.c
View File

@ -303,8 +303,7 @@ esp_err_t uart_set_baudrate(uart_port_t uart_num, uint32_t baud_rate)
uint32_t sclk_freq; uint32_t sclk_freq;
uart_hal_get_sclk(&(uart_context[uart_num].hal), &src_clk); uart_hal_get_sclk(&(uart_context[uart_num].hal), &src_clk);
esp_err_t err = uart_get_sclk_freq(src_clk, &sclk_freq); ESP_RETURN_ON_ERROR(uart_get_sclk_freq(src_clk, &sclk_freq), UART_TAG, "Invalid src_clk");
assert(err == ESP_OK);
UART_ENTER_CRITICAL(&(uart_context[uart_num].spinlock)); UART_ENTER_CRITICAL(&(uart_context[uart_num].spinlock));
uart_hal_set_baudrate(&(uart_context[uart_num].hal), baud_rate, sclk_freq); 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; uint32_t sclk_freq;
uart_hal_get_sclk(&(uart_context[uart_num].hal), &src_clk); uart_hal_get_sclk(&(uart_context[uart_num].hal), &src_clk);
esp_err_t err = uart_get_sclk_freq(src_clk, &sclk_freq); ESP_RETURN_ON_ERROR(uart_get_sclk_freq(src_clk, &sclk_freq), UART_TAG, "Invalid src_clk");
assert(err == ESP_OK);
UART_ENTER_CRITICAL(&(uart_context[uart_num].spinlock)); UART_ENTER_CRITICAL(&(uart_context[uart_num].spinlock));
uart_hal_get_baudrate(&(uart_context[uart_num].hal), baudrate, sclk_freq); 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 #endif
uint32_t sclk_freq; uint32_t sclk_freq;
esp_err_t err = uart_get_sclk_freq(uart_config->source_clk, &sclk_freq); ESP_RETURN_ON_ERROR(uart_get_sclk_freq(uart_config->source_clk, &sclk_freq), UART_TAG, "Invalid src_clk");
assert(err == ESP_OK);
UART_ENTER_CRITICAL(&(uart_context[uart_num].spinlock)); UART_ENTER_CRITICAL(&(uart_context[uart_num].spinlock));
uart_hal_init(&(uart_context[uart_num].hal), uart_num); uart_hal_init(&(uart_context[uart_num].hal), uart_num);

2
tools/test_apps/system/build_test/sdkconfig.ci.o2_no_asserts Normal file
View File

@ -0,0 +1,2 @@
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y
CONFIG_COMPILER_OPTIMIZATION_PERF=y