feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

fix(console): fixed CONSOLE_NONE not working on C2/C3

Browse Source
This commit is contained in:
Marius Vikhammer
2024-03-20 10:15:31 +08:00
parent aa6a7bec76
commit 42fc463c81
8 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp_hw_support/sleep_modes.c
View File

@@ -541,7 +541,9 @@ FORCE_INLINE_ATTR bool light_sleep_uart_prepare(uint32_t pd_flags, int64_t sleep
} else { } else {
/* Only flush the uart_num configured to console, the transmission integrity of /* Only flush the uart_num configured to console, the transmission integrity of
other uarts is guaranteed by the UART driver */ other uarts is guaranteed by the UART driver */
esp_rom_output_tx_wait_idle(CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM); if (CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM != -1) {
esp_rom_output_tx_wait_idle(CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM);
}
} }
} else { } else {
suspend_uarts(); suspend_uarts();

4
components/esp_system/port/soc/esp32c2/clk.c
View File

@@ -116,7 +116,9 @@ __attribute__((weak)) void esp_clk_init(void)
// Wait for UART TX to finish, otherwise some UART output will be lost // Wait for UART TX to finish, otherwise some UART output will be lost
// when switching APB frequency // when switching APB frequency
esp_rom_output_tx_wait_idle(CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM); if (CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM != -1) {
esp_rom_output_tx_wait_idle(CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM);
}
if (res) { if (res) {
rtc_clk_cpu_freq_set_config(&new_config); rtc_clk_cpu_freq_set_config(&new_config);

4
components/esp_system/port/soc/esp32c3/clk.c
View File

@@ -122,7 +122,9 @@ __attribute__((weak)) void esp_clk_init(void)
// Wait for UART TX to finish, otherwise some UART output will be lost // Wait for UART TX to finish, otherwise some UART output will be lost
// when switching APB frequency // when switching APB frequency
esp_rom_output_tx_wait_idle(CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM); if (CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM != -1) {
esp_rom_output_tx_wait_idle(CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM);
}
if (res) { if (res) {
rtc_clk_cpu_freq_set_config(&new_config); rtc_clk_cpu_freq_set_config(&new_config);

4
components/esp_system/port/soc/esp32c5/clk.c
View File

@@ -122,7 +122,9 @@ __attribute__((weak)) void esp_clk_init(void)
// Wait for UART TX to finish, otherwise some UART output will be lost // Wait for UART TX to finish, otherwise some UART output will be lost
// when switching APB frequency // when switching APB frequency
esp_rom_output_tx_wait_idle(CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM); if (CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM != -1) {
esp_rom_output_tx_wait_idle(CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM);
}
if (res) { if (res) {
rtc_clk_cpu_freq_set_config(&new_config); rtc_clk_cpu_freq_set_config(&new_config);

4
components/esp_system/port/soc/esp32c6/clk.c
View File

@@ -118,7 +118,9 @@ __attribute__((weak)) void esp_clk_init(void)
// Wait for UART TX to finish, otherwise some UART output will be lost // Wait for UART TX to finish, otherwise some UART output will be lost
// when switching APB frequency // when switching APB frequency
esp_rom_output_tx_wait_idle(CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM); if (CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM != -1) {
esp_rom_output_tx_wait_idle(CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM);
}
if (res) { if (res) {
rtc_clk_cpu_freq_set_config(&new_config); rtc_clk_cpu_freq_set_config(&new_config);

4
components/esp_system/port/soc/esp32h2/clk.c
View File

@@ -117,7 +117,9 @@ __attribute__((weak)) void esp_clk_init(void)
// Wait for UART TX to finish, otherwise some UART output will be lost // Wait for UART TX to finish, otherwise some UART output will be lost
// when switching APB frequency // when switching APB frequency
esp_rom_output_tx_wait_idle(CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM); if (CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM != -1) {
esp_rom_output_tx_wait_idle(CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM);
}
if (res) { if (res) {
rtc_clk_cpu_freq_set_config(&new_config); rtc_clk_cpu_freq_set_config(&new_config);

4
components/esp_system/port/soc/esp32p4/clk.c
View File

@@ -93,7 +93,9 @@ __attribute__((weak)) void esp_clk_init(void)
// Wait for UART TX to finish, otherwise some UART output will be lost // Wait for UART TX to finish, otherwise some UART output will be lost
// when switching APB frequency // when switching APB frequency
esp_rom_output_tx_wait_idle(CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM); if (CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM != -1) {
esp_rom_output_tx_wait_idle(CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM);
}
if (res) { if (res) {
rtc_clk_cpu_freq_set_config(&new_config); rtc_clk_cpu_freq_set_config(&new_config);

4
components/unity/unity_port_esp32.c
View File

@@ -26,7 +26,9 @@ void unity_putc(int c)
void unity_flush(void) void unity_flush(void)
{ {
esp_rom_output_tx_wait_idle(CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM); if(CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM != -1) {
esp_rom_output_tx_wait_idle(CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM);
}
} }
#define iscontrol(c) ((c) <= '\x1f' || (c) == '\x7f') #define iscontrol(c) ((c) <= '\x1f' || (c) == '\x7f')