mirror of
https://github.com/apache/nuttx.git
synced 2026-09-10 02:46:33 +00:00
arch: use ifdef USE_EARLYSERIALINIT to include up_earlyserialinit
There are cases that USE_SERIALDRIVER is defined but USE_EARLYSERIALINIT not defined in some configs. So use ifdef USE_EARLYSERIALINIT to include up_earlyserialinit anyway.
This commit is contained in:
parent
ebdfc93ee3
commit
c5eab0dc8f
25 changed files with 84 additions and 9 deletions
|
|
@ -1433,8 +1433,10 @@ static bool up_txempty(struct uart_dev_s *dev)
|
|||
* Public Funtions
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef USE_EARLYSERIALINIT
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
* Name: up_earlyserialinit
|
||||
*
|
||||
* Description:
|
||||
* Performs the low level UART initialization early in debug so that the
|
||||
|
|
@ -1514,6 +1516,7 @@ void up_earlyserialinit(void)
|
|||
up_setup(&CONSOLE_DEV);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
|
|
|
|||
|
|
@ -1266,8 +1266,10 @@ static bool up_txempty(struct uart_dev_s *dev)
|
|||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef USE_EARLYSERIALINIT
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
* Name: up_earlyserialinit
|
||||
*
|
||||
* Description:
|
||||
* Performs the low level UART initialization early in debug so that the
|
||||
|
|
@ -1333,6 +1335,7 @@ void up_earlyserialinit(void)
|
|||
up_setup(&CONSOLE_DEV);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
|
|
|
|||
|
|
@ -792,6 +792,8 @@ static bool up_txempty(struct uart_dev_s *dev)
|
|||
* Public Funtions
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef USE_EARLYSERIALINIT
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
*
|
||||
|
|
@ -810,6 +812,7 @@ void up_earlyserialinit(void)
|
|||
CONSOLE_DEV.isconsole = true;
|
||||
up_setup(&CONSOLE_DEV);
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
|
|
|
|||
|
|
@ -706,8 +706,10 @@ static bool up_txempty(struct uart_dev_s *dev)
|
|||
* Public Funtions
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef USE_EARLYSERIALINIT
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
* Name: up_earlyserialinit
|
||||
*
|
||||
* Description:
|
||||
* Performs the low level UART initialization early in
|
||||
|
|
@ -724,6 +726,7 @@ void up_earlyserialinit(void)
|
|||
CONSOLE_DEV.isconsole = true;
|
||||
up_setup(&CONSOLE_DEV);
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
|
|
|
|||
|
|
@ -748,6 +748,8 @@ static bool efm32_txempty(struct uart_dev_s *dev)
|
|||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef USE_EARLYSERIALINIT
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_earlyserialinit
|
||||
*
|
||||
|
|
@ -778,6 +780,7 @@ void up_earlyserialinit(void)
|
|||
efm32_setup(&CONSOLE_DEV);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
|
|
|
|||
|
|
@ -1060,8 +1060,10 @@ static bool up_txempty(struct uart_dev_s *dev)
|
|||
* Public Funtions
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef USE_EARLYSERIALINIT
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
* Name: up_earlyserialinit
|
||||
*
|
||||
* Description:
|
||||
* Performs the low level UART initialization early in
|
||||
|
|
@ -1127,6 +1129,7 @@ void up_earlyserialinit(void)
|
|||
up_setup(&CONSOLE_DEV);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
|
|
|
|||
|
|
@ -794,6 +794,8 @@ static bool up_txready(struct uart_dev_s *dev)
|
|||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef USE_EARLYSERIALINIT
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_earlyserialinit
|
||||
*
|
||||
|
|
@ -836,6 +838,7 @@ void up_earlyserialinit(void)
|
|||
up_setup(&CONSOLE_DEV);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
|
|
|
|||
|
|
@ -1250,8 +1250,10 @@ retry:
|
|||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef USE_EARLYSERIALINIT
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
* Name: up_earlyserialinit
|
||||
*
|
||||
* Description:
|
||||
* Performs the low level UART initialization early in
|
||||
|
|
@ -1296,6 +1298,7 @@ void up_earlyserialinit(void)
|
|||
CONSOLE_DEV.isconsole = true;
|
||||
up_setup(&CONSOLE_DEV);
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
|
|
|
|||
|
|
@ -731,8 +731,10 @@ static bool up_txempty(struct uart_dev_s *dev)
|
|||
* Public Funtions
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef USE_EARLYSERIALINIT
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
* Name: up_earlyserialinit
|
||||
*
|
||||
* Description:
|
||||
* Performs the low level UART initialization early in
|
||||
|
|
@ -760,6 +762,7 @@ void up_earlyserialinit(void)
|
|||
CONSOLE_DEV.isconsole = true;
|
||||
up_setup(&CONSOLE_DEV);
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
|
|
|
|||
|
|
@ -845,8 +845,10 @@ static bool up_txempty(struct uart_dev_s *dev)
|
|||
* Public Funtions
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef USE_EARLYSERIALINIT
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
* Name: up_earlyserialinit
|
||||
*
|
||||
* Description:
|
||||
* Performs the low level UART initialization early in
|
||||
|
|
@ -881,6 +883,7 @@ void up_earlyserialinit(void)
|
|||
CONSOLE_DEV.isconsole = true;
|
||||
up_setup(&CONSOLE_DEV);
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
|
|
|
|||
|
|
@ -750,6 +750,8 @@ static bool up_txempty(struct uart_dev_s *dev)
|
|||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef USE_EARLYSERIALINIT
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_earlyserialinit
|
||||
*
|
||||
|
|
@ -778,6 +780,7 @@ void up_earlyserialinit(void)
|
|||
up_setup(&g_uartport);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
|
|
|
|||
|
|
@ -997,8 +997,10 @@ static bool up_txempty(struct uart_dev_s *dev)
|
|||
* Public Funtions
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef USE_EARLYSERIALINIT
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
* Name: up_earlyserialinit
|
||||
*
|
||||
* Description:
|
||||
* Performs the low level UART initialization early in debug so that the
|
||||
|
|
@ -1019,6 +1021,7 @@ void up_earlyserialinit(void)
|
|||
up_setup(&CONSOLE_DEV);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
|
|
|
|||
|
|
@ -955,6 +955,8 @@ static bool sam_txempty(struct uart_dev_s *dev)
|
|||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef USE_EARLYSERIALINIT
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_earlyserialinit
|
||||
*
|
||||
|
|
@ -996,6 +998,7 @@ void up_earlyserialinit(void)
|
|||
CONSOLE_DEV.isconsole = true;
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
|
|
|
|||
|
|
@ -1004,6 +1004,8 @@ static bool sam_txempty(struct uart_dev_s *dev)
|
|||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef USE_EARLYSERIALINIT
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_earlyserialinit
|
||||
*
|
||||
|
|
@ -1051,6 +1053,7 @@ void up_earlyserialinit(void)
|
|||
CONSOLE_DEV.isconsole = true;
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
|
|
|
|||
|
|
@ -879,8 +879,10 @@ static bool up_txempty(struct uart_dev_s *dev)
|
|||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef USE_EARLYSERIALINIT
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
* Name: up_earlyserialinit
|
||||
*
|
||||
* Description:
|
||||
* Performs the low level UART initialization early in
|
||||
|
|
@ -915,6 +917,7 @@ void up_earlyserialinit(void)
|
|||
up_setup(&CONSOLE_DEV);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
|
|
|
|||
|
|
@ -695,6 +695,8 @@ static bool up_txready(struct uart_dev_s *dev)
|
|||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef USE_EARLYSERIALINIT
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_earlyserialinit
|
||||
*
|
||||
|
|
@ -726,6 +728,7 @@ void up_earlyserialinit(void)
|
|||
up_setup(&CONSOLE_DEV);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
|
|
|
|||
|
|
@ -513,6 +513,8 @@ static bool usart1_txempty(struct uart_dev_s *dev)
|
|||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef USE_EARLYSERIALINIT
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_earlyserialinit
|
||||
*
|
||||
|
|
@ -536,6 +538,7 @@ void up_earlyserialinit(void)
|
|||
usart1_setup(&g_usart1port);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
|
|
|
|||
|
|
@ -887,6 +887,8 @@ static bool usart1_txempty(struct uart_dev_s *dev)
|
|||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef USE_EARLYSERIALINIT
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_earlyserialinit
|
||||
*
|
||||
|
|
@ -919,6 +921,7 @@ void up_earlyserialinit(void)
|
|||
# endif
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
|
|
|
|||
|
|
@ -822,6 +822,8 @@ static bool up_txempty(struct uart_dev_s *dev)
|
|||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef USE_EARLYSERIALINIT
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_earlyserialinit
|
||||
*
|
||||
|
|
@ -852,6 +854,7 @@ void up_earlyserialinit(void)
|
|||
up_setup(&CONSOLE_DEV);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
|
|
|
|||
|
|
@ -1073,6 +1073,8 @@ static bool up_txempty(struct uart_dev_s *dev)
|
|||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef USE_EARLYSERIALINIT
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_earlyserialinit
|
||||
*
|
||||
|
|
@ -1118,6 +1120,7 @@ void up_earlyserialinit(void)
|
|||
up_setup(&CONSOLE_DEV);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
|
|
|
|||
|
|
@ -601,6 +601,8 @@ static bool up_txempty(struct uart_dev_s *dev)
|
|||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef USE_EARLYSERIALINIT
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_earlyserialinit
|
||||
*
|
||||
|
|
@ -631,6 +633,7 @@ void up_earlyserialinit(void)
|
|||
up_setup(&CONSOLE_DEV);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
|
|
|
|||
|
|
@ -588,6 +588,8 @@ static bool up_txempty(struct uart_dev_s *dev)
|
|||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef USE_EARLYSERIALINIT
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_earlyserialinit
|
||||
*
|
||||
|
|
@ -609,6 +611,7 @@ void up_earlyserialinit(void)
|
|||
up_setup(&g_uart0port);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
|
|
|
|||
|
|
@ -601,6 +601,8 @@ static bool up_txempty(struct uart_dev_s *dev)
|
|||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef USE_EARLYSERIALINIT
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_earlyserialinit
|
||||
*
|
||||
|
|
@ -631,6 +633,7 @@ void up_earlyserialinit(void)
|
|||
up_setup(&CONSOLE_DEV);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
|
|
|
|||
|
|
@ -727,6 +727,8 @@ static bool up_txempty(struct uart_dev_s *dev)
|
|||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef USE_EARLYSERIALINIT
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_earlyserialinit
|
||||
*
|
||||
|
|
@ -757,6 +759,7 @@ void up_earlyserialinit(void)
|
|||
up_setup(&CONSOLE_DEV);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
|
|
|
|||
|
|
@ -688,6 +688,8 @@ static bool z16f_txempty(struct uart_dev_s *dev)
|
|||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef USE_EARLYSERIALINIT
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_earlyserialinit
|
||||
*
|
||||
|
|
@ -747,6 +749,7 @@ void up_earlyserialinit(void)
|
|||
z16f_setup(&CONSOLE_DEV);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue