summaryrefslogtreecommitdiff
path: root/nuttx/arch
diff options
context:
space:
mode:
Diffstat (limited to 'nuttx/arch')
-rw-r--r--nuttx/arch/arm/src/common/up_initialize.c8
-rw-r--r--nuttx/arch/arm/src/common/up_internal.h14
-rw-r--r--nuttx/arch/avr/src/at32uc3/at32uc3_config.h6
-rw-r--r--nuttx/arch/avr/src/at90usb/at90usb_config.h6
-rw-r--r--nuttx/arch/avr/src/atmega/atmega_config.h6
-rw-r--r--nuttx/arch/avr/src/common/up_initialize.c14
-rw-r--r--nuttx/arch/avr/src/common/up_internal.h8
-rwxr-xr-xnuttx/arch/hc/src/common/up_initialize.c7
-rwxr-xr-xnuttx/arch/hc/src/common/up_internal.h12
-rw-r--r--nuttx/arch/mips/src/common/up_initialize.c8
-rwxr-xr-xnuttx/arch/mips/src/common/up_internal.h14
-rw-r--r--nuttx/arch/sh/src/common/up_initialize.c7
-rw-r--r--nuttx/arch/sh/src/common/up_internal.h14
-rw-r--r--nuttx/arch/sim/src/up_initialize.c15
-rw-r--r--nuttx/arch/x86/src/common/up_initialize.c8
-rw-r--r--nuttx/arch/x86/src/common/up_internal.h14
-rw-r--r--nuttx/arch/z16/src/common/up_initialize.c8
-rw-r--r--nuttx/arch/z16/src/common/up_internal.h14
18 files changed, 128 insertions, 55 deletions
diff --git a/nuttx/arch/arm/src/common/up_initialize.c b/nuttx/arch/arm/src/common/up_initialize.c
index 9d7ba0f19..130f0721f 100644
--- a/nuttx/arch/arm/src/common/up_initialize.c
+++ b/nuttx/arch/arm/src/common/up_initialize.c
@@ -43,6 +43,8 @@
#include <nuttx/arch.h>
#include <nuttx/fs.h>
+#include <nuttx/ramlog.h>
+
#include <arch/board/board.h>
#include "up_arch.h"
@@ -159,6 +161,12 @@ void up_initialize(void)
ramlog_consoleinit();
#endif
+ /* Initialize the system logging device */
+
+#ifdef CONFIG_RAMLOG_SYSLOG
+ ramlog_sysloginit();
+#endif
+
/* Initialize the netwok */
up_netinitialize();
diff --git a/nuttx/arch/arm/src/common/up_internal.h b/nuttx/arch/arm/src/common/up_internal.h
index 6f98ac04d..8ade816c7 100644
--- a/nuttx/arch/arm/src/common/up_internal.h
+++ b/nuttx/arch/arm/src/common/up_internal.h
@@ -81,6 +81,12 @@
# endif
#endig
+/* Determine which device to use as the system loggin device */
+
+#ifndef CONFIG_SYSLOG
+# undef CONFIG_RAMLOG_SYSLOG
+#endif
+
/* Check if an interrupt stack size is configured */
#ifndef CONFIG_ARCH_INTERRUPTSTACK
@@ -297,14 +303,6 @@ extern void lowconsole_init(void);
# define lowconsole_init()
#endif
-/* Defined in drivers/ramlog.c */
-
-#ifdef CONFIG_RAMLOG_CONSOLE
-extern void ramlog_consoleinit(void);
-#else
-# define ramlog_consoleinit()
-#endif
-
/* DMA **********************************************************************/
#ifdef CONFIG_ARCH_DMA
diff --git a/nuttx/arch/avr/src/at32uc3/at32uc3_config.h b/nuttx/arch/avr/src/at32uc3/at32uc3_config.h
index 72536083a..b42520531 100644
--- a/nuttx/arch/avr/src/at32uc3/at32uc3_config.h
+++ b/nuttx/arch/avr/src/at32uc3/at32uc3_config.h
@@ -168,6 +168,12 @@
# endif
#endig
+/* Determine which device to use as the system loggin device */
+
+#ifndef CONFIG_SYSLOG
+# undef CONFIG_RAMLOG_SYSLOG
+#endif
+
/* If GPIO IRQ support is defined, then a set of GPIOs must all be included */
#if CONFIG_AVR32_GPIOIRQSETA == 0 && CONFIG_AVR32_GPIOIRQSETB == 0
diff --git a/nuttx/arch/avr/src/at90usb/at90usb_config.h b/nuttx/arch/avr/src/at90usb/at90usb_config.h
index e6d2fb89e..41ad9957c 100644
--- a/nuttx/arch/avr/src/at90usb/at90usb_config.h
+++ b/nuttx/arch/avr/src/at90usb/at90usb_config.h
@@ -87,6 +87,12 @@
# endif
#endig
+/* Determine which device to use as the system loggin device */
+
+#ifndef CONFIG_SYSLOG
+# undef CONFIG_RAMLOG_SYSLOG
+#endif
+
/************************************************************************************
* Public Types
************************************************************************************/
diff --git a/nuttx/arch/avr/src/atmega/atmega_config.h b/nuttx/arch/avr/src/atmega/atmega_config.h
index e0a7968cc..a168a2e47 100644
--- a/nuttx/arch/avr/src/atmega/atmega_config.h
+++ b/nuttx/arch/avr/src/atmega/atmega_config.h
@@ -92,6 +92,12 @@
# endif
#endig
+/* Determine which device to use as the system loggin device */
+
+#ifndef CONFIG_SYSLOG
+# undef CONFIG_RAMLOG_SYSLOG
+#endif
+
/************************************************************************************
* Public Types
************************************************************************************/
diff --git a/nuttx/arch/avr/src/common/up_initialize.c b/nuttx/arch/avr/src/common/up_initialize.c
index eed1b4135..3bcbc0dc4 100644
--- a/nuttx/arch/avr/src/common/up_initialize.c
+++ b/nuttx/arch/avr/src/common/up_initialize.c
@@ -43,6 +43,8 @@
#include <nuttx/arch.h>
#include <nuttx/fs.h>
+#include <nuttx/ramlog.h>
+
#include <arch/board/board.h>
#include "up_arch.h"
@@ -76,6 +78,12 @@
# endif
#endig
+/* Determine which device to use as the system loggin device */
+
+#ifndef CONFIG_SYSLOG
+# undef CONFIG_RAMLOG_SYSLOG
+#endif
+
/****************************************************************************
* Private Types
****************************************************************************/
@@ -183,6 +191,12 @@ void up_initialize(void)
ramlog_consoleinit();
#endif
+ /* Initialize the system logging device */
+
+#ifdef CONFIG_RAMLOG_SYSLOG
+ ramlog_sysloginit();
+#endif
+
/* Initialize the netwok */
up_netinitialize();
diff --git a/nuttx/arch/avr/src/common/up_internal.h b/nuttx/arch/avr/src/common/up_internal.h
index bc62be720..e65b5627d 100644
--- a/nuttx/arch/avr/src/common/up_internal.h
+++ b/nuttx/arch/avr/src/common/up_internal.h
@@ -172,14 +172,6 @@ extern void lowconsole_init(void);
# define lowconsole_init()
#endif
-/* Defined in drivers/ramlog.c */
-
-#ifdef CONFIG_RAMLOG_CONSOLE
-extern void ramlog_consoleinit(void);
-#else
-# define ramlog_consoleinit()
-#endif
-
/* Defined in chip/xxx_timerisr.c */
extern void up_timerinit(void);
diff --git a/nuttx/arch/hc/src/common/up_initialize.c b/nuttx/arch/hc/src/common/up_initialize.c
index a1973e94a..5481ed7bc 100755
--- a/nuttx/arch/hc/src/common/up_initialize.c
+++ b/nuttx/arch/hc/src/common/up_initialize.c
@@ -43,6 +43,7 @@
#include <nuttx/arch.h>
#include <nuttx/fs.h>
+#include <nuttx/ramlog.h>
#include "up_arch.h"
#include "up_internal.h"
@@ -158,6 +159,12 @@ void up_initialize(void)
ramlog_consoleinit();
#endif
+ /* Initialize the system logging device */
+
+#ifdef CONFIG_RAMLOG_SYSLOG
+ ramlog_sysloginit();
+#endif
+
/* Initialize the netwok */
up_netinitialize();
diff --git a/nuttx/arch/hc/src/common/up_internal.h b/nuttx/arch/hc/src/common/up_internal.h
index 22677dd0f..93572e404 100755
--- a/nuttx/arch/hc/src/common/up_internal.h
+++ b/nuttx/arch/hc/src/common/up_internal.h
@@ -81,6 +81,12 @@
# endif
#endig
+/* Determine which device to use as the system loggin device */
+
+#ifndef CONFIG_SYSLOG
+# undef CONFIG_RAMLOG_SYSLOG
+#endif
+
/* Check if an interrupt stack size is configured */
#ifndef CONFIG_ARCH_INTERRUPTSTACK
@@ -178,12 +184,6 @@ extern void lowconsole_init(void);
# define lowconsole_init()
#endif
-#ifdef CONFIG_RAMLOG_CONSOLE
-extern void ramlog_consoleinit(void);
-#else
-# define ramlog_consoleinit()
-#endif
-
extern void up_lowputc(char ch);
extern void up_puts(const char *str);
extern void up_lowputs(const char *str);
diff --git a/nuttx/arch/mips/src/common/up_initialize.c b/nuttx/arch/mips/src/common/up_initialize.c
index 0a061990b..11bd979f0 100644
--- a/nuttx/arch/mips/src/common/up_initialize.c
+++ b/nuttx/arch/mips/src/common/up_initialize.c
@@ -43,6 +43,8 @@
#include <nuttx/arch.h>
#include <nuttx/fs.h>
+#include <nuttx/ramlog.h>
+
#include <arch/board/board.h>
#include "up_arch.h"
@@ -159,6 +161,12 @@ void up_initialize(void)
ramlog_consoleinit();
#endif
+ /* Initialize the system logging device */
+
+#ifdef CONFIG_RAMLOG_SYSLOG
+ ramlog_sysloginit();
+#endif
+
/* Initialize the netwok */
up_netinitialize();
diff --git a/nuttx/arch/mips/src/common/up_internal.h b/nuttx/arch/mips/src/common/up_internal.h
index 25b5174a5..d43580c65 100755
--- a/nuttx/arch/mips/src/common/up_internal.h
+++ b/nuttx/arch/mips/src/common/up_internal.h
@@ -81,6 +81,12 @@
# endif
#endig
+/* Determine which device to use as the system loggin device */
+
+#ifndef CONFIG_SYSLOG
+# undef CONFIG_RAMLOG_SYSLOG
+#endif
+
/* Check if an interrupt stack size is configured */
#ifndef CONFIG_ARCH_INTERRUPTSTACK
@@ -188,14 +194,6 @@ extern void lowconsole_init(void);
# define lowconsole_init()
#endif
-/* Defined in drivers/ramlog.c */
-
-#ifdef CONFIG_RAMLOG_CONSOLE
-extern void ramlog_consoleinit(void);
-#else
-# define ramlog_consoleinit()
-#endif
-
/* Debug */
#ifdef CONFIG_ARCH_STACKDUMP
diff --git a/nuttx/arch/sh/src/common/up_initialize.c b/nuttx/arch/sh/src/common/up_initialize.c
index b81e3b972..837b218a0 100644
--- a/nuttx/arch/sh/src/common/up_initialize.c
+++ b/nuttx/arch/sh/src/common/up_initialize.c
@@ -43,6 +43,7 @@
#include <nuttx/arch.h>
#include <nuttx/fs.h>
+#include <nuttx/ramlog.h>
#include "up_arch.h"
#include "up_internal.h"
@@ -150,6 +151,12 @@ void up_initialize(void)
ramlog_consoleinit();
#endif
+ /* Initialize the system logging device */
+
+#ifdef CONFIG_RAMLOG_SYSLOG
+ ramlog_sysloginit();
+#endif
+
/* Initialize the netwok */
up_netinitialize();
diff --git a/nuttx/arch/sh/src/common/up_internal.h b/nuttx/arch/sh/src/common/up_internal.h
index 1b6e41635..50aad1478 100644
--- a/nuttx/arch/sh/src/common/up_internal.h
+++ b/nuttx/arch/sh/src/common/up_internal.h
@@ -85,6 +85,12 @@
# endif
#endig
+/* Determine which device to use as the system loggin device */
+
+#ifndef CONFIG_SYSLOG
+# undef CONFIG_RAMLOG_SYSLOG
+#endif
+
/* Check if an interrupt stack size is configured */
#ifndef CONFIG_ARCH_INTERRUPTSTACK
@@ -177,14 +183,6 @@ extern void lowconsole_init(void);
# define lowconsole_init()
#endif
-/* Defined in drivers/ramlog.c */
-
-#ifdef CONFIG_RAMLOG_CONSOLE
-extern void ramlog_consoleinit(void);
-#else
-# define ramlog_consoleinit()
-#endif
-
/* Defined in up_watchdog.c */
extern void up_wdtinit(void);
diff --git a/nuttx/arch/sim/src/up_initialize.c b/nuttx/arch/sim/src/up_initialize.c
index 4e07904e4..a850d7c69 100644
--- a/nuttx/arch/sim/src/up_initialize.c
+++ b/nuttx/arch/sim/src/up_initialize.c
@@ -1,8 +1,8 @@
/****************************************************************************
* up_initialize.c
*
- * Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ * Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -43,6 +43,7 @@
#include <nuttx/arch.h>
#include <nuttx/fs.h>
+#include <nuttx/ramlog.h>
#include "up_internal.h"
@@ -50,6 +51,12 @@
* Private Definitions
****************************************************************************/
+/* Determine which device to use as the system loggin device */
+
+#ifndef CONFIG_SYSLOG
+# undef CONFIG_RAMLOG_SYSLOG
+#endif
+
/****************************************************************************
* Private Data
****************************************************************************/
@@ -99,6 +106,10 @@ void up_initialize(void)
devzero_register(); /* Standard /dev/zero */
up_devconsole(); /* Our private /dev/console */
+#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 */
#endif
diff --git a/nuttx/arch/x86/src/common/up_initialize.c b/nuttx/arch/x86/src/common/up_initialize.c
index 92d4d3537..eb0cdccc1 100644
--- a/nuttx/arch/x86/src/common/up_initialize.c
+++ b/nuttx/arch/x86/src/common/up_initialize.c
@@ -43,6 +43,8 @@
#include <nuttx/arch.h>
#include <nuttx/fs.h>
+#include <nuttx/ramlog.h>
+
#include <arch/board/board.h>
#include "up_arch.h"
@@ -159,6 +161,12 @@ void up_initialize(void)
ramlog_consoleinit();
#endif
+ /* Initialize the system logging device */
+
+#ifdef CONFIG_RAMLOG_SYSLOG
+ ramlog_sysloginit();
+#endif
+
/* Initialize the netwok */
up_netinitialize();
diff --git a/nuttx/arch/x86/src/common/up_internal.h b/nuttx/arch/x86/src/common/up_internal.h
index f95a9bc74..c840cf90b 100644
--- a/nuttx/arch/x86/src/common/up_internal.h
+++ b/nuttx/arch/x86/src/common/up_internal.h
@@ -80,6 +80,12 @@
# endif
#endig
+/* Determine which device to use as the system loggin device */
+
+#ifndef CONFIG_SYSLOG
+# undef CONFIG_RAMLOG_SYSLOG
+#endif
+
/* Check if an interrupt stack size is configured */
#ifndef CONFIG_ARCH_INTERRUPTSTACK
@@ -203,14 +209,6 @@ extern void lowconsole_init(void);
# define lowconsole_init()
#endif
-/* Defined in drivers/ramlog.c */
-
-#ifdef CONFIG_RAMLOG_CONSOLE
-extern void ramlog_consoleinit(void);
-#else
-# define ramlog_consoleinit()
-#endif
-
/* Defined in up_watchdog.c */
extern void up_wdtinit(void);
diff --git a/nuttx/arch/z16/src/common/up_initialize.c b/nuttx/arch/z16/src/common/up_initialize.c
index ab653f368..165f0ead3 100644
--- a/nuttx/arch/z16/src/common/up_initialize.c
+++ b/nuttx/arch/z16/src/common/up_initialize.c
@@ -44,6 +44,8 @@
#include <nuttx/arch.h>
#include <nuttx/fs.h>
#include <nuttx/mm.h>
+#include <nuttx/ramlog.h>
+
#include <arch/board/board.h>
#include "up_internal.h"
@@ -174,6 +176,12 @@ void up_initialize(void)
ramlog_consoleinit();
#endif
+ /* Initialize the system logging device */
+
+#ifdef CONFIG_RAMLOG_SYSLOG
+ ramlog_sysloginit();
+#endif
+
/* Initialize the netwok */
up_netinitialize();
diff --git a/nuttx/arch/z16/src/common/up_internal.h b/nuttx/arch/z16/src/common/up_internal.h
index e0c8ffc61..7d0aaaec8 100644
--- a/nuttx/arch/z16/src/common/up_internal.h
+++ b/nuttx/arch/z16/src/common/up_internal.h
@@ -70,7 +70,13 @@
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
#endif
-
+
+/* Determine which device to use as the system loggin device */
+
+#ifndef CONFIG_SYSLOG
+# undef CONFIG_RAMLOG_SYSLOG
+#endif
+
/* Macros for portability */
#define IN_INTERRUPT (current_regs != NULL)
@@ -140,12 +146,6 @@ extern void up_serialinit(void);
extern void lowconsole_init(void);
#endif
-/* Defined in drivers/ramlog.c */
-
-#ifdef CONFIG_RAMLOG_CONSOLE
-extern void ramlog_consoleinit(void);
-#endif
-
/* Defined in up_timerisr.c */
extern void up_timerinit(void);
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-19 22:34:06 +0000