1
0
Fork 0
forked from nuttx/nuttx-update

driver/serial: remove return value of up_putc()

modify the prototype of up_putc(): remove the return value

The architecture code does not care about the return value of up_putc(), so removing it saves two statements:

Before:                                                    After:
de4c: e52de004  push  {lr}    @ (str lr, [sp, #-4]!)    |  de4c: e52de004  push  {lr}    @ (str lr, [sp, #-4]!)
de50: e24dd014  sub sp, sp, #20                         |  de50: e24dd014  sub sp, sp, #20
de54: e58d0004  str r0, [sp, #4]                        |  de54: e58d0004  str r0, [sp, #4]
de58: e30030f8  movw  r3, #248  @ 0xf8                  |  de58: e30030f8  movw  r3, #248  @ 0xf8
de5c: e3423000  movt  r3, #8192 @ 0x2000                |  de5c: e3423000  movt  r3, #8192 @ 0x2000
de60: e58d300c  str r3, [sp, #12]                       |  de60: e58d300c  str r3, [sp, #12]
de64: e59d1004  ldr r1, [sp, #4]                        |  de64: e59d1004  ldr r1, [sp, #4]
de68: e59d000c  ldr r0, [sp, #12]                       |  de68: e59d000c  ldr r0, [sp, #12]
de6c: ebfffe66  bl  d80c <pl011_putc>                   |  de6c: ebfffe66  bl  d80c <pl011_putc>
de70: e59d3004  ldr r3, [sp, #4]                        |  de70: e28dd014  add sp, sp, #20
de74: e1a00003  mov r0, r3                              |  de74: e49df004  pop {pc}    @ (ldr pc, [sp], #4)
de78: e28dd014  add sp, sp, #20                         |
de7c: e49df004  pop {pc}    @ (ldr pc, [sp], #4)        |

Signed-off-by: chao an <anchao@lixiang.com>
This commit is contained in:
chao an 2024-10-25 17:58:49 +08:00 committed by Xiang Xiao
parent d0f957ae85
commit c6591c0f49
115 changed files with 211 additions and 446 deletions

View file

@ -288,7 +288,7 @@ APIs Exported by Architecture-Specific Logic to NuttX
architectures, it should be avoided in common implementations
where possible.
.. c:function:: int up_putc(int ch)
.. c:function:: void up_putc(int ch)
This is a debug interface exported by the
architecture-specific logic. Output one character on the console

View file

@ -1566,7 +1566,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
struct up_dev_s *priv = (struct up_dev_s *)CONSOLE_DEV.priv;
@ -1578,8 +1578,6 @@ int up_putc(int ch)
#ifdef HAVE_SERIAL_CONSOLE
up_restoreuartint(priv, ier);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -1592,12 +1590,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_UART_DEVICE
arm_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -1370,7 +1370,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
struct up_dev_s *priv = (struct up_dev_s *)CONSOLE_DEV.priv;
@ -1382,8 +1382,6 @@ int up_putc(int ch)
#ifdef HAVE_SERIAL_CONSOLE
up_restoreuartint(priv, ier);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -1396,12 +1394,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_UART_DEVICE
arm_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -2997,7 +2997,7 @@ void at32_serial_dma_poll(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#if CONSOLE_UART > 0
struct up_dev_s *priv = g_uart_devs[CONSOLE_UART - 1];
@ -3007,7 +3007,6 @@ int up_putc(int ch)
arm_lowputc(ch);
up_restoreusartint(priv, ie);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -3020,12 +3019,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#if CONSOLE_UART > 0
arm_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -830,7 +830,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
struct up_dev_s *priv = (struct up_dev_s *)CONSOLE_DEV.priv;
uint16_t ier;
@ -841,5 +841,4 @@ int up_putc(int ch)
up_waittxready(priv);
up_restoreuartint(priv, ier);
return ch;
}

View file

@ -45,10 +45,9 @@
* Name: up_putc
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
smh_call(SEMI_SYSLOG_WRITEC, &ch);
return ch;
}
/****************************************************************************

View file

@ -970,7 +970,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_CONSOLE
struct up_dev_s *priv = (struct up_dev_s *)CONSOLE_DEV.priv;
@ -982,8 +982,6 @@ int up_putc(int ch)
#ifdef HAVE_CONSOLE
up_restoreuartint(priv, ier);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -1108,7 +1108,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_CONSOLE
struct up_dev_s *priv = (struct up_dev_s *)CONSOLE_DEV.priv;
@ -1120,8 +1120,6 @@ int up_putc(int ch)
#ifdef HAVE_CONSOLE
up_restoreuartint(priv, ier);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -1134,12 +1132,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_UART
arm_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -742,7 +742,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
struct up_dev_s *priv = (struct up_dev_s *)CONSOLE_DEV.priv;
uint16_t ier;
@ -753,7 +753,6 @@ int up_putc(int ch)
up_waittxready(priv);
up_restoreuartint(priv, ier);
return ch;
}
#else /* USE_SERIALDRIVER */
@ -789,13 +788,12 @@ static inline void up_waittxready(void)
* Public Functions
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
up_waittxready();
putreg16((uint16_t)ch, DM320_REGISTER_BASE + UART_DTRR);
up_waittxready();
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -809,7 +809,7 @@ void arm_serialinit(void)
****************************************************************************/
#ifdef HAVE_LEUART_CONSOLE
int up_putc(int ch)
void up_putc(int ch)
{
struct efm32_leuart_s *priv = (struct efm32_leuart_s *)CONSOLE_DEV.priv;
uint32_t ien;
@ -817,7 +817,6 @@ int up_putc(int ch)
efm32_disableuartint(priv, &ien);
efm32_lowputc(ch);
efm32_restoreuartint(priv, ien);
return ch;
}
#endif
@ -832,10 +831,9 @@ int up_putc(int ch)
****************************************************************************/
#ifdef HAVE_LEUART_CONSOLE
int up_putc(int ch)
void up_putc(int ch)
{
efm32_lowputc(ch);
return ch;
}
#endif

View file

@ -1185,7 +1185,7 @@ void arm_serialinit(void)
****************************************************************************/
#ifndef HAVE_LEUART_CONSOLE
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_UART_CONSOLE
struct efm32_usart_s *priv = (struct efm32_usart_s *)CONSOLE_DEV.priv;
@ -1195,7 +1195,6 @@ int up_putc(int ch)
efm32_lowputc(ch);
efm32_restoreuartint(priv, ien);
#endif
return ch;
}
#endif
@ -1210,12 +1209,11 @@ int up_putc(int ch)
****************************************************************************/
#ifndef HAVE_LEUART_CONSOLE
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_UART_CONSOLE
efm32_lowputc(ch);
#endif
return ch;
}
#endif

View file

@ -581,7 +581,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef CONFIG_UART_SERIAL_CONSOLE
struct eoss3_uart_s *priv = (struct eoss3_uart_s *)g_uartport.priv;
@ -591,8 +591,6 @@ int up_putc(int ch)
arm_lowputc(ch);
eoss3_restoreuartint(priv, ie);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -605,12 +603,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
/* Output the character */
arm_lowputc(ch);
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -78,9 +78,8 @@ void arm_serialinit(void)
#else /* USE_SERIALDRIVER */
int up_putc(int ch)
void up_putc(int ch)
{
return 0;
}
#endif /* USE_SERIALDRIVER */

View file

@ -2929,7 +2929,7 @@ void gd32_serial_dma_poll(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef CONSOLE_UART
@ -2940,7 +2940,6 @@ int up_putc(int ch)
arm_lowputc(ch);
up_restoreusartint(priv, ie);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -2953,12 +2952,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef CONSOLE_UART
arm_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -1158,7 +1158,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
struct up_dev_s *priv = (struct up_dev_s *)CONSOLE_DEV.priv;
uint32_t ier;
@ -1169,7 +1169,6 @@ int up_putc(int ch)
up_serialout(priv, UART_TXD0, (uint32_t)ch);
up_waittxready(priv);
up_restoreuartint(priv, ier);
return ch;
}
#else /* USE_SERIALDRIVER */
@ -1211,11 +1210,10 @@ static inline void up_waittxready(void)
* Public Functions
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
up_waittxready();
putreg32((uint16_t)ch, IMX_REGISTER_BASE + UART_TXD0);
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -1114,7 +1114,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
struct imx_uart_s *priv = (struct imx_uart_s *)CONSOLE_DEV.priv;
uint32_t ier;
@ -1126,8 +1126,6 @@ int up_putc(int ch)
imx_disableuartint(priv, &ier);
imx_lowputc(ch);
imx_restoreuartint(priv, ier);
return ch;
}
#else /* USE_SERIALDRIVER */
@ -1176,14 +1174,12 @@ static inline void imx_waittxready(void)
* Public Functions
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef IMX_CONSOLE_VBASE
imx_waittxready();
putreg32((uint16_t)ch, IMX_CONSOLE_VBASE + UART_TXD_OFFSET);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -3671,7 +3671,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef CONSOLE_DEV
struct imxrt_uart_s *priv = (struct imxrt_uart_s *)CONSOLE_DEV.dev.priv;
@ -3681,8 +3681,6 @@ int up_putc(int ch)
imxrt_lowputc(ch);
imxrt_restoreuartint(priv, ie);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -3695,13 +3693,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#if CONSOLE_LPUART > 0
arm_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -1949,7 +1949,7 @@ void kinetis_lpserial_dma_poll(void)
****************************************************************************/
#ifdef HAVE_LPUART_PUTC
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_LPUART_CONSOLE
struct kinetis_dev_s *priv = (struct kinetis_dev_s *)CONSOLE_DEV.priv;
@ -1959,7 +1959,6 @@ int up_putc(int ch)
arm_lowputc(ch);
kinetis_restoreuartint(priv, ie);
#endif
return ch;
}
#endif
@ -1974,12 +1973,11 @@ int up_putc(int ch)
****************************************************************************/
#ifdef HAVE_LPUART_PUTC
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_LPUART_CONSOLE
arm_lowputc(ch);
#endif
return ch;
}
#endif

View file

@ -2141,7 +2141,7 @@ void kinetis_serial_dma_poll(void)
****************************************************************************/
#ifdef HAVE_UART_PUTC
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_UART_CONSOLE
struct up_dev_s *priv = (struct up_dev_s *)CONSOLE_DEV.priv;
@ -2151,7 +2151,6 @@ int up_putc(int ch)
arm_lowputc(ch);
up_restoreuartint(priv, ie);
#endif
return ch;
}
#endif
@ -2166,12 +2165,11 @@ int up_putc(int ch)
****************************************************************************/
#ifdef HAVE_UART_PUTC
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_UART_CONSOLE
arm_lowputc(ch);
#endif
return ch;
}
#endif

View file

@ -875,7 +875,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
struct up_dev_s *priv = (struct up_dev_s *)CONSOLE_DEV.priv;
@ -885,7 +885,6 @@ int up_putc(int ch)
kl_lowputc(ch);
up_restoreuartint(priv, ie);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -898,12 +897,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
kl_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -1358,7 +1358,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
struct up_dev_s *priv = (struct up_dev_s *)CONSOLE_DEV.priv;
uint32_t im;
@ -1366,7 +1366,7 @@ int up_putc(int ch)
#ifdef CONFIG_DEV_CONSOLE_SWITCH
if (g_console_disable)
{
return ch;
return;
}
#endif /* CONFIG_DEV_CONSOLE_SWITCH */
@ -1376,7 +1376,6 @@ int up_putc(int ch)
up_waittxnotfull(priv);
up_restoreuartint(priv, im);
return ch;
}
#else /* USE_SERIALDRIVER */
@ -1389,10 +1388,9 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
arm_lowputc(ch);
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -1684,7 +1684,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_CONSOLE
struct up_dev_s *priv = (struct up_dev_s *)CONSOLE_DEV.priv;
@ -1696,8 +1696,6 @@ int up_putc(int ch)
#ifdef HAVE_CONSOLE
up_restoreuartint(priv, ier);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -1710,12 +1708,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_UART
arm_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -783,7 +783,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
struct up_dev_s *priv = (struct up_dev_s *)CONSOLE_DEV.priv;
uint8_t ier;
@ -794,7 +794,6 @@ int up_putc(int ch)
up_waittxready(priv);
up_restoreuartint(priv, ier);
return ch;
}
#else /* USE_SERIALDRIVER */
@ -807,10 +806,9 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
arm_lowputc(ch);
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -923,7 +923,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
struct up_dev_s *priv = (struct up_dev_s *)CONSOLE_DEV.priv;
uint8_t ier;
@ -934,7 +934,6 @@ int up_putc(int ch)
up_waittxready(priv);
up_restoreuartint(priv, ier);
return ch;
}
#else /* USE_SERIALDRIVER */
@ -947,9 +946,8 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
arm_lowputc(ch);
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -797,7 +797,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
struct up_dev_s *priv = &g_uartpriv;
uint8_t ier;
@ -812,7 +812,6 @@ int up_putc(int ch)
arm_lowputc(ch);
up_restoreuartint(priv, ier);
return ch;
}
#else /* USE_SERIALDRIVER */
@ -825,12 +824,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
/* Output the character */
arm_lowputc(ch);
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -1348,7 +1348,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
struct up_dev_s *priv = (struct up_dev_s *)CONSOLE_DEV.priv;
@ -1360,8 +1360,6 @@ int up_putc(int ch)
#ifdef HAVE_SERIAL_CONSOLE
up_restoreuartint(priv, ier);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -1374,12 +1372,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_UART
arm_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -1440,7 +1440,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_USART_CONSOLE
struct lpc54_dev_s *priv = (struct lpc54_dev_s *)CONSOLE_DEV.priv;
@ -1450,8 +1450,6 @@ int up_putc(int ch)
arm_lowputc(ch);
lpc54_fifoint_enable(priv, intset);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -1464,11 +1462,10 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_USART_CONSOLE
arm_lowputc(ch);
return ch;
}
#endif

View file

@ -825,7 +825,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_UART_CONSOLE
struct max326_dev_s *priv = (struct max326_dev_s *)CONSOLE_DEV.priv;
@ -835,8 +835,6 @@ int up_putc(int ch)
arm_lowputc(ch);
max326_int_enable(priv, intset);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -849,11 +847,10 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_UART_CONSOLE
arm_lowputc(ch);
return ch;
}
#endif

View file

@ -1051,7 +1051,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_UART_CONSOLE
struct mx8mp_uart_s *priv = (struct mx8mp_uart_s *)CONSOLE_DEV.priv;
@ -1065,8 +1065,6 @@ int up_putc(int ch)
arm_lowputc(ch);
mx8mp_restoreuartint(priv, ier);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -1113,14 +1111,12 @@ static inline void mx8mp_waittxready(void)
* Public Functions
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef MX8MP_CONSOLE
mx8mp_waittxready();
putreg32((uint16_t)ch, MX8MP_CONSOLE + UART_TXD_OFFSET);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -812,15 +812,13 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_UART_CONSOLE
/* struct nrf52_dev_s *priv = (struct nrf52_dev_s *)CONSOLE_DEV.priv; */
arm_lowputc(ch);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -833,12 +831,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_UART_CONSOLE
arm_lowputc(ch);
#endif
return ch;
}
#endif /* HAVE_UART_DEVICE && USE_SERIALDRIVER */

View file

@ -812,15 +812,13 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_UART_CONSOLE
/* struct nrf53_dev_s *priv = (struct nrf53_dev_s *)CONSOLE_DEV.priv; */
arm_lowputc(ch);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -833,12 +831,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_UART_CONSOLE
arm_lowputc(ch);
#endif
return ch;
}
#endif /* HAVE_UART_DEVICE && USE_SERIALDRIVER */

View file

@ -812,15 +812,13 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_UART_CONSOLE
/* struct nrf91_dev_s *priv = (struct nrf91_dev_s *)CONSOLE_DEV.priv; */
arm_lowputc(ch);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -833,12 +831,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_UART_CONSOLE
arm_lowputc(ch);
#endif
return ch;
}
#endif /* HAVE_UART_DEVICE && USE_SERIALDRIVER */

View file

@ -1049,7 +1049,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_CONSOLE
struct nuc_dev_s *priv = (struct nuc_dev_s *)CONSOLE_DEV.priv;
@ -1061,8 +1061,6 @@ int up_putc(int ch)
#ifdef HAVE_CONSOLE
up_restoreuartint(priv, ier);
#endif
return ch;
}
#else /* USE_SERIALDRIVER && HAVE_UART */
@ -1075,12 +1073,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_UART
nuc_lowputc((uint32_t)ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER && HAVE_UART */

View file

@ -1127,10 +1127,9 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
hal_uart_send_byte(UART0, (char)ch);
return ch;
}
struct h4uart_param_s

View file

@ -1015,7 +1015,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_CONSOLE
struct up_dev_s *priv = (struct up_dev_s *)CONSOLE_DEV.priv;
@ -1026,8 +1026,6 @@ int up_putc(int ch)
#ifdef HAVE_CONSOLE
up_restoreuartint(priv, ier);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -1040,12 +1038,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_UART
arm_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -1074,12 +1074,11 @@ void arm_serialinit(void)
****************************************************************************/
#ifdef HAVE_AMEBA_CONSOLE
int up_putc(int ch)
void up_putc(int ch)
{
struct ameba_s *priv = (struct ameba_s *)CONSOLE_DEV.priv;
ameba_putc(priv, ch);
return ch;
}
#endif

View file

@ -2544,7 +2544,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef CONSOLE_DEV
struct s32k1xx_uart_s *priv =
@ -2555,8 +2555,6 @@ int up_putc(int ch)
s32k1xx_lowputc(ch);
s32k1xx_restoreuartint(priv, ie);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -2569,13 +2567,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#if CONSOLE_LPUART > 0
arm_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -4453,7 +4453,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef CONSOLE_DEV
struct s32k3xx_uart_s *priv = (struct s32k3xx_uart_s *)&CONSOLE_DEV;
@ -4463,8 +4463,6 @@ int up_putc(int ch)
s32k3xx_lowputc(ch);
s32k3xx_restoreuartint(priv, ie);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -4477,13 +4475,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#if CONSOLE_LPUART > 0
arm_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -303,12 +303,11 @@ void arm_lowputc(char ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_CONSOLE
arm_lowputc(ch);
#endif
return ch;
}
/****************************************************************************

View file

@ -315,14 +315,13 @@ void arm_lowputc(char ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#if defined(SAMA5_HAVE_UART_CONSOLE) || defined(SAMA5_HAVE_USART_CONSOLE) || \
defined(SAMA5_HAVE_FLEXCOM_CONSOLE) || defined(CONFIG_SAMA5_DBGU_CONSOLE)
arm_lowputc(ch);
#endif
return ch;
}
/****************************************************************************

View file

@ -1037,7 +1037,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
irqstate_t flags;
@ -1050,7 +1050,6 @@ int up_putc(int ch)
sam_lowputc(ch);
spin_unlock_irqrestore(NULL, flags);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -1063,12 +1062,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
sam_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -1096,7 +1096,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
irqstate_t flags;
@ -1109,7 +1109,6 @@ int up_putc(int ch)
sam_lowputc(ch);
spin_unlock_irqrestore(NULL, flags);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -1122,12 +1121,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
sam_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -209,12 +209,11 @@ void arm_lowputc(char ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
arm_lowputc(ch);
#endif
return ch;
}
/****************************************************************************

View file

@ -3627,7 +3627,7 @@ void stm32_serial_dma_poll(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#if CONSOLE_UART > 0
struct up_dev_s *priv = g_uart_devs[CONSOLE_UART - 1];
@ -3642,7 +3642,6 @@ int up_putc(int ch)
arm_lowputc(ch);
up_restoreusartint(priv, ie);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -3655,12 +3654,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#if CONSOLE_UART > 0 || CONSOLE_LPUART > 0
arm_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -2574,7 +2574,7 @@ void stm32serial_dmapoll(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#if CONSOLE_USART > 0
struct stm32_serial_s *priv = g_uart_devs[CONSOLE_USART - 1];
@ -2584,7 +2584,6 @@ int up_putc(int ch)
arm_lowputc(ch);
stm32serial_restoreusartint(priv, ie);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -2597,13 +2596,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#if CONSOLE_USART > 0
arm_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -2007,7 +2007,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#if CONSOLE_USART > 0
struct up_dev_s *priv = g_uart_devs[CONSOLE_USART - 1];
@ -2018,7 +2018,6 @@ int up_putc(int ch)
up_restoreusartint(priv, ie);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -2031,12 +2030,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#if CONSOLE_USART > 0
arm_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -3792,7 +3792,7 @@ void stm32_serial_dma_poll(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#if CONSOLE_UART > 0
struct up_dev_s *priv = g_uart_devs[CONSOLE_UART - 1];
@ -3802,7 +3802,6 @@ int up_putc(int ch)
arm_lowputc(ch);
up_restoreusartint(priv, ie);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -3815,12 +3814,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#if CONSOLE_UART > 0
arm_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -4001,7 +4001,7 @@ void stm32_serial_dma_poll(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#if CONSOLE_UART > 0
struct up_dev_s *priv = g_uart_devs[CONSOLE_UART - 1];
@ -4012,7 +4012,6 @@ int up_putc(int ch)
up_restoreusartint(priv, ie);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -4025,12 +4024,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#if CONSOLE_UART > 0
arm_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -3261,7 +3261,7 @@ void stm32l4_serial_dma_poll(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#if CONSOLE_UART > 0
struct stm32l4_serial_s *priv = g_uart_devs[CONSOLE_UART - 1];
@ -3271,7 +3271,6 @@ int up_putc(int ch)
arm_lowputc(ch);
stm32l4serial_restoreusartint(priv, ie);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -3284,12 +3283,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#if CONSOLE_UART > 0
arm_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -3194,7 +3194,7 @@ void stm32l5_serial_dma_poll(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#if CONSOLE_UART > 0
struct stm32l5_serial_s *priv = g_uart_devs[CONSOLE_UART - 1];
@ -3204,7 +3204,6 @@ int up_putc(int ch)
arm_lowputc(ch);
stm32l5serial_restoreusartint(priv, ie);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -3217,12 +3216,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#if CONSOLE_UART > 0
arm_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -3194,7 +3194,7 @@ void stm32_serial_dma_poll(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#if CONSOLE_UART > 0
struct stm32_serial_s *priv = g_uart_devs[CONSOLE_UART - 1];
@ -3204,7 +3204,6 @@ int up_putc(int ch)
arm_lowputc(ch);
stm32serial_restoreusartint(priv, ie);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -3217,12 +3216,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#if CONSOLE_UART > 0
arm_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -2827,7 +2827,7 @@ void stm32wb_serial_dma_poll(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#if CONSOLE_UART > 0
struct stm32wb_serial_s *priv = g_uart_devs[CONSOLE_UART - 1];
@ -2837,7 +2837,6 @@ int up_putc(int ch)
arm_lowputc(ch);
stm32wb_serial_restoreusartint(priv, ie);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -2850,12 +2849,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#if CONSOLE_UART > 0
arm_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -2928,7 +2928,7 @@ void stm32wl5_serial_dma_poll(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#if CONSOLE_UART > 0
struct stm32wl5_serial_s *priv = g_uart_devs[CONSOLE_UART - 1];
@ -2938,7 +2938,6 @@ int up_putc(int ch)
arm_lowputc(ch);
stm32wl5serial_restoreusartint(priv, ie);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -2951,12 +2950,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#if CONSOLE_UART > 0
arm_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -950,7 +950,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_CONSOLE
struct up_dev_s *priv = (struct up_dev_s *)CONSOLE_DEV.priv;
@ -963,7 +963,6 @@ int up_putc(int ch)
up_waittxnotfull(priv);
up_restoreuartint(priv, ier);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -976,12 +975,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_CONSOLE
arm_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -1572,7 +1572,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
struct up_dev_s *priv = (struct up_dev_s *)CONSOLE_DEV.priv;
@ -1586,7 +1586,6 @@ int up_putc(int ch)
up_waittxnotfull(priv);
up_restoreuartint(priv, im);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -1599,12 +1598,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
arm_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -1591,11 +1591,9 @@ static inline int tlsr82_uart_lowputc(int ch)
****************************************************************************/
#ifndef CONFIG_TLSR82_SPI_SYSLOG
int up_putc(int ch)
void up_putc(int ch)
{
tlsr82_uart_lowputc(ch);
return 0;
}
#endif

View file

@ -324,10 +324,8 @@ void spi_console_init(void)
****************************************************************************/
#ifdef CONFIG_TLSR82_SPI_SYSLOG
int up_putc(int ch)
void up_putc(int ch)
{
spi_putc((uint8_t)ch);
return 0;
}
#endif

View file

@ -226,12 +226,11 @@ void arm_lowputc(char ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
arm_lowputc(ch);
#endif
return ch;
}
/****************************************************************************

View file

@ -1120,7 +1120,7 @@ void arm_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_UART_CONSOLE
struct xmc4_dev_s *priv = (struct xmc4_dev_s *)CONSOLE_DEV.priv;
@ -1130,8 +1130,6 @@ int up_putc(int ch)
arm_lowputc(ch);
xmc4_restoreuartint(priv, ccr);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -1144,11 +1142,10 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_UART_CONSOLE
arm_lowputc(ch);
return ch;
#endif
}

View file

@ -1412,14 +1412,13 @@ void arm64_earlyserialinit(void)
*
***************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef CONSOLE_DEV
struct uart_dev_s *dev = &CONSOLE_DEV;
a64_uart_wait_send(dev, ch);
#endif
return ch;
}
/***************************************************************************

View file

@ -1049,12 +1049,11 @@ void arm64_earlyserialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
struct uart_dev_s *dev = &CONSOLE_DEV;
imx8_send(dev, (uint8_t)ch);
return ch;
}
/****************************************************************************

View file

@ -2790,7 +2790,7 @@ void arm64_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef CONSOLE_DEV
struct imx9_uart_s *priv = (struct imx9_uart_s *)&CONSOLE_DEV;
@ -2798,7 +2798,7 @@ int up_putc(int ch)
if (!CONSOLE_DEV.dev.isconsole)
{
return ch;
return;
}
imx9_disableuartint(priv, &ie);
@ -2808,5 +2808,4 @@ int up_putc(int ch)
#ifdef CONSOLE_DEV
imx9_restoreuartint(priv, ie);
#endif
return ch;
}

View file

@ -1355,14 +1355,13 @@ void arm64_earlyserialinit(void)
*
***************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef CONSOLE_DEV
struct uart_dev_s *dev = &CONSOLE_DEV;
a64_uart_wait_send(dev, ch);
#endif
return ch;
}
/***************************************************************************

View file

@ -1308,14 +1308,13 @@ void arm64_earlyserialinit(void)
*
***************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef CONSOLE_DEV
struct uart_dev_s *dev = &CONSOLE_DEV;
zynq_uart_wait_send(dev, ch);
#endif
return ch;
}
/***************************************************************************

View file

@ -754,7 +754,7 @@ void avr_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
struct up_dev_s *priv = (struct up_dev_s *)CONSOLE_DEV.priv;
@ -764,7 +764,6 @@ int up_putc(int ch)
avr_lowputc(ch);
up_restoreusartint(priv, imr);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -777,12 +776,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
avr_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -561,7 +561,7 @@ void avr_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
uint8_t imr;
@ -570,7 +570,6 @@ int up_putc(int ch)
avr_lowputc(ch);
usart1_restoreusartint(imr);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -583,12 +582,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
avr_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -889,7 +889,7 @@ void avr_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
uint8_t imr;
@ -908,8 +908,6 @@ int up_putc(int ch)
usart1_restoreusartint(imr);
#endif
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -922,12 +920,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
avr_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -767,7 +767,7 @@ void hc_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_CONSOLE
struct up_dev_s *priv = (struct up_dev_s *)CONSOLE_DEV.priv;
@ -780,7 +780,6 @@ int up_putc(int ch)
up_waittxnotfull(priv);
up_restoresciint(priv, im);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -793,12 +792,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef CONFIG_ARCH_LOWPUTC
hc_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -876,7 +876,7 @@ void mips_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
struct uart_dev_s *dev = (struct uart_dev_s *)&CONSOLE_DEV;
@ -886,7 +886,6 @@ int up_putc(int ch)
mips_lowputc(ch);
up_restoreuartint(dev, imr);
#endif
return ch;
}
/****************************************************************************
@ -908,9 +907,8 @@ void mips_serialinit(void)
{
}
int up_putc(int ch)
void up_putc(int ch)
{
return ch;
}
#endif /* HAVE_UART_DEVICE */
@ -924,12 +922,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
mips_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -1413,7 +1413,7 @@ void mips_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
struct uart_dev_s *dev = (struct uart_dev_s *)&CONSOLE_DEV;
@ -1423,7 +1423,6 @@ int up_putc(int ch)
mips_lowputc(ch);
up_restoreuartint(dev, imr);
#endif
return ch;
}
/****************************************************************************
@ -1445,9 +1444,8 @@ void mips_serialinit(void)
{
}
int up_putc(int ch)
void up_putc(int ch)
{
return ch;
}
#endif /* HAVE_UART_DEVICE */
@ -1461,12 +1459,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
mips_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -541,7 +541,7 @@ void misoc_earlyserialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
struct uart_dev_s *dev = (struct uart_dev_s *)&CONSOLE_DEV;
@ -551,7 +551,6 @@ int up_putc(int ch)
misoc_lowputc(ch);
misoc_restoreuartint(dev, imr);
#endif
return ch;
}
/****************************************************************************
@ -574,9 +573,8 @@ void misoc_serial_initialize(void)
{
}
int up_putc(int ch)
void up_putc(int ch)
{
return ch;
}
#endif /* HAVE_UART_DEVICE */
@ -590,13 +588,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
misoc_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -106,7 +106,7 @@ void or1k_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
irqstate_t flags;
@ -121,5 +121,4 @@ int up_putc(int ch)
spin_unlock_irqrestore(NULL, flags);
#endif
return ch;
}

View file

@ -1094,7 +1094,7 @@ void renesas_consoleinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIALCONSOLE
struct up_dev_s *priv = (struct up_dev_s *)CONSOLE_DEV.priv;
@ -1107,7 +1107,6 @@ int up_putc(int ch)
up_waittxready(priv);
up_restoreuartint(priv, ucon);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -1120,12 +1119,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIALCONSOLE
renesas_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -1692,7 +1692,7 @@ void renesas_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_CONSOLE
struct up_dev_s *priv;
@ -1705,7 +1705,6 @@ int up_putc(int ch)
up_waittxready(priv);
up_restoresciint(priv, scr);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -1717,12 +1716,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_CONSOLE
renesas_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -880,7 +880,7 @@ void renesas_consoleinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_CONSOLE
struct up_dev_s *priv = (struct up_dev_s *)CONSOLE_DEV.priv;
@ -893,7 +893,6 @@ int up_putc(int ch)
up_waittxready(priv);
up_restoresciint(priv, scr);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -906,12 +905,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_CONSOLE
renesas_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -886,7 +886,7 @@ void riscv_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
irqstate_t flags = spin_lock_irqsave(NULL);
@ -894,7 +894,6 @@ int up_putc(int ch)
riscv_lowputc(ch);
spin_unlock_irqrestore(NULL, flags);
#endif
return ch;
}
/****************************************************************************
@ -917,9 +916,8 @@ void riscv_serialinit(void)
{
}
int up_putc(int ch)
void up_putc(int ch)
{
return ch;
}
#endif /* HAVE_UART_DEVICE */
@ -933,12 +931,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
riscv_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -1004,7 +1004,7 @@ void bl808_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
struct bl808_uart_s *priv = CONSOLE_DEV.priv;
uint8_t uart_idx = priv->config.idx;
@ -1016,5 +1016,4 @@ int up_putc(int ch)
putreg32(ch, BL808_UART_FIFO_WDATA(uart_idx));
leave_critical_section(flags);
return ch;
}

View file

@ -663,7 +663,7 @@ void riscv_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
struct up_dev_s *priv = (struct up_dev_s *)CONSOLE_DEV.priv;
@ -673,7 +673,6 @@ int up_putc(int ch)
riscv_lowputc(ch);
up_restoreuartint(priv, imr);
#endif
return ch;
}
/****************************************************************************
@ -696,9 +695,8 @@ void riscv_serialinit(void)
{
}
int up_putc(int ch)
void up_putc(int ch)
{
return ch;
}
#endif /* HAVE_UART_DEVICE */
@ -712,12 +710,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
riscv_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -1147,7 +1147,7 @@ void riscv_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef CONSOLE_UART
uint32_t int_status;
@ -1160,7 +1160,6 @@ int up_putc(int ch)
#ifdef CONSOLE_UART
esp_lowputc_restore_all_uart_int(CONSOLE_DEV.priv, &int_status);
#endif
return ch;
}
#else /* HAVE_UART_DEVICE */
@ -1187,9 +1186,8 @@ void riscv_serialinit(void)
{
}
int up_putc(int ch)
void up_putc(int ch)
{
return ch;
}
#endif /* HAVE_UART_DEVICE */
@ -1211,13 +1209,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
riscv_lowputc(ch);
#endif /* HAVE_SERIAL_CONSOLE */
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -1102,7 +1102,7 @@ void riscv_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef CONSOLE_UART
uint32_t int_status;
@ -1115,7 +1115,6 @@ int up_putc(int ch)
#ifdef CONSOLE_UART
esp32c3_lowputc_restore_all_uart_int(CONSOLE_DEV.priv, &int_status);
#endif
return ch;
}
#endif /* HAVE_UART_DEVICE */
@ -1130,7 +1129,7 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef CONSOLE_UART
uint32_t int_status;
@ -1143,7 +1142,6 @@ int up_putc(int ch)
#ifdef CONSOLE_UART
esp32c3_lowputc_restore_all_uart_int(CONSOLE_DEV.priv, &int_status);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -653,7 +653,7 @@ void riscv_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
struct up_dev_s *priv = (struct up_dev_s *)CONSOLE_DEV.priv;
@ -663,7 +663,6 @@ int up_putc(int ch)
riscv_lowputc(ch);
up_restoreuartint(priv, imr);
#endif
return ch;
}
/****************************************************************************
@ -686,9 +685,8 @@ void riscv_serialinit(void)
{
}
int up_putc(int ch)
void up_putc(int ch)
{
return ch;
}
#endif /* HAVE_UART_DEVICE */
@ -702,12 +700,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
riscv_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -1292,7 +1292,7 @@ void riscv_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef CONSOLE_DEV
struct hpm_uart_s *priv = (struct hpm_uart_s *)CONSOLE_DEV.dev.priv;
@ -1302,7 +1302,6 @@ int up_putc(int ch)
hpm_lowputc(ch);
hpm_restoreuartint(priv, im);
#endif
return ch;
}
#else /* USE_SERIALDRIVER */
@ -1315,12 +1314,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_UART_CONSOLE
riscv_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -838,7 +838,7 @@ void riscv_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
struct up_dev_s *priv = (struct up_dev_s *)CONSOLE_DEV.priv;
@ -848,7 +848,6 @@ int up_putc(int ch)
riscv_lowputc(ch);
up_restoreuartint(priv, imr);
#endif
return ch;
}
/****************************************************************************
@ -871,9 +870,8 @@ void riscv_serialinit(void)
{
}
int up_putc(int ch)
void up_putc(int ch)
{
return ch;
}
#endif /* HAVE_UART_DEVICE */
@ -887,12 +885,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
riscv_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -653,7 +653,7 @@ void riscv_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
struct up_dev_s *priv = (struct up_dev_s *)CONSOLE_DEV.priv;
@ -663,7 +663,6 @@ int up_putc(int ch)
riscv_lowputc(ch);
up_restoreuartint(priv, imr);
#endif
return ch;
}
/****************************************************************************
@ -686,9 +685,8 @@ void riscv_serialinit(void)
{
}
int up_putc(int ch)
void up_putc(int ch)
{
return ch;
}
#endif /* HAVE_UART_DEVICE */
@ -702,12 +700,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
riscv_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -191,10 +191,7 @@ void riscv_serialinit(void)
}
#ifdef CONFIG_RPMSG_UART_CONSOLE
int up_putc(int ch)
void up_putc(int ch)
{
/* place holder for now */
return ch;
}
#endif

View file

@ -685,7 +685,7 @@ void riscv_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
struct up_dev_s *priv = (struct up_dev_s *)CONSOLE_DEV.priv;
@ -695,7 +695,6 @@ int up_putc(int ch)
riscv_lowputc(ch);
up_restoreuartint(priv, imr);
#endif
return ch;
}
/****************************************************************************
@ -718,9 +717,8 @@ void riscv_serialinit(void)
{
}
int up_putc(int ch)
void up_putc(int ch)
{
return ch;
}
#endif /* HAVE_UART_DEVICE */
@ -734,12 +732,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
riscv_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -1245,7 +1245,7 @@ void riscv_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
struct up_dev_s *priv = (struct up_dev_s *)CONSOLE_DEV.priv;
@ -1253,7 +1253,7 @@ int up_putc(int ch)
if (!CONSOLE_DEV.isconsole)
{
return ch;
return;
}
up_disableuartint(priv, &ier);
@ -1263,7 +1263,6 @@ int up_putc(int ch)
#ifdef HAVE_SERIAL_CONSOLE
up_restoreuartint(priv, ier);
#endif
return ch;
}
/****************************************************************************
@ -1286,9 +1285,8 @@ void riscv_serialinit(void)
{
}
int up_putc(int ch)
void up_putc(int ch)
{
return ch;
}
#endif /* HAVE_UART_DEVICE */
@ -1302,12 +1300,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
riscv_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -1133,7 +1133,7 @@ void riscv_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef CONSOLE_DEV
struct up_dev_s *priv = (struct up_dev_s *)CONSOLE_DEV.priv;
@ -1143,7 +1143,6 @@ int up_putc(int ch)
riscv_lowputc(ch);
up_restoreuartint(priv, im);
#endif
return ch;
}
#ifdef HAVE_SERIAL_CONSOLE

View file

@ -786,11 +786,10 @@ void up_nputs(const char *str, size_t len)
* Name: up_putc
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef USE_DEVCONSOLE
char c = ch;
up_nputs(&c, 1);
#endif
return 0;
}

View file

@ -870,7 +870,7 @@ void sparc_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
struct uart_dev_s *dev = (struct uart_dev_s *)&CONSOLE_DEV;
@ -880,7 +880,6 @@ int up_putc(int ch)
sparc_lowputc(ch);
up_restoreuartint(dev, imr);
#endif
return ch;
}
/****************************************************************************
@ -902,9 +901,8 @@ void sparc_serialinit(void)
{
}
int up_putc(int ch)
void up_putc(int ch)
{
return ch;
}
#endif /* HAVE_UART_DEVICE */
@ -918,12 +916,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
sparc_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -865,7 +865,7 @@ void sparc_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
struct uart_dev_s *dev = (struct uart_dev_s *)&CONSOLE_DEV;
@ -875,7 +875,6 @@ int up_putc(int ch)
sparc_lowputc(ch);
up_restoreuartint(dev, imr);
#endif
return ch;
}
/****************************************************************************
@ -897,9 +896,8 @@ void sparc_serialinit(void)
{
}
int up_putc(int ch)
void up_putc(int ch)
{
return ch;
}
#endif /* HAVE_UART_DEVICE */
@ -913,12 +911,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
sparc_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -951,7 +951,7 @@ void sparc_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
struct uart_dev_s *dev = (struct uart_dev_s *)&CONSOLE_DEV;
@ -961,7 +961,6 @@ int up_putc(int ch)
sparc_lowputc(ch);
up_restoreuartint(dev, imr);
#endif
return ch;
}
/****************************************************************************
@ -983,9 +982,8 @@ void sparc_serialinit(void)
{
}
int up_putc(int ch)
void up_putc(int ch)
{
return ch;
}
#endif /* HAVE_UART_DEVICE */
@ -999,12 +997,11 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
sparc_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -722,11 +722,10 @@ void tricore_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
tricore_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -73,10 +73,9 @@ void uart_putreg(struct u16550_s *priv,
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
x86_lowputc(ch);
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -88,10 +88,9 @@ void up_lowputc(char ch)
fb_putc(ch);
}
int up_putc(int ch)
void up_putc(int ch)
{
up_lowputc(ch);
return ch;
}
#endif

View file

@ -2114,7 +2114,7 @@ void xtensa_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
uint32_t intena;
@ -2126,7 +2126,5 @@ int up_putc(int ch)
esp32_restoreuartint(CONSOLE_DEV.priv, intena);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -1119,7 +1119,7 @@ void xtensa_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
uint32_t int_status;
@ -1128,7 +1128,6 @@ int up_putc(int ch)
xtensa_lowputc(ch);
esp32s2_lowputc_restore_all_uart_int(CONSOLE_DEV.priv, &int_status);
#endif
return ch;
}
#else /* HAVE_UART_DEVICE */
@ -1155,9 +1154,8 @@ void xtensa_serialinit(void)
{
}
int up_putc(int ch)
void up_putc(int ch)
{
return ch;
}
#endif /* HAVE_UART_DEVICE */
@ -1173,14 +1171,13 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef HAVE_SERIAL_CONSOLE
uint32_t int_status;
xtensa_lowputc(ch);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -1210,7 +1210,7 @@ void xtensa_serialinit(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef CONSOLE_UART
uint32_t int_status;
@ -1223,7 +1223,6 @@ int up_putc(int ch)
#ifdef CONSOLE_UART
esp32s3_lowputc_restore_all_uart_int(CONSOLE_DEV.priv, &int_status);
#endif
return ch;
}
#endif /* HAVE_UART_DEVICE */
@ -1238,7 +1237,7 @@ int up_putc(int ch)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef CONSOLE_UART
uint32_t int_status;
@ -1251,7 +1250,6 @@ int up_putc(int ch)
#ifdef CONSOLE_UART
esp32s3_lowputc_restore_all_uart_int(CONSOLE_DEV.priv, &int_status);
#endif
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -742,7 +742,7 @@ void z16_serialinit(void)
****************************************************************************/
#ifdef CONSOLE_DEV
int up_putc(int ch)
void up_putc(int ch)
{
uint8_t state;
@ -765,7 +765,6 @@ int up_putc(int ch)
*/
z16f_restoreuartirq(&CONSOLE_DEV, state);
return ch;
}
#endif
@ -810,12 +809,11 @@ static void z16f_putc(int ch)
* Name: up_putc
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
/* Output character */
z16f_putc(ch);
return ch;
}
#endif /* USE_SERIALDRIVER */

View file

@ -733,7 +733,7 @@ void z80_serial_initialize(void)
*
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
#ifdef CONSOLE_DEV
FAR struct ez80_dev_s *priv = (FAR struct ez80_dev_s *)CONSOLE_DEV.priv;
@ -750,7 +750,6 @@ int up_putc(int ch)
ez80_waittxready(priv);
ez80_restoreuartint(priv, ier);
return ch;
#endif
}
@ -794,12 +793,11 @@ static void ez80_putc(int ch)
* Name: up_putc
****************************************************************************/
int up_putc(int ch)
void up_putc(int ch)
{
/* Output character */
ez80_putc(ch);
return ch;
}
#endif /* USE_SERIALDRIVER */

Some files were not shown because too many files have changed in this diff Show more