espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-05-22 01:27:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_console_output_uart_with_vfs' into 'master'

Browse Source 
newlib: fix console UART output port when enable VFS

See merge request sdk/ESP8266_RTOS_SDK!1031
This commit is contained in:
Dong Heng
2019-08-05 13:48:44 +08:00
parent a60b8f3880 d0090ee706
commit 896c93c48b
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/newlib/newlib/port/esp_newlib.c
View File

@ -22,6 +22,9 @@
#include "esp_vfs_dev.h" #include "esp_vfs_dev.h"
#endif #endif
#define _STR(_s) #_s
#define STR(_s) _STR(_s)
/* /*
* @brief Initialize global and thread's private reent object data. We add this instead of * @brief Initialize global and thread's private reent object data. We add this instead of
* newlib's initialization function to avoid some unnecessary cost and unused function. * newlib's initialization function to avoid some unnecessary cost and unused function.
@ -49,21 +52,23 @@ void esp_reent_init(struct _reent* r)
*/ */
int esp_newlib_init(void) int esp_newlib_init(void)
{ {
const char *default_uart_dev = "/dev/uart/" STR(CONFIG_CONSOLE_UART_NUM);
esp_reent_init(_global_impure_ptr); esp_reent_init(_global_impure_ptr);
#ifdef CONFIG_USING_ESP_VFS #ifdef CONFIG_USING_ESP_VFS
esp_vfs_dev_uart_register(); esp_vfs_dev_uart_register();
#endif #endif
_GLOBAL_REENT->_stdout = fopen("/dev/uart/0", "w"); _GLOBAL_REENT->_stdout = fopen(default_uart_dev, "w");
if (!_GLOBAL_REENT->_stdout) if (!_GLOBAL_REENT->_stdout)
goto err; goto err;
_GLOBAL_REENT->_stderr = fopen("/dev/uart/0", "w"); _GLOBAL_REENT->_stderr = fopen(default_uart_dev, "w");
if (!_GLOBAL_REENT->_stderr) if (!_GLOBAL_REENT->_stderr)
goto err_fail; goto err_fail;
_GLOBAL_REENT->_stdin = fopen("/dev/uart/0", "r"); _GLOBAL_REENT->_stdin = fopen(default_uart_dev, "r");
if (!_GLOBAL_REENT->_stdin) if (!_GLOBAL_REENT->_stdin)
goto err_in; goto err_in;