diff options
Diffstat (limited to 'nuttx/arch')
-rw-r--r-- | nuttx/arch/arm/src/common/up_initialize.c | 5 | ||||
-rw-r--r-- | nuttx/arch/arm/src/common/up_internal.h | 1 | ||||
-rw-r--r-- | nuttx/arch/avr/src/at32uc3/at32uc3_config.h | 1 | ||||
-rw-r--r-- | nuttx/arch/avr/src/at90usb/at90usb_config.h | 1 | ||||
-rw-r--r-- | nuttx/arch/avr/src/atmega/atmega_config.h | 1 | ||||
-rw-r--r-- | nuttx/arch/avr/src/common/up_initialize.c | 6 | ||||
-rwxr-xr-x | nuttx/arch/hc/src/common/up_initialize.c | 5 | ||||
-rwxr-xr-x | nuttx/arch/hc/src/common/up_internal.h | 1 | ||||
-rw-r--r-- | nuttx/arch/mips/src/common/up_initialize.c | 5 | ||||
-rw-r--r-- | nuttx/arch/mips/src/common/up_internal.h | 1 | ||||
-rw-r--r-- | nuttx/arch/sh/src/common/up_initialize.c | 3 | ||||
-rw-r--r-- | nuttx/arch/sh/src/common/up_internal.h | 1 | ||||
-rw-r--r-- | nuttx/arch/sim/src/up_initialize.c | 5 | ||||
-rw-r--r-- | nuttx/arch/sim/src/up_internal.h | 1 | ||||
-rw-r--r-- | nuttx/arch/x86/src/common/up_initialize.c | 5 | ||||
-rw-r--r-- | nuttx/arch/x86/src/common/up_internal.h | 1 | ||||
-rw-r--r-- | nuttx/arch/z16/src/common/up_initialize.c | 5 | ||||
-rw-r--r-- | nuttx/arch/z16/src/common/up_internal.h | 1 |
18 files changed, 42 insertions, 7 deletions
diff --git a/nuttx/arch/arm/src/common/up_initialize.c b/nuttx/arch/arm/src/common/up_initialize.c index 20c23ef67..094835c29 100644 --- a/nuttx/arch/arm/src/common/up_initialize.c +++ b/nuttx/arch/arm/src/common/up_initialize.c @@ -173,11 +173,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/arm/src/common/up_internal.h b/nuttx/arch/arm/src/common/up_internal.h index 67f11d619..45cb1dcc0 100644 --- a/nuttx/arch/arm/src/common/up_internal.h +++ b/nuttx/arch/arm/src/common/up_internal.h @@ -84,6 +84,7 @@ /* Determine which device to use as the system logging device */ #ifndef CONFIG_SYSLOG +# undef CONFIG_SYSLOG_CHAR # undef CONFIG_RAMLOG_SYSLOG #endif diff --git a/nuttx/arch/avr/src/at32uc3/at32uc3_config.h b/nuttx/arch/avr/src/at32uc3/at32uc3_config.h index edd19985a..c1b337676 100644 --- a/nuttx/arch/avr/src/at32uc3/at32uc3_config.h +++ b/nuttx/arch/avr/src/at32uc3/at32uc3_config.h @@ -171,6 +171,7 @@ /* Determine which device to use as the system logging device */ #ifndef CONFIG_SYSLOG +# undef CONFIG_SYSLOG_CHAR # undef CONFIG_RAMLOG_SYSLOG #endif diff --git a/nuttx/arch/avr/src/at90usb/at90usb_config.h b/nuttx/arch/avr/src/at90usb/at90usb_config.h index 8beef94bc..0aa73053e 100644 --- a/nuttx/arch/avr/src/at90usb/at90usb_config.h +++ b/nuttx/arch/avr/src/at90usb/at90usb_config.h @@ -90,6 +90,7 @@ /* Determine which device to use as the system logging device */ #ifndef CONFIG_SYSLOG +# undef CONFIG_SYSLOG_CHAR # undef CONFIG_RAMLOG_SYSLOG #endif diff --git a/nuttx/arch/avr/src/atmega/atmega_config.h b/nuttx/arch/avr/src/atmega/atmega_config.h index be89234c9..3835fb459 100644 --- a/nuttx/arch/avr/src/atmega/atmega_config.h +++ b/nuttx/arch/avr/src/atmega/atmega_config.h @@ -95,6 +95,7 @@ /* Determine which device to use as the system logging device */ #ifndef CONFIG_SYSLOG +# undef CONFIG_SYSLOG_CHAR # undef CONFIG_RAMLOG_SYSLOG #endif diff --git a/nuttx/arch/avr/src/common/up_initialize.c b/nuttx/arch/avr/src/common/up_initialize.c index 3b86fd058..76de41c99 100644 --- a/nuttx/arch/avr/src/common/up_initialize.c +++ b/nuttx/arch/avr/src/common/up_initialize.c @@ -81,6 +81,7 @@ /* Determine which device to use as the system logging device */ #ifndef CONFIG_SYSLOG +# undef CONFIG_SYSLOG_CHAR # undef CONFIG_RAMLOG_SYSLOG #endif @@ -193,11 +194,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/hc/src/common/up_initialize.c b/nuttx/arch/hc/src/common/up_initialize.c index a2cf078e9..b9dfd9ba1 100755 --- a/nuttx/arch/hc/src/common/up_initialize.c +++ b/nuttx/arch/hc/src/common/up_initialize.c @@ -161,11 +161,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/hc/src/common/up_internal.h b/nuttx/arch/hc/src/common/up_internal.h index 5c22e50a1..e54b86dec 100755 --- a/nuttx/arch/hc/src/common/up_internal.h +++ b/nuttx/arch/hc/src/common/up_internal.h @@ -84,6 +84,7 @@ /* Determine which device to use as the system logging device */ #ifndef CONFIG_SYSLOG +# undef CONFIG_SYSLOG_CHAR # undef CONFIG_RAMLOG_SYSLOG #endif diff --git a/nuttx/arch/mips/src/common/up_initialize.c b/nuttx/arch/mips/src/common/up_initialize.c index fa8e5cf5d..3063b4b4b 100644 --- a/nuttx/arch/mips/src/common/up_initialize.c +++ b/nuttx/arch/mips/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/mips/src/common/up_internal.h b/nuttx/arch/mips/src/common/up_internal.h index 62f9b8402..0eb1ed6a0 100644 --- a/nuttx/arch/mips/src/common/up_internal.h +++ b/nuttx/arch/mips/src/common/up_internal.h @@ -84,6 +84,7 @@ /* Determine which device to use as the system logging device */ #ifndef CONFIG_SYSLOG +# undef CONFIG_SYSLOG_CHAR # undef CONFIG_RAMLOG_SYSLOG #endif diff --git a/nuttx/arch/sh/src/common/up_initialize.c b/nuttx/arch/sh/src/common/up_initialize.c index ffdfbb4ee..3aef5c637 100644 --- a/nuttx/arch/sh/src/common/up_initialize.c +++ b/nuttx/arch/sh/src/common/up_initialize.c @@ -153,6 +153,9 @@ void up_initialize(void) /* Initialize the system logging device */ +#ifdef CONFIG_SYSLOG_CHAR + syslog_initialize(); +#endif #ifdef CONFIG_RAMLOG_SYSLOG ramlog_sysloginit(); #endif diff --git a/nuttx/arch/sh/src/common/up_internal.h b/nuttx/arch/sh/src/common/up_internal.h index 083beea59..0504755f6 100644 --- a/nuttx/arch/sh/src/common/up_internal.h +++ b/nuttx/arch/sh/src/common/up_internal.h @@ -88,6 +88,7 @@ /* Determine which device to use as the system logging device */ #ifndef CONFIG_SYSLOG +# undef CONFIG_SYSLOG_CHAR # undef CONFIG_RAMLOG_SYSLOG #endif diff --git a/nuttx/arch/sim/src/up_initialize.c b/nuttx/arch/sim/src/up_initialize.c index 3e2f06958..de11c7947 100644 --- a/nuttx/arch/sim/src/up_initialize.c +++ b/nuttx/arch/sim/src/up_initialize.c @@ -107,6 +107,9 @@ void up_initialize(void) ramlog_consoleinit(); #endif +#ifdef CONFIG_SYSLOG_CHAR + syslog_initialize(); +#endif #ifdef CONFIG_RAMLOG_SYSLOG ramlog_sysloginit(); /* System logging device */ #endif @@ -116,6 +119,6 @@ void up_initialize(void) #endif #ifdef CONFIG_NET - uipdriver_init(); /* Our "real" netwok driver */ + uipdriver_init(); /* Our "real" network driver */ #endif } diff --git a/nuttx/arch/sim/src/up_internal.h b/nuttx/arch/sim/src/up_internal.h index 343a4b39b..04fd71efc 100644 --- a/nuttx/arch/sim/src/up_internal.h +++ b/nuttx/arch/sim/src/up_internal.h @@ -79,6 +79,7 @@ /* Determine which device to use as the system logging device */ #ifndef CONFIG_SYSLOG +# undef CONFIG_SYSLOG_CHAR # undef CONFIG_RAMLOG_SYSLOG #endif 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 diff --git a/nuttx/arch/z16/src/common/up_initialize.c b/nuttx/arch/z16/src/common/up_initialize.c index 968e8e8f0..e9c58c489 100644 --- a/nuttx/arch/z16/src/common/up_initialize.c +++ b/nuttx/arch/z16/src/common/up_initialize.c @@ -178,11 +178,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(); up_ledon(LED_IRQSENABLED); diff --git a/nuttx/arch/z16/src/common/up_internal.h b/nuttx/arch/z16/src/common/up_internal.h index 13c524c8f..4d07392d9 100644 --- a/nuttx/arch/z16/src/common/up_internal.h +++ b/nuttx/arch/z16/src/common/up_internal.h @@ -74,6 +74,7 @@ /* Determine which device to use as the system logging device */ #ifndef CONFIG_SYSLOG +# undef CONFIG_SYSLOG_CHAR # undef CONFIG_RAMLOG_SYSLOG #endif |