mv ramlog.h and syslog.h to new include/nuttx/syslog

2014-04-10 09:29:30 -06:00 · 2014-04-10 09:29:30 -06:00 · 2fcc57edb0
commit 2fcc57edb0
parent 6be62a7ef3
14 changed files with 28 additions and 28 deletions
--- a/2
+++ b/2
@ -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).

--- a/arch/arm/src/common/up_initialize.c
+++ b/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>

--- a/arch/avr/src/common/up_initialize.c
+++ b/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>

--- a/arch/hc/src/common/up_initialize.c
+++ b/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"
--- a/arch/mips/src/common/up_initialize.c
+++ b/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>

--- a/arch/sh/src/common/up_initialize.c
+++ b/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"
--- a/arch/sim/src/up_initialize.c
+++ b/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"

--- a/arch/x86/src/common/up_initialize.c
+++ b/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>

--- a/arch/z16/src/common/up_initialize.c
+++ b/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>

--- a/drivers/syslog/ramlog.c
+++ b/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.
--- a/fs/fs_syslog.c
+++ b/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"

--- a/include/nuttx/syslog/ramlog.h
+++ b/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 */
--- a/include/nuttx/syslog/syslog.h
+++ b/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 */
--- a/libc/stdio/lib_syslogstream.c
+++ b/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"