summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/nshlib/nsh_fscmds.c2
-rw-r--r--nuttx/ChangeLog2
-rw-r--r--nuttx/arch/arm/src/common/up_initialize.c2
-rw-r--r--nuttx/arch/avr/src/common/up_initialize.c2
-rw-r--r--nuttx/arch/hc/src/common/up_initialize.c2
-rw-r--r--nuttx/arch/mips/src/common/up_initialize.c2
-rw-r--r--nuttx/arch/sh/src/common/up_initialize.c2
-rw-r--r--nuttx/arch/sim/src/up_initialize.c2
-rw-r--r--nuttx/arch/x86/src/common/up_initialize.c2
-rw-r--r--nuttx/arch/z16/src/common/up_initialize.c2
-rw-r--r--nuttx/drivers/syslog/ramlog.c10
-rw-r--r--nuttx/fs/fs_syslog.c2
-rw-r--r--nuttx/include/nuttx/syslog/ramlog.h (renamed from nuttx/include/nuttx/ramlog.h)12
-rw-r--r--nuttx/include/nuttx/syslog/syslog.h (renamed from nuttx/include/nuttx/syslog.h)12
-rw-r--r--nuttx/libc/stdio/lib_syslogstream.c2
15 files changed, 29 insertions, 29 deletions
diff --git a/apps/nshlib/nsh_fscmds.c b/apps/nshlib/nsh_fscmds.c
index 9202badef..860e0b814 100644
--- a/apps/nshlib/nsh_fscmds.c
+++ b/apps/nshlib/nsh_fscmds.c
@@ -63,7 +63,7 @@
# include <nuttx/fs/nfs.h>
# endif
# ifdef CONFIG_RAMLOG_SYSLOG
-# include <nuttx/ramlog.h>
+# include <nuttx/syslog/ramlog.h>
# endif
#endif
#endif
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 086934fbc..2f381cd98 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -7156,4 +7156,6 @@
enabled. Noted by Librae (2014-4-8).
* configs/*/defconfig: Increase the number of preallocated watchdogs
in all configurations that use networking or USB (2014-3-9).
+ * include/nuttx/syslog/syslog.h and ramlog.h: Move syslog.h and
+ ramlog.h to include/nutt/syslog (2014-4-10).
diff --git a/nuttx/arch/arm/src/common/up_initialize.c b/nuttx/arch/arm/src/common/up_initialize.c
index 2d9bb7988..e5158e91e 100644
--- a/nuttx/arch/arm/src/common/up_initialize.c
+++ b/nuttx/arch/arm/src/common/up_initialize.c
@@ -43,7 +43,7 @@
#include <nuttx/arch.h>
#include <nuttx/fs/fs.h>
-#include <nuttx/ramlog.h>
+#include <nuttx/syslog/ramlog.h>
#include <arch/board/board.h>
diff --git a/nuttx/arch/avr/src/common/up_initialize.c b/nuttx/arch/avr/src/common/up_initialize.c
index 69f58ec33..ed61c5f1c 100644
--- a/nuttx/arch/avr/src/common/up_initialize.c
+++ b/nuttx/arch/avr/src/common/up_initialize.c
@@ -43,7 +43,7 @@
#include <nuttx/arch.h>
#include <nuttx/fs/fs.h>
-#include <nuttx/ramlog.h>
+#include <nuttx/syslog/ramlog.h>
#include <arch/board/board.h>
diff --git a/nuttx/arch/hc/src/common/up_initialize.c b/nuttx/arch/hc/src/common/up_initialize.c
index d5e49442f..dce13c86e 100644
--- a/nuttx/arch/hc/src/common/up_initialize.c
+++ b/nuttx/arch/hc/src/common/up_initialize.c
@@ -43,7 +43,7 @@
#include <nuttx/arch.h>
#include <nuttx/fs/fs.h>
-#include <nuttx/ramlog.h>
+#include <nuttx/syslog/ramlog.h>
#include "up_arch.h"
#include "up_internal.h"
diff --git a/nuttx/arch/mips/src/common/up_initialize.c b/nuttx/arch/mips/src/common/up_initialize.c
index a6e3e5577..de82d8379 100644
--- a/nuttx/arch/mips/src/common/up_initialize.c
+++ b/nuttx/arch/mips/src/common/up_initialize.c
@@ -43,7 +43,7 @@
#include <nuttx/arch.h>
#include <nuttx/fs/fs.h>
-#include <nuttx/ramlog.h>
+#include <nuttx/syslog/ramlog.h>
#include <arch/board/board.h>
diff --git a/nuttx/arch/sh/src/common/up_initialize.c b/nuttx/arch/sh/src/common/up_initialize.c
index 9b43b2a94..061923016 100644
--- a/nuttx/arch/sh/src/common/up_initialize.c
+++ b/nuttx/arch/sh/src/common/up_initialize.c
@@ -43,7 +43,7 @@
#include <nuttx/arch.h>
#include <nuttx/fs/fs.h>
-#include <nuttx/ramlog.h>
+#include <nuttx/syslog/ramlog.h>
#include "up_arch.h"
#include "up_internal.h"
diff --git a/nuttx/arch/sim/src/up_initialize.c b/nuttx/arch/sim/src/up_initialize.c
index 16fff605b..38527aca8 100644
--- a/nuttx/arch/sim/src/up_initialize.c
+++ b/nuttx/arch/sim/src/up_initialize.c
@@ -43,7 +43,7 @@
#include <nuttx/arch.h>
#include <nuttx/fs/fs.h>
-#include <nuttx/ramlog.h>
+#include <nuttx/syslog/ramlog.h>
#include "up_internal.h"
diff --git a/nuttx/arch/x86/src/common/up_initialize.c b/nuttx/arch/x86/src/common/up_initialize.c
index 4e25ae415..e5462a4b8 100644
--- a/nuttx/arch/x86/src/common/up_initialize.c
+++ b/nuttx/arch/x86/src/common/up_initialize.c
@@ -43,7 +43,7 @@
#include <nuttx/arch.h>
#include <nuttx/fs/fs.h>
-#include <nuttx/ramlog.h>
+#include <nuttx/syslog/ramlog.h>
#include <arch/board/board.h>
diff --git a/nuttx/arch/z16/src/common/up_initialize.c b/nuttx/arch/z16/src/common/up_initialize.c
index 0b27aa0cc..1b53355f2 100644
--- a/nuttx/arch/z16/src/common/up_initialize.c
+++ b/nuttx/arch/z16/src/common/up_initialize.c
@@ -43,7 +43,7 @@
#include <nuttx/arch.h>
#include <nuttx/fs/fs.h>
-#include <nuttx/ramlog.h>
+#include <nuttx/syslog/ramlog.h>
#include <arch/board/board.h>
diff --git a/nuttx/drivers/syslog/ramlog.c b/nuttx/drivers/syslog/ramlog.c
index 47b0cd3cb..0c612ec96 100644
--- a/nuttx/drivers/syslog/ramlog.c
+++ b/nuttx/drivers/syslog/ramlog.c
@@ -56,7 +56,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
#include <nuttx/arch.h>
-#include <nuttx/ramlog.h>
+#include <nuttx/syslog/ramlog.h>
#include <arch/irq.h>
@@ -638,7 +638,6 @@ errout:
*
* Description:
* Create the RAM logging device and register it at the specified path.
- * Mostly likely this path will be /dev/console
*
****************************************************************************/
@@ -683,8 +682,7 @@ int ramlog_register(FAR const char *devpath, FAR char *buffer, size_t buflen)
* Name: ramlog_consoleinit
*
* Description:
- * Create the RAM logging device and register it at the specified path.
- * Mostly likely this path will be /dev/console
+ * Use a pre-allocated RAM logging device and register it at /dev/console
*
****************************************************************************/
@@ -703,8 +701,8 @@ int ramlog_consoleinit(void)
* Name: ramlog_sysloginit
*
* Description:
- * Create the RAM logging device and register it at the specified path.
- * Mostly likely this path will be CONFIG_RAMLOG_SYSLOG
+ * Use a pre-allocated RAM logging device and register it at the path
+ * specified by CONFIG_RAMLOG_SYSLOG
*
* If CONFIG_RAMLOG_CONSOLE is also defined, then this functionality is
* performed when ramlog_consoleinit() is called.
diff --git a/nuttx/fs/fs_syslog.c b/nuttx/fs/fs_syslog.c
index 0e1a80ec8..12a3414c7 100644
--- a/nuttx/fs/fs_syslog.c
+++ b/nuttx/fs/fs_syslog.c
@@ -51,7 +51,7 @@
#include <nuttx/fs/fs.h>
#include <nuttx/arch.h>
-#include <nuttx/syslog.h>
+#include <nuttx/syslog/syslog.h>
#include "fs_internal.h"
diff --git a/nuttx/include/nuttx/ramlog.h b/nuttx/include/nuttx/syslog/ramlog.h
index 7831ea509..2777d3419 100644
--- a/nuttx/include/nuttx/ramlog.h
+++ b/nuttx/include/nuttx/syslog/ramlog.h
@@ -1,8 +1,8 @@
/****************************************************************************
- * include/nuttx/ramlog.h
+ * include/nuttx/syslog/ramlog.h
* The RAM logging driver
*
- * Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -46,15 +46,15 @@
* configuration.
*/
-#ifndef __INCLUDE_NUTTX_RAMLOG_H
-#define __INCLUDE_NUTTX_RAMLOG_H
+#ifndef __INCLUDE_NUTTX_SYSLOG_RAMLOG_H
+#define __INCLUDE_NUTTX_SYSLOG_RAMLOG_H
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
-#include <nuttx/syslog.h>
+#include <nuttx/syslog/syslog.h>
#ifdef CONFIG_RAMLOG
@@ -205,4 +205,4 @@ EXTERN int ramlog_sysloginit(void);
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_RAMLOG */
-#endif /* __INCLUDE_NUTTX_RAMLOG_H */
+#endif /* __INCLUDE_NUTTX_SYSLOG_RAMLOG_H */
diff --git a/nuttx/include/nuttx/syslog.h b/nuttx/include/nuttx/syslog/syslog.h
index bb3c8f493..0575f4018 100644
--- a/nuttx/include/nuttx/syslog.h
+++ b/nuttx/include/nuttx/syslog/syslog.h
@@ -1,8 +1,8 @@
/****************************************************************************
- * include/nuttx/syslog.h
+ * include/nuttx/syslog/syslog.h
* The NuttX SYSLOGing interface
*
- * Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -34,8 +34,8 @@
*
****************************************************************************/
-#ifndef __INCLUDE_NUTTX_SYSLOG_H
-#define __INCLUDE_NUTTX_SYSLOG_H
+#ifndef __INCLUDE_NUTTX_SYSLOG_SYSLOG_H
+#define __INCLUDE_NUTTX_SYSLOG_SYSLOG_H
/****************************************************************************
* Included Files
@@ -56,7 +56,7 @@
*
* 1. A RAM SYSLOGing device that will log data into a circular buffer
* that can be dumped using the NSH dmesg command. This device is
- * described in the include/nuttx/ramlog.h header file.
+ * described in the include/nuttx/syslog/ramlog.h header file.
*
* 2. And a generic character device that may be used as the SYSLOG. The
* generic device interfaces are described in this file. A disadvantage
@@ -133,4 +133,4 @@ EXTERN int syslog_putc(int ch);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __INCLUDE_NUTTX_SYSLOG_H */
+#endif /* __INCLUDE_NUTTX_SYSLOG_SYSLOG_H */
diff --git a/nuttx/libc/stdio/lib_syslogstream.c b/nuttx/libc/stdio/lib_syslogstream.c
index 7aceeec78..59f79f3f8 100644
--- a/nuttx/libc/stdio/lib_syslogstream.c
+++ b/nuttx/libc/stdio/lib_syslogstream.c
@@ -43,7 +43,7 @@
#include <assert.h>
#include <errno.h>
-#include <nuttx/syslog.h>
+#include <nuttx/syslog/syslog.h>
#include "lib_internal.h"
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-30 15:21:21 +0000