diff --git a/arch/arm/src/common/up_initialize.c b/arch/arm/src/common/up_initialize.c index f926b7f0381..a37fc33e7f0 100644 --- a/arch/arm/src/common/up_initialize.c +++ b/arch/arm/src/common/up_initialize.c @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include @@ -248,12 +248,7 @@ void up_initialize(void) /* Initialize the system logging device */ -#ifdef CONFIG_SYSLOG_CHAR syslog_initialize(); -#endif -#ifdef CONFIG_RAMLOG_SYSLOG - ramlog_sysloginit(); -#endif #ifndef CONFIG_NETDEV_LATEINIT /* Initialize the network */ diff --git a/arch/avr/src/common/up_initialize.c b/arch/avr/src/common/up_initialize.c index b79f95876cb..6e26835f296 100644 --- a/arch/avr/src/common/up_initialize.c +++ b/arch/avr/src/common/up_initialize.c @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include @@ -267,12 +267,7 @@ void up_initialize(void) /* Initialize the system logging device */ -#ifdef CONFIG_SYSLOG_CHAR syslog_initialize(); -#endif -#ifdef CONFIG_RAMLOG_SYSLOG - ramlog_sysloginit(); -#endif #ifndef CONFIG_NETDEV_LATEINIT /* Initialize the network */ diff --git a/arch/hc/src/common/up_initialize.c b/arch/hc/src/common/up_initialize.c index 47c8abfe94a..621fae32cda 100644 --- a/arch/hc/src/common/up_initialize.c +++ b/arch/hc/src/common/up_initialize.c @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include "up_arch.h" @@ -186,12 +186,7 @@ void up_initialize(void) /* Initialize the system logging device */ -#ifdef CONFIG_SYSLOG_CHAR syslog_initialize(); -#endif -#ifdef CONFIG_RAMLOG_SYSLOG - ramlog_sysloginit(); -#endif #ifndef CONFIG_NETDEV_LATEINIT /* Initialize the network */ diff --git a/arch/mips/src/common/up_initialize.c b/arch/mips/src/common/up_initialize.c index dbb950424bb..d09c34e5479 100644 --- a/arch/mips/src/common/up_initialize.c +++ b/arch/mips/src/common/up_initialize.c @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include @@ -188,12 +188,7 @@ void up_initialize(void) /* Initialize the system logging device */ -#ifdef CONFIG_SYSLOG_CHAR syslog_initialize(); -#endif -#ifdef CONFIG_RAMLOG_SYSLOG - ramlog_sysloginit(); -#endif #ifndef CONFIG_NETDEV_LATEINIT /* Initialize the network */ diff --git a/arch/sh/src/common/up_initialize.c b/arch/sh/src/common/up_initialize.c index 89fb6579c34..6bfebb2f0dc 100644 --- a/arch/sh/src/common/up_initialize.c +++ b/arch/sh/src/common/up_initialize.c @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include "up_arch.h" @@ -180,12 +180,7 @@ void up_initialize(void) /* Initialize the system logging device */ -#ifdef CONFIG_SYSLOG_CHAR syslog_initialize(); -#endif -#ifdef CONFIG_RAMLOG_SYSLOG - ramlog_sysloginit(); -#endif #ifndef CONFIG_NETDEV_LATEINIT /* Initialize the network */ diff --git a/arch/sim/src/up_initialize.c b/arch/sim/src/up_initialize.c index 7efcfb23738..445012443e4 100644 --- a/arch/sim/src/up_initialize.c +++ b/arch/sim/src/up_initialize.c @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include "up_internal.h" @@ -168,12 +168,9 @@ void up_initialize(void) ramlog_consoleinit(); #endif -#ifdef CONFIG_SYSLOG_CHAR + /* Initialize the system logging device */ + syslog_initialize(); -#endif -#ifdef CONFIG_RAMLOG_SYSLOG - ramlog_sysloginit(); /* System logging device */ -#endif #if defined(CONFIG_FS_FAT) && !defined(CONFIG_DISABLE_MOUNTPOINT) up_registerblockdevice(); /* Our FAT ramdisk at /dev/ram0 */ diff --git a/arch/x86/src/common/up_initialize.c b/arch/x86/src/common/up_initialize.c index 15197e93a5f..72f1b7a0758 100644 --- a/arch/x86/src/common/up_initialize.c +++ b/arch/x86/src/common/up_initialize.c @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include @@ -188,12 +188,7 @@ void up_initialize(void) /* Initialize the system logging device */ -#ifdef CONFIG_SYSLOG_CHAR syslog_initialize(); -#endif -#ifdef CONFIG_RAMLOG_SYSLOG - ramlog_sysloginit(); -#endif #ifndef CONFIG_NETDEV_LATEINIT /* Initialize the network */ diff --git a/arch/z16/src/common/up_initialize.c b/arch/z16/src/common/up_initialize.c index 853ae0ce7a8..597170a276f 100644 --- a/arch/z16/src/common/up_initialize.c +++ b/arch/z16/src/common/up_initialize.c @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include @@ -188,12 +188,7 @@ void up_initialize(void) /* Initialize the system logging device */ -#ifdef CONFIG_SYSLOG_CHAR syslog_initialize(); -#endif -#ifdef CONFIG_RAMLOG_SYSLOG - ramlog_sysloginit(); -#endif #ifndef CONFIG_NETDEV_LATEINIT /* Initialize the network */ diff --git a/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/up_initialize.c index b773d958925..3032b9cdf5a 100644 --- a/arch/z80/src/common/up_initialize.c +++ b/arch/z80/src/common/up_initialize.c @@ -48,7 +48,8 @@ #include #include #include -#include +#include +#include #include @@ -182,6 +183,10 @@ void up_initialize(void) ramlog_consoleinit(); #endif + /* Initialize the system logging device */ + + syslog_initialize(); + #ifndef CONFIG_NETDEV_LATEINIT /* Initialize the network */ diff --git a/drivers/syslog/ramlog.c b/drivers/syslog/ramlog.c index ad62e935f15..77381017324 100644 --- a/drivers/syslog/ramlog.c +++ b/drivers/syslog/ramlog.c @@ -704,7 +704,7 @@ int ramlog_consoleinit(void) #endif /**************************************************************************** - * Name: ramlog_sysloginit + * Name: ramlog_syslog_initialize * * Description: * Use a pre-allocated RAM logging device and register it at the path @@ -716,7 +716,7 @@ int ramlog_consoleinit(void) ****************************************************************************/ #ifdef CONFIG_RAMLOG_SYSLOG -int ramlog_sysloginit(void) +int ramlog_syslog_initialize(void) { /* Register the syslog character driver */ diff --git a/drivers/syslog/syslog_initialize.c b/drivers/syslog/syslog_initialize.c index 4ac34bc8f6d..cda142268fa 100644 --- a/drivers/syslog/syslog_initialize.c +++ b/drivers/syslog/syslog_initialize.c @@ -73,10 +73,16 @@ int syslog_initialize(void) /* Not much to this yet... more is coming */ -#if defined(CONFIG_SYSLOG) && defined(CONFIG_SYSLOG_CHAR) +#if defined(CONFIG_SYSLOG_CHAR) /* Enable use of a character device as the SYSLOG device */ ret = syslog_dev_initialize(); + +#elif defined(CONFIG_RAMLOG_SYSLOG) + /* Use the RAMLOG as the SYSLOG device */ + + ramlog_syslog_initialize(); +#endif #else /* Nothing needs to be done */ diff --git a/include/nuttx/syslog/ramlog.h b/include/nuttx/syslog/ramlog.h index 75c767819cb..84d651038b8 100644 --- a/include/nuttx/syslog/ramlog.h +++ b/include/nuttx/syslog/ramlog.h @@ -183,7 +183,7 @@ int ramlog_consoleinit(void); #endif /**************************************************************************** - * Name: ramlog_sysloginit + * Name: ramlog_syslog_initialize * * Description: * Create the RAM logging device and register it at the specified path. @@ -195,7 +195,7 @@ int ramlog_consoleinit(void); ****************************************************************************/ #ifdef CONFIG_RAMLOG_SYSLOG -int ramlog_sysloginit(void); +int ramlog_syslog_initialize(void); #endif #undef EXTERN