Fix LOWCONSOLE confusion
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@707 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
parent
295a7a1fd5
commit
28366b75d0
@ -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
|
||||
|
||||
|
@ -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()
|
||||
|
@ -58,12 +58,6 @@
|
||||
#include "os_internal.h"
|
||||
#include "up_internal.h"
|
||||
|
||||
/* 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)
|
||||
/****************************************************************************
|
||||
|
@ -54,12 +54,6 @@
|
||||
#include "os_internal.h"
|
||||
#include "up_internal.h"
|
||||
|
||||
/* 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)
|
||||
/****************************************************************************
|
||||
|
Loading…
Reference in New Issue
Block a user