9
0
Fork 0

Update for changes to common/up_internal.h

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@1161 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo 2008-11-07 20:53:46 +00:00
parent e3ec92e45f
commit 920235c227
2 changed files with 6 additions and 16 deletions

View File

@ -58,8 +58,8 @@
#include "os_internal.h"
#include "up_internal.h"
#if CONFIG_NFILE_DESCRIPTORS > 0
#if defined(CONFIG_DEV_CONSOLE) && !defined(CONFIG_DEV_LOWCONSOLE)
#ifdef CONFIG_USE_SERIAL_DRIVER
/****************************************************************************
* Definitions
****************************************************************************/
@ -376,7 +376,6 @@ static boolean up_txempty(struct uart_dev_s *dev)
void up_earlyserialinit(void)
{
}
#endif /* CONFIG_DEV_CONSOLE && !CONFIG_DEV_LOWCONSOLE */
/****************************************************************************
* Name: up_serialinit
@ -389,14 +388,10 @@ void up_earlyserialinit(void)
void up_serialinit(void)
{
#if defined(CONFIG_DEV_LOWCONSOLE)
(void)lowconsole_init();
#elif defined(CONFIG_DEV_CONSOLE)
(void)uart_register("/dev/console", &g_uartport);
(void)uart_register("/dev/ttyS0", &g_uartport);
#endif
}
#endif /* CONFIG_NFILE_DESCRIPTORS */
#endif /* CONFIG_USE_SERIALDRIVER */
/****************************************************************************
* Name: up_putc

View File

@ -54,8 +54,8 @@
#include "os_internal.h"
#include "up_internal.h"
#if CONFIG_NFILE_DESCRIPTORS > 0
#if defined(CONFIG_DEV_CONSOLE) && !defined(CONFIG_DEV_LOWCONSOLE)
#ifdef CONFIG_USE_SERIALDRIVER
/****************************************************************************
* Definitions
****************************************************************************/
@ -325,7 +325,6 @@ static boolean up_txempty(struct uart_dev_s *dev)
void up_earlyserialinit(void)
{
}
#endif /* CONFIG_DEV_CONSOLE && !CONFIG_DEV_LOWCONSOLE */
/****************************************************************************
* Name: up_serialinit
@ -338,14 +337,10 @@ void up_earlyserialinit(void)
void up_serialinit(void)
{
#if defined(CONFIG_DEV_LOWCONSOLE)
(void)lowconsole_init();
#elif defined(CONFIG_DEV_CONSOLE)
(void)uart_register("/dev/console", &g_uartport);
(void)uart_register("/dev/ttyS0", &g_uartport);
#endif
}
#endif /* CONFIG_NFILE_DESCRIPTORS */
#endif /* CONFIG_USE_SERIALDRIVER */
/****************************************************************************
* Name: up_putc