From 2fcc57edb0cf5bb42da0e31b74e94413d4402f7a Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 10 Apr 2014 09:29:30 -0600 Subject: [PATCH] mv ramlog.h and syslog.h to new include/nuttx/syslog --- ChangeLog | 2 ++ arch/arm/src/common/up_initialize.c | 2 +- arch/avr/src/common/up_initialize.c | 2 +- arch/hc/src/common/up_initialize.c | 2 +- arch/mips/src/common/up_initialize.c | 2 +- arch/sh/src/common/up_initialize.c | 2 +- arch/sim/src/up_initialize.c | 2 +- arch/x86/src/common/up_initialize.c | 2 +- arch/z16/src/common/up_initialize.c | 2 +- drivers/syslog/ramlog.c | 10 ++++------ fs/fs_syslog.c | 2 +- include/nuttx/{ => syslog}/ramlog.h | 12 ++++++------ include/nuttx/{ => syslog}/syslog.h | 12 ++++++------ libc/stdio/lib_syslogstream.c | 2 +- 14 files changed, 28 insertions(+), 28 deletions(-) rename include/nuttx/{ => syslog}/ramlog.h (96%) rename include/nuttx/{ => syslog}/syslog.h (94%) diff --git a/ChangeLog b/ChangeLog index 086934fbc5..2f381cd98a 100644 --- a/ChangeLog +++ b/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/arch/arm/src/common/up_initialize.c b/arch/arm/src/common/up_initialize.c index 2d9bb79887..e5158e91e5 100644 --- a/arch/arm/src/common/up_initialize.c +++ b/arch/arm/src/common/up_initialize.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include diff --git a/arch/avr/src/common/up_initialize.c b/arch/avr/src/common/up_initialize.c index 69f58ec332..ed61c5f1c2 100644 --- a/arch/avr/src/common/up_initialize.c +++ b/arch/avr/src/common/up_initialize.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include diff --git a/arch/hc/src/common/up_initialize.c b/arch/hc/src/common/up_initialize.c index d5e49442fd..dce13c86e9 100644 --- a/arch/hc/src/common/up_initialize.c +++ b/arch/hc/src/common/up_initialize.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include "up_arch.h" #include "up_internal.h" diff --git a/arch/mips/src/common/up_initialize.c b/arch/mips/src/common/up_initialize.c index a6e3e55773..de82d83794 100644 --- a/arch/mips/src/common/up_initialize.c +++ b/arch/mips/src/common/up_initialize.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include diff --git a/arch/sh/src/common/up_initialize.c b/arch/sh/src/common/up_initialize.c index 9b43b2a943..061923016c 100644 --- a/arch/sh/src/common/up_initialize.c +++ b/arch/sh/src/common/up_initialize.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include "up_arch.h" #include "up_internal.h" diff --git a/arch/sim/src/up_initialize.c b/arch/sim/src/up_initialize.c index 16fff605b1..38527aca84 100644 --- a/arch/sim/src/up_initialize.c +++ b/arch/sim/src/up_initialize.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include "up_internal.h" diff --git a/arch/x86/src/common/up_initialize.c b/arch/x86/src/common/up_initialize.c index 4e25ae415b..e5462a4b8b 100644 --- a/arch/x86/src/common/up_initialize.c +++ b/arch/x86/src/common/up_initialize.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include diff --git a/arch/z16/src/common/up_initialize.c b/arch/z16/src/common/up_initialize.c index 0b27aa0ccc..1b53355f20 100644 --- a/arch/z16/src/common/up_initialize.c +++ b/arch/z16/src/common/up_initialize.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include diff --git a/drivers/syslog/ramlog.c b/drivers/syslog/ramlog.c index 47b0cd3cb2..0c612ec960 100644 --- a/drivers/syslog/ramlog.c +++ b/drivers/syslog/ramlog.c @@ -56,7 +56,7 @@ #include #include #include -#include +#include #include @@ -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/fs/fs_syslog.c b/fs/fs_syslog.c index 0e1a80ec87..12a3414c79 100644 --- a/fs/fs_syslog.c +++ b/fs/fs_syslog.c @@ -51,7 +51,7 @@ #include #include -#include +#include #include "fs_internal.h" diff --git a/include/nuttx/ramlog.h b/include/nuttx/syslog/ramlog.h similarity index 96% rename from include/nuttx/ramlog.h rename to include/nuttx/syslog/ramlog.h index 7831ea509c..2777d34195 100644 --- a/include/nuttx/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 * * 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 -#include +#include #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/include/nuttx/syslog.h b/include/nuttx/syslog/syslog.h similarity index 94% rename from include/nuttx/syslog.h rename to include/nuttx/syslog/syslog.h index bb3c8f4930..0575f40183 100644 --- a/include/nuttx/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 * * 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/libc/stdio/lib_syslogstream.c b/libc/stdio/lib_syslogstream.c index 7aceeec786..59f79f3f8c 100644 --- a/libc/stdio/lib_syslogstream.c +++ b/libc/stdio/lib_syslogstream.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include "lib_internal.h"