You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/02/23 15:08:42 UTC
[incubator-nuttx] 04/04: arch: refine
up_serialinit/up_earlyserialinit/rpmsg_serialinit
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch pr360
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 6bed84a609bf61a33c3f5db9b928f70942a8cad7
Author: liuhaitao <li...@xiaomi.com>
AuthorDate: Sun Feb 23 18:12:07 2020 +0800
arch: refine up_serialinit/up_earlyserialinit/rpmsg_serialinit
Signed-off-by: liuhaitao <li...@xiaomi.com>
---
arch/arm/src/common/up_internal.h | 6 ------
arch/avr/src/common/up_internal.h | 7 +++++--
arch/hc/src/common/up_internal.h | 7 +++++--
arch/mips/src/common/up_internal.h | 8 ++++++++
arch/or1k/src/common/up_internal.h | 6 ------
arch/renesas/src/common/up_internal.h | 7 +++++--
arch/risc-v/src/common/up_internal.h | 6 ------
arch/sim/src/sim/up_internal.h | 2 --
arch/x86/src/common/up_internal.h | 7 +++++--
arch/z16/src/common/up_internal.h | 7 ++++---
10 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/arch/arm/src/common/up_internal.h b/arch/arm/src/common/up_internal.h
index 90cc2bf..1c8bbf4 100644
--- a/arch/arm/src/common/up_internal.h
+++ b/arch/arm/src/common/up_internal.h
@@ -430,20 +430,14 @@ void up_lowputs(const char *str);
#ifdef USE_SERIALDRIVER
void up_serialinit(void);
-#else
-# define up_serialinit()
#endif
#ifdef USE_EARLYSERIALINIT
void up_earlyserialinit(void);
-#else
-# define up_earlyserialinit()
#endif
#ifdef CONFIG_RPMSG_UART
void rpmsg_serialinit(void);
-#else
-# define rpmsg_serialinit()
#endif
#ifdef CONFIG_ARM_LWL_CONSOLE
diff --git a/arch/avr/src/common/up_internal.h b/arch/avr/src/common/up_internal.h
index ae16ec2..ae89d54 100644
--- a/arch/avr/src/common/up_internal.h
+++ b/arch/avr/src/common/up_internal.h
@@ -150,13 +150,16 @@ void up_lowinit(void);
/* Defined in chip/xxx_serial.c */
+#ifdef USE_EARLYSERIALINIT
void up_earlyserialinit(void);
+#endif
+
+#ifdef USE_SERIALDRIVER
void up_serialinit(void);
+#endif
#ifdef CONFIG_RPMSG_UART
void rpmsg_serialinit(void);
-#else
-# define rpmsg_serialinit()
#endif
/* Defined in chip/xxx_ethernet.c */
diff --git a/arch/hc/src/common/up_internal.h b/arch/hc/src/common/up_internal.h
index d85ba34..0943947 100644
--- a/arch/hc/src/common/up_internal.h
+++ b/arch/hc/src/common/up_internal.h
@@ -152,13 +152,16 @@ void up_sigdeliver(void);
/* Debug output */
+#ifdef USE_EARLYSERIALINIT
void up_earlyserialinit(void);
+#endif
+
+#ifdef USE_SERIALDRIVER
void up_serialinit(void);
+#endif
#ifdef CONFIG_RPMSG_UART
void rpmsg_serialinit(void);
-#else
-# define rpmsg_serialinit()
#endif
void up_lowputc(char ch);
diff --git a/arch/mips/src/common/up_internal.h b/arch/mips/src/common/up_internal.h
index 9a10068..11916eb 100644
--- a/arch/mips/src/common/up_internal.h
+++ b/arch/mips/src/common/up_internal.h
@@ -242,10 +242,18 @@ void up_addregion(void);
/* Serial output */
void up_lowputc(char ch);
+
+#ifdef USE_EARLYSERIALINIT
void up_earlyserialinit(void);
+#endif
+
+#ifdef USE_SERIALDRIVER
void up_serialinit(void);
+#endif
+#ifdef CONFIG_RPMSG_UART
void rpmsg_serialinit(void);
+#endif
/* Network */
diff --git a/arch/or1k/src/common/up_internal.h b/arch/or1k/src/common/up_internal.h
index 3a76708..099b630 100644
--- a/arch/or1k/src/common/up_internal.h
+++ b/arch/or1k/src/common/up_internal.h
@@ -285,20 +285,14 @@ void up_lowputs(const char *str);
#ifdef USE_SERIALDRIVER
void up_serialinit(void);
-#else
-# define up_serialinit()
#endif
#ifdef USE_EARLYSERIALINIT
void up_earlyserialinit(void);
-#else
-# define up_earlyserialinit()
#endif
#ifdef CONFIG_RPMSG_UART
void rpmsg_serialinit(void);
-#else
-# define rpmsg_serialinit()
#endif
/* DMA **********************************************************************/
diff --git a/arch/renesas/src/common/up_internal.h b/arch/renesas/src/common/up_internal.h
index a83a4df..ca74ca4 100644
--- a/arch/renesas/src/common/up_internal.h
+++ b/arch/renesas/src/common/up_internal.h
@@ -158,13 +158,16 @@ void up_vectorfiq(void);
/* Defined in xyz_serial.c */
+#ifdef USE_EARLYSERIALINIT
void up_earlyconsoleinit(void);
+#endif
+
+#ifdef USE_SERIALDRIVER
void up_consoleinit(void);
+#endif
#ifdef CONFIG_RPMSG_UART
void rpmsg_serialinit(void);
-#else
-# define rpmsg_serialinit()
#endif
/* Defined in xyz_watchdog.c */
diff --git a/arch/risc-v/src/common/up_internal.h b/arch/risc-v/src/common/up_internal.h
index 283ea28..b28264c 100644
--- a/arch/risc-v/src/common/up_internal.h
+++ b/arch/risc-v/src/common/up_internal.h
@@ -190,20 +190,14 @@ void up_lowputs(const char *str);
#ifdef USE_SERIALDRIVER
void up_serialinit(void);
-#else
-# define up_serialinit()
#endif
#ifdef USE_EARLYSERIALINIT
void up_earlyserialinit(void);
-#else
-# define up_earlyserialinit()
#endif
#ifdef CONFIG_RPMSG_UART
void rpmsg_serialinit(void);
-#else
-# define rpmsg_serialinit()
#endif
/* The OS start routine **************************************************/
diff --git a/arch/sim/src/sim/up_internal.h b/arch/sim/src/sim/up_internal.h
index e57538e..b2ff25b 100644
--- a/arch/sim/src/sim/up_internal.h
+++ b/arch/sim/src/sim/up_internal.h
@@ -251,8 +251,6 @@ void up_timer_update(void);
#ifdef CONFIG_RPMSG_UART
void rpmsg_serialinit(void);
-#else
-# define rpmsg_serialinit()
#endif
/* up_devconsole.c **********************************************************/
diff --git a/arch/x86/src/common/up_internal.h b/arch/x86/src/common/up_internal.h
index 11f6353..3f7026b 100644
--- a/arch/x86/src/common/up_internal.h
+++ b/arch/x86/src/common/up_internal.h
@@ -195,13 +195,16 @@ void up_addregion(void);
/* Defined in xyz_serial.c */
+#ifdef USE_EARLYSERIALINIT
void up_earlyserialinit(void);
+#endif
+
+#ifdef USE_SERIALDRIVER
void up_serialinit(void);
+#endif
#ifdef CONFIG_RPMSG_UART
void rpmsg_serialinit(void);
-#else
-# define rpmsg_serialinit()
#endif
/* Defined in xyz_watchdog.c */
diff --git a/arch/z16/src/common/up_internal.h b/arch/z16/src/common/up_internal.h
index 3de83e7..0927138 100644
--- a/arch/z16/src/common/up_internal.h
+++ b/arch/z16/src/common/up_internal.h
@@ -145,14 +145,15 @@ void up_addregion(void);
/* Defined in xyz_serial.c */
#ifdef USE_SERIALDRIVER
-void up_earlyserialinit(void);
void up_serialinit(void);
#endif
+#ifdef USE_EARLYSERIALINIT
+void up_earlyserialinit(void);
+#endif
+
#ifdef CONFIG_RPMSG_UART
void rpmsg_serialinit(void);
-#else
-# define rpmsg_serialinit()
#endif
/* Defined in xyz_irq.c */