SYSLOG: Add an option to use the syslog'ing device as the system consolution. This option enables a low-level, write-only console device at /dev/console (similar to the low-level UART console device). From Pierre-noel Bouteville.

11 files changed, 105 insertions, 59 deletions

diff --git a/nuttx/arch/arm/src/common/up_initialize.c b/nuttx/arch/arm/src/common/up_initialize.c
index 69e1f2cf8..69227f516 100644
--- a/nuttx/arch/arm/src/common/up_initialize.c
+++ b/nuttx/arch/arm/src/common/up_initialize.c
@@ -44,6 +44,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/syslog/ramlog.h>
+#include <nuttx/syslog/syslog_console.h>
 
 #include <arch/board/board.h>
 
@@ -220,6 +221,8 @@ void up_initialize(void)
 
 #if defined(CONFIG_DEV_LOWCONSOLE)
   lowconsole_init();
+#elif defined(CONFIG_SYSLOG_CONSOLE)
+  syslog_console_init();
 #elif defined(CONFIG_RAMLOG_CONSOLE)
   ramlog_consoleinit();
 #endif
diff --git a/nuttx/arch/arm/src/efm32/efm32_config.h b/nuttx/arch/arm/src/efm32/efm32_config.h
index 8c377413e..b60c3a60e 100644
--- a/nuttx/arch/arm/src/efm32/efm32_config.h
+++ b/nuttx/arch/arm/src/efm32/efm32_config.h
@@ -127,73 +127,82 @@
 #undef HAVE_UART_CONSOLE
 #undef HAVE_LEUART_CONSOLE
 
-#if defined(CONFIG_USART0_SERIAL_CONSOLE) && defined(CONFIG_EFM32_USART0_ISUART)
+#if defined(CONFIG_SYSLOG_CONSOLE)
 #  undef CONFIG_USART1_SERIAL_CONSOLE
 #  undef CONFIG_USART2_SERIAL_CONSOLE
 #  undef CONFIG_UART0_SERIAL_CONSOLE
 #  undef CONFIG_UART1_SERIAL_CONSOLE
 #  undef CONFIG_LEUART0_SERIAL_CONSOLE
 #  undef CONFIG_LEUART1_SERIAL_CONSOLE
-#  define HAVE_UART_CONSOLE 1
-#elif defined(CONFIG_USART1_SERIAL_CONSOLE) && defined(CONFIG_EFM32_USART1_ISUART)
-#  undef CONFIG_USART0_SERIAL_CONSOLE
-#  undef CONFIG_USART2_SERIAL_CONSOLE
-#  undef CONFIG_UART0_SERIAL_CONSOLE
-#  undef CONFIG_UART1_SERIAL_CONSOLE
-#  undef CONFIG_LEUART0_SERIAL_CONSOLE
-#  undef CONFIG_LEUART1_SERIAL_CONSOLE
-#  define HAVE_UART_CONSOLE 1
-#elif defined(CONFIG_USART2_SERIAL_CONSOLE) && defined(CONFIG_EFM32_USART2_ISUART)
-#  undef CONFIG_USART0_SERIAL_CONSOLE
-#  undef CONFIG_USART1_SERIAL_CONSOLE
-#  undef CONFIG_UART0_SERIAL_CONSOLE
-#  undef CONFIG_UART1_SERIAL_CONSOLE
-#  undef CONFIG_LEUART0_SERIAL_CONSOLE
-#  undef CONFIG_LEUART1_SERIAL_CONSOLE
-#  define HAVE_UART_CONSOLE 1
-#elif defined(CONFIG_UART0_SERIAL_CONSOLE) && defined(CONFIG_EFM32_UART0)
-#  undef CONFIG_USART0_SERIAL_CONSOLE
-#  undef CONFIG_USART1_SERIAL_CONSOLE
-#  undef CONFIG_USART2_SERIAL_CONSOLE
-#  undef CONFIG_UART1_SERIAL_CONSOLE
-#  undef CONFIG_LEUART0_SERIAL_CONSOLE
-#  undef CONFIG_LEUART1_SERIAL_CONSOLE
-#  define HAVE_UART_CONSOLE 1
-#elif defined(CONFIG_UART1_SERIAL_CONSOLE) && defined(CONFIG_EFM32_UART1)
-#  undef CONFIG_USART0_SERIAL_CONSOLE
-#  undef CONFIG_USART1_SERIAL_CONSOLE
-#  undef CONFIG_USART2_SERIAL_CONSOLE
-#  undef CONFIG_UART0_SERIAL_CONSOLE
-#  undef CONFIG_LEUART0_SERIAL_CONSOLE
-#  undef CONFIG_LEUART1_SERIAL_CONSOLE
-#  define HAVE_UART_CONSOLE 1
-#elif defined(CONFIG_LEUART0_SERIAL_CONSOLE) && defined(CONFIG_EFM32_LEUART0)
-#  undef CONFIG_USART0_SERIAL_CONSOLE
-#  undef CONFIG_USART1_SERIAL_CONSOLE
-#  undef CONFIG_USART2_SERIAL_CONSOLE
-#  undef CONFIG_UART0_SERIAL_CONSOLE
-#  undef CONFIG_UART1_SERIAL_CONSOLE
-#  undef CONFIG_LEUART1_SERIAL_CONSOLE
-#  define HAVE_LEUART_CONSOLE 1
-#elif defined(CONFIG_LEUART1_SERIAL_CONSOLE) && defined(CONFIG_EFM32_LEUART1)
-#  undef CONFIG_USART0_SERIAL_CONSOLE
-#  undef CONFIG_USART1_SERIAL_CONSOLE
-#  undef CONFIG_USART2_SERIAL_CONSOLE
-#  undef CONFIG_UART0_SERIAL_CONSOLE
-#  undef CONFIG_UART1_SERIAL_CONSOLE
-#  undef CONFIG_LEUART0_SERIAL_CONSOLE
-#  define HAVE_LEUART_CONSOLE 1
 #else
-#  ifdef CONFIG_DEV_CONSOLE
-#    warning "No valid CONFIG_U[S]ART[n]_SERIAL_CONSOLE Setting"
+#  if defined(CONFIG_USART0_SERIAL_CONSOLE) && defined(CONFIG_EFM32_USART0_ISUART)
+#    undef CONFIG_USART1_SERIAL_CONSOLE
+#    undef CONFIG_USART2_SERIAL_CONSOLE
+#    undef CONFIG_UART0_SERIAL_CONSOLE
+#    undef CONFIG_UART1_SERIAL_CONSOLE
+#    undef CONFIG_LEUART0_SERIAL_CONSOLE
+#    undef CONFIG_LEUART1_SERIAL_CONSOLE
+#    define HAVE_UART_CONSOLE 1
+#  elif defined(CONFIG_USART1_SERIAL_CONSOLE) && defined(CONFIG_EFM32_USART1_ISUART)
+#    undef CONFIG_USART0_SERIAL_CONSOLE
+#    undef CONFIG_USART2_SERIAL_CONSOLE
+#    undef CONFIG_UART0_SERIAL_CONSOLE
+#    undef CONFIG_UART1_SERIAL_CONSOLE
+#    undef CONFIG_LEUART0_SERIAL_CONSOLE
+#    undef CONFIG_LEUART1_SERIAL_CONSOLE
+#    define HAVE_UART_CONSOLE 1
+#  elif defined(CONFIG_USART2_SERIAL_CONSOLE) && defined(CONFIG_EFM32_USART2_ISUART)
+#    undef CONFIG_USART0_SERIAL_CONSOLE
+#    undef CONFIG_USART1_SERIAL_CONSOLE
+#    undef CONFIG_UART0_SERIAL_CONSOLE
+#    undef CONFIG_UART1_SERIAL_CONSOLE
+#    undef CONFIG_LEUART0_SERIAL_CONSOLE
+#    undef CONFIG_LEUART1_SERIAL_CONSOLE
+#    define HAVE_UART_CONSOLE 1
+#  elif defined(CONFIG_UART0_SERIAL_CONSOLE) && defined(CONFIG_EFM32_UART0)
+#    undef CONFIG_USART0_SERIAL_CONSOLE
+#    undef CONFIG_USART1_SERIAL_CONSOLE
+#    undef CONFIG_USART2_SERIAL_CONSOLE
+#    undef CONFIG_UART1_SERIAL_CONSOLE
+#    undef CONFIG_LEUART0_SERIAL_CONSOLE
+#    undef CONFIG_LEUART1_SERIAL_CONSOLE
+#    define HAVE_UART_CONSOLE 1
+#  elif defined(CONFIG_UART1_SERIAL_CONSOLE) && defined(CONFIG_EFM32_UART1)
+#    undef CONFIG_USART0_SERIAL_CONSOLE
+#    undef CONFIG_USART1_SERIAL_CONSOLE
+#    undef CONFIG_USART2_SERIAL_CONSOLE
+#    undef CONFIG_UART0_SERIAL_CONSOLE
+#    undef CONFIG_LEUART0_SERIAL_CONSOLE
+#    undef CONFIG_LEUART1_SERIAL_CONSOLE
+#    define HAVE_UART_CONSOLE 1
+#  elif defined(CONFIG_LEUART0_SERIAL_CONSOLE) && defined(CONFIG_EFM32_LEUART0)
+#    undef CONFIG_USART0_SERIAL_CONSOLE
+#    undef CONFIG_USART1_SERIAL_CONSOLE
+#    undef CONFIG_USART2_SERIAL_CONSOLE
+#    undef CONFIG_UART0_SERIAL_CONSOLE
+#    undef CONFIG_UART1_SERIAL_CONSOLE
+#    undef CONFIG_LEUART1_SERIAL_CONSOLE
+#    define HAVE_LEUART_CONSOLE 1
+#  elif defined(CONFIG_LEUART1_SERIAL_CONSOLE) && defined(CONFIG_EFM32_LEUART1)
+#    undef CONFIG_USART0_SERIAL_CONSOLE
+#    undef CONFIG_USART1_SERIAL_CONSOLE
+#    undef CONFIG_USART2_SERIAL_CONSOLE
+#    undef CONFIG_UART0_SERIAL_CONSOLE
+#    undef CONFIG_UART1_SERIAL_CONSOLE
+#    undef CONFIG_LEUART0_SERIAL_CONSOLE
+#    define HAVE_LEUART_CONSOLE 1
+#  else
+#    ifdef CONFIG_DEV_CONSOLE
+#      warning "No valid CONFIG_U[S]ART[n]_SERIAL_CONSOLE Setting"
+#    endif
+#    undef CONFIG_USART0_SERIAL_CONSOLE
+#    undef CONFIG_USART1_SERIAL_CONSOLE
+#    undef CONFIG_USART2_SERIAL_CONSOLE
+#    undef CONFIG_UART0_SERIAL_CONSOLE
+#    undef CONFIG_UART1_SERIAL_CONSOLE
+#    undef CONFIG_LEUART0_SERIAL_CONSOLE
+#    undef CONFIG_LEUART1_SERIAL_CONSOLE
 #  endif
-#  undef CONFIG_USART0_SERIAL_CONSOLE
-#  undef CONFIG_USART1_SERIAL_CONSOLE
-#  undef CONFIG_USART2_SERIAL_CONSOLE
-#  undef CONFIG_UART0_SERIAL_CONSOLE
-#  undef CONFIG_UART1_SERIAL_CONSOLE
-#  undef CONFIG_LEUART0_SERIAL_CONSOLE
-#  undef CONFIG_LEUART1_SERIAL_CONSOLE
 #endif
 
 /****************************************************************************
diff --git a/nuttx/arch/avr/src/common/up_initialize.c b/nuttx/arch/avr/src/common/up_initialize.c
index 991e0a084..be2724042 100644
--- a/nuttx/arch/avr/src/common/up_initialize.c
+++ b/nuttx/arch/avr/src/common/up_initialize.c
@@ -44,6 +44,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/syslog/ramlog.h>
+#include <nuttx/syslog/syslog_console.h>
 
 #include <arch/board/board.h>
 
@@ -246,6 +247,8 @@ void up_initialize(void)
 
 #if defined(CONFIG_DEV_LOWCONSOLE)
   lowconsole_init();
+#elif defined(CONFIG_SYSLOG_CONSOLE)
+  syslog_console_init();
 #elif defined(CONFIG_RAMLOG_CONSOLE)
   ramlog_consoleinit();
 #endif
diff --git a/nuttx/arch/hc/src/common/up_initialize.c b/nuttx/arch/hc/src/common/up_initialize.c
index c3af48206..9651c8d18 100644
--- a/nuttx/arch/hc/src/common/up_initialize.c
+++ b/nuttx/arch/hc/src/common/up_initialize.c
@@ -44,6 +44,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/syslog/ramlog.h>
+#include <nuttx/syslog/syslog_console.h>
 
 #include "up_arch.h"
 #include "up_internal.h"
@@ -169,6 +170,8 @@ void up_initialize(void)
 
 #if defined(CONFIG_DEV_LOWCONSOLE)
   lowconsole_init();
+#elif defined(CONFIG_SYSLOG_CONSOLE)
+  syslog_console_init();
 #elif defined(CONFIG_RAMLOG_CONSOLE)
   ramlog_consoleinit();
 #endif
diff --git a/nuttx/arch/mips/src/common/up_initialize.c b/nuttx/arch/mips/src/common/up_initialize.c
index fa43efffd..cc97fdc31 100644
--- a/nuttx/arch/mips/src/common/up_initialize.c
+++ b/nuttx/arch/mips/src/common/up_initialize.c
@@ -44,6 +44,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/syslog/ramlog.h>
+#include <nuttx/syslog/syslog_console.h>
 
 #include <arch/board/board.h>
 
@@ -171,6 +172,8 @@ void up_initialize(void)
 
 #if defined(CONFIG_DEV_LOWCONSOLE)
   lowconsole_init();
+#elif defined(CONFIG_SYSLOG_CONSOLE)
+  syslog_console_init();
 #elif defined(CONFIG_RAMLOG_CONSOLE)
   ramlog_consoleinit();
 #endif
diff --git a/nuttx/arch/sh/src/common/up_initialize.c b/nuttx/arch/sh/src/common/up_initialize.c
index 2c91f6f30..b1efe0dac 100644
--- a/nuttx/arch/sh/src/common/up_initialize.c
+++ b/nuttx/arch/sh/src/common/up_initialize.c
@@ -44,6 +44,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/syslog/ramlog.h>
+#include <nuttx/syslog/syslog_console.h>
 
 #include "up_arch.h"
 #include "up_internal.h"
@@ -159,6 +160,8 @@ void up_initialize(void)
 
 #if defined(CONFIG_DEV_LOWCONSOLE)
   lowconsole_init();
+#elif defined(CONFIG_SYSLOG_CONSOLE)
+  syslog_console_init();
 #elif defined(CONFIG_RAMLOG_CONSOLE)
   ramlog_consoleinit();
 #endif
diff --git a/nuttx/arch/sim/src/up_initialize.c b/nuttx/arch/sim/src/up_initialize.c
index 82eb32d1c..d61e84aa2 100644
--- a/nuttx/arch/sim/src/up_initialize.c
+++ b/nuttx/arch/sim/src/up_initialize.c
@@ -46,6 +46,7 @@
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/mtd/mtd.h>
 #include <nuttx/syslog/ramlog.h>
+#include <nuttx/syslog/syslog_console.h>
 
 #include "up_internal.h"
 
@@ -143,6 +144,8 @@ void up_initialize(void)
   /* Register a console (or not) */
 
   up_devconsole();          /* Our private /dev/console */
+#elif defined(CONFIG_SYSLOG_CONSOLE)
+  syslog_console_init();
 #elif defined(CONFIG_RAMLOG_CONSOLE)
   ramlog_consoleinit();
 #endif
diff --git a/nuttx/arch/x86/src/common/up_initialize.c b/nuttx/arch/x86/src/common/up_initialize.c
index 5a90b41ba..9e6dc4820 100644
--- a/nuttx/arch/x86/src/common/up_initialize.c
+++ b/nuttx/arch/x86/src/common/up_initialize.c
@@ -44,6 +44,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/syslog/ramlog.h>
+#include <nuttx/syslog/syslog_console.h>
 
 #include <arch/board/board.h>
 
@@ -171,6 +172,8 @@ void up_initialize(void)
 
 #if defined(CONFIG_DEV_LOWCONSOLE)
   lowconsole_init();
+#elif defined(CONFIG_SYSLOG_CONSOLE)
+  syslog_console_init();
 #elif defined(CONFIG_RAMLOG_CONSOLE)
   ramlog_consoleinit();
 #endif
diff --git a/nuttx/arch/z16/src/common/up_initialize.c b/nuttx/arch/z16/src/common/up_initialize.c
index 3307386b0..d40c7e317 100644
--- a/nuttx/arch/z16/src/common/up_initialize.c
+++ b/nuttx/arch/z16/src/common/up_initialize.c
@@ -44,6 +44,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/syslog/ramlog.h>
+#include <nuttx/syslog/syslog_console.h>
 
 #include <arch/board/board.h>
 
@@ -175,6 +176,8 @@ void up_initialize(void)
 
 #if defined(CONFIG_DEV_LOWCONSOLE)
   lowconsole_init();
+#elif defined(CONFIG_SYSLOG_CONSOLE)
+  syslog_console_init();
 #elif defined(CONFIG_RAMLOG_CONSOLE)
   ramlog_consoleinit();
 #endif
diff --git a/nuttx/arch/z80/src/common/up_initialize.c b/nuttx/arch/z80/src/common/up_initialize.c
index df66b9fd4..adf888053 100644
--- a/nuttx/arch/z80/src/common/up_initialize.c
+++ b/nuttx/arch/z80/src/common/up_initialize.c
@@ -168,6 +168,8 @@ void up_initialize(void)
 
 #if defined(CONFIG_DEV_LOWCONSOLE)
   lowconsole_init();
+#elif defined(CONFIG_SYSLOG_CONSOLE)
+  syslog_console_init();
 #elif defined(CONFIG_RAMLOG_CONSOLE)
   ramlog_consoleinit();
 #endif
diff --git a/nuttx/arch/z80/src/common/up_internal.h b/nuttx/arch/z80/src/common/up_internal.h
index 0caf4d69a..6327b7319 100644
--- a/nuttx/arch/z80/src/common/up_internal.h
+++ b/nuttx/arch/z80/src/common/up_internal.h
@@ -88,6 +88,9 @@
 #  if defined(CONFIG_RAMLOG_CONSOLE)
 #    undef  USE_SERIALDRIVER
 #    undef  CONFIG_DEV_LOWCONSOLE
+#  elif defined(CONFIG_SYSLOG_CONSOLE)
+#    undef  USE_SERIALDRIVER
+#    undef  CONFIG_DEV_LOWCONSOLE
 #  elif defined(CONFIG_DEV_LOWCONSOLE)
 #    undef  USE_SERIALDRIVER
 #  else
@@ -168,6 +171,14 @@ void lowconsole_init(void);
 # define lowconsole_init()
 #endif
 
+/* Defined in drivers/syslog_console.c */
+
+#ifdef defined(CONFIG_SYSLOG_CONSOLE)
+  syslog_console_init();
+#else
+# define syslog_console_init()
+#endif
+
 /* Defined in drivers/ramlog.c */
 
 #ifdef CONFIG_RAMLOG_CONSOLE