From 33917a617e444c703194e37b5b2c86f31843b34f Mon Sep 17 00:00:00 2001 From: patacongo Date: Mon, 18 Feb 2008 17:29:53 +0000 Subject: [PATCH] Fix LOWCONSOLE confusion git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@707 42af7a65-404d-4744-a932-0658087f49c3 --- arch/z80/src/common/up_initialize.c | 4 +--- arch/z80/src/common/up_internal.h | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/up_initialize.c index a572919b02..583359e4e1 100644 --- a/arch/z80/src/common/up_initialize.c +++ b/arch/z80/src/common/up_initialize.c @@ -156,9 +156,7 @@ void up_initialize(void) #ifdef CONFIG_USE_SERIALDRIVER up_serialinit(); -#endif - -#ifdef CONFIG_USE_LOWCONSOLE +#elif defined(CONFIG_DEV_LOWCONSOLE) lowconsole_init(); #endif diff --git a/arch/z80/src/common/up_internal.h b/arch/z80/src/common/up_internal.h index cc8c1593db..b16a10cd61 100644 --- a/arch/z80/src/common/up_internal.h +++ b/arch/z80/src/common/up_internal.h @@ -66,7 +66,6 @@ /* Determine which (if any) console driver to use */ #if CONFIG_NFILE_DESCRIPTORS == 0 || defined(CONFIG_DEV_LOWCONSOLE) -# define CONFIG_USE_LOWCONSOLE 1 # define CONFIG_USE_LOWUARTINIT 1 #elif defined(CONFIG_DEV_CONSOLE) && CONFIG_NFILE_DESCRIPTORS > 0 # define CONFIG_USE_SERIALDRIVER 1 @@ -124,7 +123,7 @@ EXTERN void up_serialinit(void); # define up_serialinit() #endif -#ifdef CONFIG_USE_LOWCONSOLE +#ifdef CONFIG_DEV_LOWCONSOLE EXTERN void lowconsole_init(void); #else # define lowconsole_init()