summaryrefslogtreecommitdiff
path: root/nuttx/configs/z80sim/src
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2008-11-07 20:53:46 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2008-11-07 20:53:46 +0000
commit6e9d974ba6298018ff8bcd216faf549a3c03e510 (patch)
treea4fe3bb3ff706e6c05a3c11d1a8cf546ebc75db3 /nuttx/configs/z80sim/src
parentd61b10e1e7332506d461a20cd16f79655b591125 (diff)
downloadpx4-nuttx-6e9d974ba6298018ff8bcd216faf549a3c03e510.tar.gz
px4-nuttx-6e9d974ba6298018ff8bcd216faf549a3c03e510.tar.bz2
px4-nuttx-6e9d974ba6298018ff8bcd216faf549a3c03e510.zip
Update for changes to common/up_internal.h
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1161 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/z80sim/src')
-rw-r--r--nuttx/configs/z80sim/src/z80_serial.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/nuttx/configs/z80sim/src/z80_serial.c b/nuttx/configs/z80sim/src/z80_serial.c
index 242db137f..803ff6fb9 100644
--- a/nuttx/configs/z80sim/src/z80_serial.c
+++ b/nuttx/configs/z80sim/src/z80_serial.c
@@ -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