This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 3144a5a  xtensa: Fixes names of serial functions
3144a5a is described below

commit 3144a5a272b86f67ba81b568ed3ac22730afd69a
Author: Sara Souza <[email protected]>
AuthorDate: Tue May 4 09:44:00 2021 -0300

    xtensa: Fixes names of serial functions
---
 arch/xtensa/src/common/xtensa.h            | 4 ++--
 arch/xtensa/src/common/xtensa_initialize.c | 2 +-
 arch/xtensa/src/esp32/esp32_serial.c       | 4 ++--
 arch/xtensa/src/esp32/esp32_start.c        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/xtensa/src/common/xtensa.h b/arch/xtensa/src/common/xtensa.h
index 70d3ed9..63eb4f1 100644
--- a/arch/xtensa/src/common/xtensa.h
+++ b/arch/xtensa/src/common/xtensa.h
@@ -311,8 +311,8 @@ void xtensa_add_region(void);
 /* Serial output */
 
 void up_lowputc(char ch);
-void xtensa_early_serial_initialize(void);
-void xtensa_serial_initialize(void);
+void xtensa_earlyserialinit(void);
+void xtensa_serialinit(void);
 
 void rpmsg_serialinit(void);
 
diff --git a/arch/xtensa/src/common/xtensa_initialize.c 
b/arch/xtensa/src/common/xtensa_initialize.c
index dd380f5..a098d96 100644
--- a/arch/xtensa/src/common/xtensa_initialize.c
+++ b/arch/xtensa/src/common/xtensa_initialize.c
@@ -181,7 +181,7 @@ void up_initialize(void)
   /* Initialize the serial device driver */
 
 #ifdef USE_SERIALDRIVER
-  xtensa_serial_initialize();
+  xtensa_serialinit();
 #endif
 
 #ifdef CONFIG_RPMSG_UART
diff --git a/arch/xtensa/src/esp32/esp32_serial.c 
b/arch/xtensa/src/esp32/esp32_serial.c
index 686610f..b6d75a6 100644
--- a/arch/xtensa/src/esp32/esp32_serial.c
+++ b/arch/xtensa/src/esp32/esp32_serial.c
@@ -1285,7 +1285,7 @@ void esp32_lowsetup(void)
  ****************************************************************************/
 
 #ifdef USE_EARLYSERIALINIT
-void xtensa_early_serial_initialize(void)
+void xtensa_earlyserialinit(void)
 {
   /* NOTE:  All GPIO configuration for the UARTs was performed in
    * esp32_lowsetup
@@ -1319,7 +1319,7 @@ void xtensa_early_serial_initialize(void)
  *
  ****************************************************************************/
 
-void xtensa_serial_initialize(void)
+void xtensa_serialinit(void)
 {
   /* Register the console */
 
diff --git a/arch/xtensa/src/esp32/esp32_start.c 
b/arch/xtensa/src/esp32/esp32_start.c
index c0da802..e4345a9 100644
--- a/arch/xtensa/src/esp32/esp32_start.c
+++ b/arch/xtensa/src/esp32/esp32_start.c
@@ -155,7 +155,7 @@ void IRAM_ATTR __start(void)
 #ifdef USE_EARLYSERIALINIT
   /* Perform early serial initialization */
 
-  xtensa_early_serial_initialize();
+  xtensa_earlyserialinit();
 #endif
 
   showprogress("A");

Reply via email to