diff options
author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-02-12 02:53:01 +0000 |
---|---|---|
committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-02-12 02:53:01 +0000 |
commit | a563ce3647874aa19778b177c1d0cd05b903a040 (patch) | |
tree | e8e7dcab12941f0b60901f00cc4520f17ab3c196 | |
parent | 57ae1bb52625c783f338c9ed2598d16237a6b77f (diff) | |
download | px4-firmware-a563ce3647874aa19778b177c1d0cd05b903a040.tar.gz px4-firmware-a563ce3647874aa19778b177c1d0cd05b903a040.tar.bz2 px4-firmware-a563ce3647874aa19778b177c1d0cd05b903a040.zip |
Fix some typos and compilation errors introduced in the last checkin
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4384 7fd9a85b-ad96-42d3-883c-3090e2eb8679
-rw-r--r-- | nuttx/arch/arm/src/common/up_internal.h | 2 | ||||
-rw-r--r-- | nuttx/arch/avr/src/at32uc3/at32uc3_config.h | 2 | ||||
-rw-r--r-- | nuttx/arch/avr/src/at90usb/at90usb_config.h | 2 | ||||
-rw-r--r-- | nuttx/arch/avr/src/atmega/atmega_config.h | 2 | ||||
-rw-r--r-- | nuttx/arch/avr/src/common/up_initialize.c | 2 | ||||
-rwxr-xr-x | nuttx/arch/hc/src/common/up_internal.h | 2 | ||||
-rwxr-xr-x | nuttx/arch/mips/src/common/up_internal.h | 2 | ||||
-rw-r--r-- | nuttx/arch/sh/src/common/up_internal.h | 2 | ||||
-rw-r--r-- | nuttx/arch/x86/src/common/up_internal.h | 2 | ||||
-rwxr-xr-x | nuttx/configs/stm3240g-eval/README.txt | 23 | ||||
-rw-r--r-- | nuttx/configs/stm3240g-eval/nsh2/defconfig | 32 | ||||
-rw-r--r-- | nuttx/drivers/ramlog.c | 18 | ||||
-rw-r--r-- | nuttx/include/nuttx/ramlog.h | 19 |
13 files changed, 95 insertions, 15 deletions
diff --git a/nuttx/arch/arm/src/common/up_internal.h b/nuttx/arch/arm/src/common/up_internal.h index 8ade816c7..c1c7ed9a6 100644 --- a/nuttx/arch/arm/src/common/up_internal.h +++ b/nuttx/arch/arm/src/common/up_internal.h @@ -79,7 +79,7 @@ # define USE_SERIALDRIVER 1 # define USE_EARLYSERIALINIT 1 # endif -#endig +#endif /* Determine which device to use as the system loggin device */ diff --git a/nuttx/arch/avr/src/at32uc3/at32uc3_config.h b/nuttx/arch/avr/src/at32uc3/at32uc3_config.h index b42520531..543b4e752 100644 --- a/nuttx/arch/avr/src/at32uc3/at32uc3_config.h +++ b/nuttx/arch/avr/src/at32uc3/at32uc3_config.h @@ -166,7 +166,7 @@ # undef USE_SERIALDRIVER # undef USE_EARLYSERIALINIT # endif -#endig +#endif /* Determine which device to use as the system loggin device */ diff --git a/nuttx/arch/avr/src/at90usb/at90usb_config.h b/nuttx/arch/avr/src/at90usb/at90usb_config.h index 41ad9957c..644005d5b 100644 --- a/nuttx/arch/avr/src/at90usb/at90usb_config.h +++ b/nuttx/arch/avr/src/at90usb/at90usb_config.h @@ -85,7 +85,7 @@ # undef USE_SERIALDRIVER # undef USE_EARLYSERIALINIT # endif -#endig +#endif /* Determine which device to use as the system loggin device */ diff --git a/nuttx/arch/avr/src/atmega/atmega_config.h b/nuttx/arch/avr/src/atmega/atmega_config.h index a168a2e47..39ab53e4b 100644 --- a/nuttx/arch/avr/src/atmega/atmega_config.h +++ b/nuttx/arch/avr/src/atmega/atmega_config.h @@ -90,7 +90,7 @@ # undef USE_SERIALDRIVER # undef USE_EARLYSERIALINIT # endif -#endig +#endif /* Determine which device to use as the system loggin device */ diff --git a/nuttx/arch/avr/src/common/up_initialize.c b/nuttx/arch/avr/src/common/up_initialize.c index 3bcbc0dc4..7f53ab8ae 100644 --- a/nuttx/arch/avr/src/common/up_initialize.c +++ b/nuttx/arch/avr/src/common/up_initialize.c @@ -76,7 +76,7 @@ # define USE_SERIALDRIVER 1 # define USE_EARLYSERIALINIT 1 # endif -#endig +#endif /* Determine which device to use as the system loggin device */ diff --git a/nuttx/arch/hc/src/common/up_internal.h b/nuttx/arch/hc/src/common/up_internal.h index 93572e404..f4574bf20 100755 --- a/nuttx/arch/hc/src/common/up_internal.h +++ b/nuttx/arch/hc/src/common/up_internal.h @@ -79,7 +79,7 @@ # define USE_SERIALDRIVER 1 # define USE_EARLYSERIALINIT 1 # endif -#endig +#endif /* Determine which device to use as the system loggin device */ diff --git a/nuttx/arch/mips/src/common/up_internal.h b/nuttx/arch/mips/src/common/up_internal.h index d43580c65..bdc8bace1 100755 --- a/nuttx/arch/mips/src/common/up_internal.h +++ b/nuttx/arch/mips/src/common/up_internal.h @@ -79,7 +79,7 @@ # define USE_SERIALDRIVER 1 # define USE_EARLYSERIALINIT 1 # endif -#endig +#endif /* Determine which device to use as the system loggin device */ diff --git a/nuttx/arch/sh/src/common/up_internal.h b/nuttx/arch/sh/src/common/up_internal.h index 50aad1478..9d0517c8b 100644 --- a/nuttx/arch/sh/src/common/up_internal.h +++ b/nuttx/arch/sh/src/common/up_internal.h @@ -83,7 +83,7 @@ # define USE_SERIALDRIVER 1 # define USE_EARLYSERIALINIT 1 # endif -#endig +#endif /* Determine which device to use as the system loggin device */ diff --git a/nuttx/arch/x86/src/common/up_internal.h b/nuttx/arch/x86/src/common/up_internal.h index c840cf90b..4fa98e0b3 100644 --- a/nuttx/arch/x86/src/common/up_internal.h +++ b/nuttx/arch/x86/src/common/up_internal.h @@ -78,7 +78,7 @@ # define USE_SERIALDRIVER 1 # define USE_EARLYSERIALINIT 1 # endif -#endig +#endif /* Determine which device to use as the system loggin device */ diff --git a/nuttx/configs/stm3240g-eval/README.txt b/nuttx/configs/stm3240g-eval/README.txt index 727b46d08..ef26c0088 100755 --- a/nuttx/configs/stm3240g-eval/README.txt +++ b/nuttx/configs/stm3240g-eval/README.txt @@ -694,9 +694,26 @@ Where <subdir> is one of the following: -CONFIG_STM32_SDIO=n : SDIO is enabled +CONFIG_STM32_SDIO=y - Logically, that is the only difference. There are, however, other configuration - differences as necessary to support this different device configuration. Just - the do the 'diff' if you are curious. + Logically, that is the only difference: This configuration has SDIO (and + the SD card) enabled and the serial console disabled. There is ONLY a + Telnet console!. + + There are some special settings to make life with only a Telnet + + CONFIG_SYSLOG=y - Enables the System Logging feature. + CONFIG_RAMLOG=y - Enable the RAM-based logging feature. + CONFIG_RAMLOG_CONSOLE=y - Use the RAM logger as the default console. + This means that any console output from non-Telnet threads will + go into the circular buffer in RAM. + CONFIG_RAMLOG_SYSLOG - This enables the RAM-based logger as the + system logger. This means that (1) in addition to the console + output from other tasks, ALL of the debug output will also to + to the circular buffer in RAM, and (2) NSH will now support a + command called 'dmesg' that can be used to dump the RAM log. + + There are a few other configuration differences as necessary to support + this different device configuration. Just the do the 'diff' if you are + curious. NOTES: 1. See the notes for the nsh configuration. Most also apply to the nsh2 diff --git a/nuttx/configs/stm3240g-eval/nsh2/defconfig b/nuttx/configs/stm3240g-eval/nsh2/defconfig index 804fc270e..bdcf5c888 100644 --- a/nuttx/configs/stm3240g-eval/nsh2/defconfig +++ b/nuttx/configs/stm3240g-eval/nsh2/defconfig @@ -527,6 +527,38 @@ CONFIG_SCHED_WAITPID=y CONFIG_SCHED_ATEXIT=n # +# System Logging +# +# CONFIG_SYSLOG - Enables the System Logging feature. +# CONFIG_RAMLOG - Enables the RAM logging feature +# CONFIG_RAMLOG_CONSOLE - Use the RAM logging device as a system console. +# If this feature is enabled (along with CONFIG_DEV_CONSOLE), then all +# console output will be re-directed to a circular buffer in RAM. This +# is useful, for example, if the only console is a Telnet console. Then +# in that case, console output from non-Telnet threads will go to the +# circular buffer and can be viewed using the NSH 'dmesg' command. +# CONFIG_RAMLOG_SYSLOG - Use the RAM logging device for the syslogging +# interface. If this feature is enabled (along with CONFIG_SYSLOG), +# then all debug output (only) will be re-directed to the circular +# buffer in RAM. This RAM log can be view from NSH using the 'dmesg' +# command. +# CONFIG_RAMLOG_NPOLLWAITERS - The number of threads than can be waiting +# for this driver on poll(). Default: 4 +# +# If CONFIG_RAMLOG_CONSOLE or CONFIG_RAMLOG_SYSLOG is selected, then the +# following may also be provided: +# +# CONFIG_RAMLOG_CONSOLE_BUFSIZE - Size of the console RAM log. Default: 1024 +# + +CONFIG_SYSLOG=y +CONFIG_RAMLOG=y +CONFIG_RAMLOG_CONSOLE=y +CONFIG_RAMLOG_SYSLOG=y= +#CONFIG_RAMLOG_NPOLLWAITERS +#CONFIG_RAMLOG_CONSOLE_BUFSIZE + +# # Settings for NXFLAT # # CONFIG_NXFLAT. Enable support for the NXFLAT binary format. diff --git a/nuttx/drivers/ramlog.c b/nuttx/drivers/ramlog.c index 53e57b1a0..6c24b0f95 100644 --- a/nuttx/drivers/ramlog.c +++ b/nuttx/drivers/ramlog.c @@ -419,6 +419,14 @@ static ssize_t ramlog_write(FAR struct file *filep, FAR const char *buffer, size ch = buffer[nwritten]; + /* Ignore carriage returns */ + +#ifdef CONFIG_RAMLOG_CRLF + if (ch == '\r') + { + continue; + } + /* Pre-pend a carriage before a linefeed */ if (ch == '\n') @@ -434,6 +442,7 @@ static ssize_t ramlog_write(FAR struct file *filep, FAR const char *buffer, size break; } } +#endif /* Then output the character */ @@ -732,6 +741,14 @@ int ramlog_putc(int ch) FAR struct ramlog_dev_s *priv = &g_sysdev; int ret; + /* Ignore carriage returns */ + +#ifdef CONFIG_RAMLOG_CRLF + if (ch == '\r') + { + return ch; + } + /* Pre-pend a newline with a carriage return */ if (ch == '\n') @@ -747,6 +764,7 @@ int ramlog_putc(int ch) return ch; } } +#endif (void)ramlog_addchar(priv, ch); return ch; diff --git a/nuttx/include/nuttx/ramlog.h b/nuttx/include/nuttx/ramlog.h index 8f1a0c702..eeef494ed 100644 --- a/nuttx/include/nuttx/ramlog.h +++ b/nuttx/include/nuttx/ramlog.h @@ -104,7 +104,7 @@ /* The normal behavior of the RAM log when used as a SYSLOG is to return * end-of-file if there is no data in the RAM log (rather than blocking until - * data is available). That allows you to cat the SYSLOG with no ill + * data is available). That allows you to 'cat' the SYSLOG with no ill * consequences. */ @@ -113,6 +113,15 @@ # define CONFIG_RAMLOG_NONBLOCKING 1 #endif +/* When used as a console or syslogging device, the RAM log will pre-pend + * line-feeds with carriage returns. + */ + +#if defined(CONFIG_RAMLOG_CONSOLE) || defined(CONFIG_RAMLOG_SYSLOG) +# undef CONFIG_RAMLOG_CRLF +# define CONFIG_RAMLOG_CRLF 1 +#endif + /**************************************************************************** * Public Data ****************************************************************************/ @@ -163,7 +172,7 @@ EXTERN int ramlog_register(FAR const char *devpath, FAR char *buffer, ****************************************************************************/ #ifdef CONFIG_RAMLOG_CONSOLE -EXTERN int ramlog_consoleinit(void) +EXTERN int ramlog_consoleinit(void); #endif /**************************************************************************** @@ -178,8 +187,12 @@ EXTERN int ramlog_consoleinit(void) * ****************************************************************************/ -#if !defined(CONFIG_RAMLOG_CONSOLE) && defined(CONFIG_RAMLOG_SYSLOG) +#ifdef CONFIG_RAMLOG_SYSLOG +#ifndef CONFIG_RAMLOG_CONSOLE EXTERN int ramlog_sysloginit(void); +#else +# define ramlog_sysloginit() +#endif #endif /**************************************************************************** |