summaryrefslogtreecommitdiff
path: root/nuttx/arch/x86
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-08-02 00:42:46 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-08-02 00:42:46 +0000
commit9bc6eb085a6a91f0e6fbd74ad98c3b1d32df0bc4 (patch)
treef5f5fb874369d5379c1bdd728e0789c499e7ce81 /nuttx/arch/x86
parent2dfc5da16f3e3abc4b36413e8205e3dcd4df7928 (diff)
downloadpx4-nuttx-9bc6eb085a6a91f0e6fbd74ad98c3b1d32df0bc4.tar.gz
px4-nuttx-9bc6eb085a6a91f0e6fbd74ad98c3b1d32df0bc4.tar.bz2
px4-nuttx-9bc6eb085a6a91f0e6fbd74ad98c3b1d32df0bc4.zip
Move RAMLOG driver to drivers/syslog; Add ability to output debug information to any character device or file
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4996 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/x86')
-rw-r--r--nuttx/arch/x86/src/common/up_initialize.c5
-rw-r--r--nuttx/arch/x86/src/common/up_internal.h1
2 files changed, 5 insertions, 1 deletions
diff --git a/nuttx/arch/x86/src/common/up_initialize.c b/nuttx/arch/x86/src/common/up_initialize.c
index f58fd00a6..49238556d 100644
--- a/nuttx/arch/x86/src/common/up_initialize.c
+++ b/nuttx/arch/x86/src/common/up_initialize.c
@@ -163,11 +163,14 @@ void up_initialize(void)
/* Initialize the system logging device */
+#ifdef CONFIG_SYSLOG_CHAR
+ syslog_initialize();
+#endif
#ifdef CONFIG_RAMLOG_SYSLOG
ramlog_sysloginit();
#endif
- /* Initialize the netwok */
+ /* Initialize the network */
up_netinitialize();
diff --git a/nuttx/arch/x86/src/common/up_internal.h b/nuttx/arch/x86/src/common/up_internal.h
index f6aa649a5..22956ecb3 100644
--- a/nuttx/arch/x86/src/common/up_internal.h
+++ b/nuttx/arch/x86/src/common/up_internal.h
@@ -83,6 +83,7 @@
/* Determine which device to use as the system logging device */
#ifndef CONFIG_SYSLOG
+# undef CONFIG_SYSLOG_CHAR
# undef CONFIG_RAMLOG_SYSLOG
#endif