diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-02-07 01:39:20 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-02-07 01:39:20 +0000 |
| commit | 89d104ff444f62ec460db9014ba6e969cc8a5609 (patch) | |
| tree | de4fd61a64c67c41ac9837010fc50b2b0de63a1e /nuttx/configs/z80sim/src | |
| parent | 03a8eb5e790404db8e35997d14ec888c1585e166 (diff) | |
| download | px4-nuttx-89d104ff444f62ec460db9014ba6e969cc8a5609.tar.gz px4-nuttx-89d104ff444f62ec460db9014ba6e969cc8a5609.tar.bz2 px4-nuttx-89d104ff444f62ec460db9014ba6e969cc8a5609.zip | |
Move configurations to sub-directories
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@651 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/z80sim/src')
| -rw-r--r-- | nuttx/configs/z80sim/src/z80_serial.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/nuttx/configs/z80sim/src/z80_serial.c b/nuttx/configs/z80sim/src/z80_serial.c index 666af0ccd..8bc1b02b4 100644 --- a/nuttx/configs/z80sim/src/z80_serial.c +++ b/nuttx/configs/z80sim/src/z80_serial.c @@ -54,8 +54,14 @@ #include "os_internal.h" #include "up_internal.h" -#if CONFIG_NFILE_DESCRIPTORS > 0 +/* Defined in drivers/dev_lowconsole.c */ + +#ifdef CONFIG_USE_LOWCONSOLE +extern void lowconsole_init(void); +#endif +#if CONFIG_NFILE_DESCRIPTORS > 0 +#if defined(CONFIG_DEV_CONSOLE) && !defined(CONFIG_DEV_LOWCONSOLE) /**************************************************************************** * Definitions ****************************************************************************/ @@ -325,6 +331,7 @@ static boolean up_txempty(struct uart_dev_s *dev) void up_earlyserialinit(void) { } +#endif /* CONFIG_DEV_CONSOLE && !CONFIG_DEV_LOWCONSOLE */ /**************************************************************************** * Name: up_serialinit @@ -337,10 +344,14 @@ void up_earlyserialinit(void) void up_serialinit(void) { +#if defined(CONFIG_DEV_LOWCONSOLE) + (void)lowconsole_init(); +#elif defiened(CONFIG_DEV_CONSOLE) (void)uart_register("/dev/console", &g_uartport); (void)uart_register("/dev/ttyS0", &g_uartport); +#endif } -#endif /* CONFIG_NFILE_DESCRIPTORS > 0 */ +#endif /* CONFIG_NFILE_DESCRIPTORS */ /**************************************************************************** * Name: up_putc |