sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update for changes to common/up_internal.h

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1161 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2008-11-07 20:53:46 +00:00
parent f053a30e05
commit aec4241258
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configs/xtrs/src/xtr_serial.c
View File

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

11
configs/z80sim/src/z80_serial.c
View File

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