You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2023/03/04 09:08:07 UTC
[nuttx] branch master updated: arch/boards: Rename up_lowputc to [arm64|renesas]_lowputc
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 454921eac7 arch/boards: Rename up_lowputc to [arm64|renesas]_lowputc
454921eac7 is described below
commit 454921eac7e266a15d44b51392cb9957966d389c
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat Mar 4 13:56:49 2023 +0800
arch/boards: Rename up_lowputc to [arm64|renesas]_lowputc
follow other arch coding style
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm64/Kconfig | 2 +-
arch/arm64/src/a64/a64_boot.h | 3 ---
arch/arm64/src/a64/a64_lowputc.S | 4 ++--
arch/arm64/src/a64/a64_serial.c | 8 ++++----
arch/arm64/src/common/arm64_head.S | 2 +-
arch/arm64/src/common/arm64_internal.h | 2 ++
arch/arm64/src/fvp-v8r/fvp_boot.h | 3 ---
arch/arm64/src/fvp-v8r/fvp_lowputc.S | 4 ++--
arch/arm64/src/fvp-v8r/serial_pl011.c | 8 ++++----
arch/arm64/src/qemu/qemu_boot.h | 3 ---
arch/arm64/src/qemu/qemu_lowputc.S | 4 ++--
arch/arm64/src/qemu/qemu_serial.c | 8 ++++----
arch/renesas/src/common/renesas_internal.h | 2 ++
boards/renesas/m16c/skp16c26/src/m16c_lcdconsole.c | 4 ++--
boards/renesas/rx65n/rx65n-grrose/src/rx65n_sbram.c | 4 ++--
boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_sbram.c | 4 ++--
16 files changed, 30 insertions(+), 35 deletions(-)
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index a601a04af8..bc8e329543 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -115,7 +115,7 @@ config ARCH_EARLY_PRINT
be not normal anymore. So we need to print something in arm64_head.S
to debug this situation.
Enabling this option will need to implement up_earlyserialinit and
- up_lowputc functions just you see in qemu, if you not sure,
+ arm64_lowputc functions just you see in qemu, if you not sure,
keeping the option disable.
config ARCH_CORTEX_A53
diff --git a/arch/arm64/src/a64/a64_boot.h b/arch/arm64/src/a64/a64_boot.h
index 0e9b28d105..79f6612de2 100644
--- a/arch/arm64/src/a64/a64_boot.h
+++ b/arch/arm64/src/a64/a64_boot.h
@@ -68,9 +68,6 @@ extern "C"
void a64_board_initialize(void);
-void up_lowputc(char c);
-void up_low_flush(void);
-
#undef EXTERN
#if defined(__cplusplus)
}
diff --git a/arch/arm64/src/a64/a64_lowputc.S b/arch/arm64/src/a64/a64_lowputc.S
index 4b43f394a9..2869274ba1 100644
--- a/arch/arm64/src/a64/a64_lowputc.S
+++ b/arch/arm64/src/a64/a64_lowputc.S
@@ -83,8 +83,8 @@ SECTION_FUNC(text, up_earlyserialinit)
* x0: Character to print
*/
-GTEXT(up_lowputc)
-SECTION_FUNC(text, up_lowputc)
+GTEXT(arm64_lowputc)
+SECTION_FUNC(text, arm64_lowputc)
ldr x15, =UART0_BASE_ADDRESS
early_uart_ready x15, w2
early_uart_transmit x15, w0
diff --git a/arch/arm64/src/a64/a64_serial.c b/arch/arm64/src/a64/a64_serial.c
index 37f38336e9..573eb81df8 100644
--- a/arch/arm64/src/a64/a64_serial.c
+++ b/arch/arm64/src/a64/a64_serial.c
@@ -640,10 +640,10 @@ int up_putc(int ch)
{
/* Add CR */
- up_lowputc('\r');
+ arm64_lowputc('\r');
}
- up_lowputc((uint8_t)ch);
+ arm64_lowputc((uint8_t)ch);
return ch;
}
@@ -706,10 +706,10 @@ int up_putc(int ch)
{
/* Add CR */
- up_lowputc('\r');
+ arm64_lowputc('\r');
}
- up_lowputc((uint8_t)ch);
+ arm64_lowputc((uint8_t)ch);
return ch;
}
diff --git a/arch/arm64/src/common/arm64_head.S b/arch/arm64/src/common/arm64_head.S
index fba688f782..1e0dbc44cd 100644
--- a/arch/arm64/src/common/arm64_head.S
+++ b/arch/arm64/src/common/arm64_head.S
@@ -326,7 +326,7 @@ boot_stage_puts:
cmp w0, 0
beq 1f /* Exit on nul */
stp xzr, x30, [sp, #-16]!
- bl up_lowputc
+ bl arm64_lowputc
ldp xzr, x30, [sp], #16
b boot_stage_puts
1:
diff --git a/arch/arm64/src/common/arm64_internal.h b/arch/arm64/src/common/arm64_internal.h
index 1b4d3af8e8..ee5ddef2e5 100644
--- a/arch/arm64/src/common/arm64_internal.h
+++ b/arch/arm64/src/common/arm64_internal.h
@@ -297,6 +297,8 @@ void arm64_serialinit(void);
void arm64_earlyserialinit(void);
#endif
+void arm64_lowputc(char c);
+
/* DMA */
#ifdef CONFIG_ARCH_DMA
diff --git a/arch/arm64/src/fvp-v8r/fvp_boot.h b/arch/arm64/src/fvp-v8r/fvp_boot.h
index cf05afe5c6..611d23a962 100644
--- a/arch/arm64/src/fvp-v8r/fvp_boot.h
+++ b/arch/arm64/src/fvp-v8r/fvp_boot.h
@@ -73,9 +73,6 @@ extern "C"
void fvp_board_initialize(void);
-void up_lowputc(char c);
-void up_low_flush(void);
-
#undef EXTERN
#if defined(__cplusplus)
}
diff --git a/arch/arm64/src/fvp-v8r/fvp_lowputc.S b/arch/arm64/src/fvp-v8r/fvp_lowputc.S
index 7922dd35db..28561e1640 100644
--- a/arch/arm64/src/fvp-v8r/fvp_lowputc.S
+++ b/arch/arm64/src/fvp-v8r/fvp_lowputc.S
@@ -93,8 +93,8 @@ SECTION_FUNC(text, up_earlyserialinit)
* x0: character to print
*/
-GTEXT(up_lowputc)
-SECTION_FUNC(text, up_lowputc)
+GTEXT(arm64_lowputc)
+SECTION_FUNC(text, arm64_lowputc)
ldr x15, =CONFIG_UART0_BASE
early_uart_ready x15, w2
early_uart_transmit x15, w0
diff --git a/arch/arm64/src/fvp-v8r/serial_pl011.c b/arch/arm64/src/fvp-v8r/serial_pl011.c
index 68f615ea96..aaff42abd7 100644
--- a/arch/arm64/src/fvp-v8r/serial_pl011.c
+++ b/arch/arm64/src/fvp-v8r/serial_pl011.c
@@ -823,10 +823,10 @@ int up_putc(int ch)
{
/* Add CR */
- up_lowputc('\r');
+ arm64_lowputc('\r');
}
- up_lowputc((uint8_t)ch);
+ arm64_lowputc((uint8_t)ch);
return ch;
}
@@ -871,10 +871,10 @@ int up_putc(int ch)
{
/* Add CR */
- up_lowputc('\r');
+ arm64_lowputc('\r');
}
- up_lowputc((uint8_t)ch);
+ arm64_lowputc((uint8_t)ch);
return ch;
}
diff --git a/arch/arm64/src/qemu/qemu_boot.h b/arch/arm64/src/qemu/qemu_boot.h
index b61c89a336..4859535cad 100644
--- a/arch/arm64/src/qemu/qemu_boot.h
+++ b/arch/arm64/src/qemu/qemu_boot.h
@@ -74,9 +74,6 @@ extern "C"
void qemu_board_initialize(void);
-void up_lowputc(char c);
-void up_low_flush(void);
-
#undef EXTERN
#if defined(__cplusplus)
}
diff --git a/arch/arm64/src/qemu/qemu_lowputc.S b/arch/arm64/src/qemu/qemu_lowputc.S
index 70848b64bc..a772bb8aaa 100644
--- a/arch/arm64/src/qemu/qemu_lowputc.S
+++ b/arch/arm64/src/qemu/qemu_lowputc.S
@@ -93,8 +93,8 @@ SECTION_FUNC(text, up_earlyserialinit)
* x0: character to print
*/
-GTEXT(up_lowputc)
-SECTION_FUNC(text, up_lowputc)
+GTEXT(arm64_lowputc)
+SECTION_FUNC(text, arm64_lowputc)
ldr x15, =UART1_BASE_ADDRESS
early_uart_ready x15, w2
early_uart_transmit x15, w0
diff --git a/arch/arm64/src/qemu/qemu_serial.c b/arch/arm64/src/qemu/qemu_serial.c
index 6f5d295a6b..27b79a7076 100644
--- a/arch/arm64/src/qemu/qemu_serial.c
+++ b/arch/arm64/src/qemu/qemu_serial.c
@@ -828,10 +828,10 @@ int up_putc(int ch)
{
/* Add CR */
- up_lowputc('\r');
+ arm64_lowputc('\r');
}
- up_lowputc((uint8_t)ch);
+ arm64_lowputc((uint8_t)ch);
return ch;
}
@@ -876,10 +876,10 @@ int up_putc(int ch)
{
/* Add CR */
- up_lowputc('\r');
+ arm64_lowputc('\r');
}
- up_lowputc((uint8_t)ch);
+ arm64_lowputc((uint8_t)ch);
return ch;
}
diff --git a/arch/renesas/src/common/renesas_internal.h b/arch/renesas/src/common/renesas_internal.h
index ca8e9f021d..694d7b9fb1 100644
--- a/arch/renesas/src/common/renesas_internal.h
+++ b/arch/renesas/src/common/renesas_internal.h
@@ -172,6 +172,8 @@ void renesas_consoleinit(void);
void renesas_serialinit(void);
#endif
+void renesas_lowputc(char ch);
+
/* Defined in board/xyz_lcd.c */
#ifdef CONFIG_SLCD_CONSOLE
diff --git a/boards/renesas/m16c/skp16c26/src/m16c_lcdconsole.c b/boards/renesas/m16c/skp16c26/src/m16c_lcdconsole.c
index d0e5698f94..cf13b00ba5 100644
--- a/boards/renesas/m16c/skp16c26/src/m16c_lcdconsole.c
+++ b/boards/renesas/m16c/skp16c26/src/m16c_lcdconsole.c
@@ -96,14 +96,14 @@ void up_consoleinit(void)
#endif
/****************************************************************************
- * Name: up_lowputc
+ * Name: renesas_lowputc
*
* Description:
* Output one character on the console
*
****************************************************************************/
-void up_lowputc(char ch)
+void renesas_lowputc(char ch)
{
up_lcdputc(ch);
}
diff --git a/boards/renesas/rx65n/rx65n-grrose/src/rx65n_sbram.c b/boards/renesas/rx65n/rx65n-grrose/src/rx65n_sbram.c
index 7f3b696d26..477d0f2a47 100644
--- a/boards/renesas/rx65n/rx65n-grrose/src/rx65n_sbram.c
+++ b/boards/renesas/rx65n/rx65n-grrose/src/rx65n_sbram.c
@@ -467,14 +467,14 @@ void board_crashdump(uintptr_t sp, struct tcb_s *tcb,
while (*dead)
{
- up_lowputc(*dead++);
+ renesas_lowputc(*dead++);
}
}
else if (rv == -ENOSPC)
{
/* hard fault again */
- up_lowputc('!');
+ renesas_lowputc('!');
}
}
#endif /* CONFIG_RX65N_SAVE_CRASHDUMP */
diff --git a/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_sbram.c b/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_sbram.c
index 10f889fe9d..692600e81d 100644
--- a/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_sbram.c
+++ b/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_sbram.c
@@ -464,14 +464,14 @@ void board_crashdump(uintptr_t sp, struct tcb_s *tcb,
while (*dead)
{
- up_lowputc(*dead++);
+ renesas_lowputc(*dead++);
}
}
else if (rv == -ENOSPC)
{
/* hard fault again */
- up_lowputc('!');
+ renesas_lowputc('!');
}
}
#endif /* CONFIG_RX65N_SAVE_CRASHDUMP */