diff options
| -rw-r--r-- | nuttx/configs/pic32-starterkit/README.txt | 2 | ||||
| -rw-r--r-- | nuttx/configs/pic32-starterkit/nsh2/defconfig | 2 | ||||
| -rw-r--r-- | nuttx/configs/stm3220g-eval/nsh2/defconfig | 2 | ||||
| -rw-r--r-- | nuttx/configs/stm3240g-eval/nsh2/defconfig | 2 | ||||
| -rw-r--r-- | nuttx/configs/sure-pic32mx/README.txt | 2 | ||||
| -rw-r--r-- | nuttx/drivers/syslog/Kconfig | 2 | ||||
| -rw-r--r-- | nuttx/drivers/syslog/README.txt | 2 | ||||
| -rw-r--r-- | nuttx/drivers/syslog/ramlog.c | 4 | ||||
| -rw-r--r-- | nuttx/include/nuttx/syslog/ramlog.h | 6 |
9 files changed, 12 insertions, 12 deletions
diff --git a/nuttx/configs/pic32-starterkit/README.txt b/nuttx/configs/pic32-starterkit/README.txt index 034b89d32..0f0a545e4 100644 --- a/nuttx/configs/pic32-starterkit/README.txt +++ b/nuttx/configs/pic32-starterkit/README.txt @@ -1147,7 +1147,7 @@ Where <subdir> is one of the following: Logging is currently set up to use 16Kb of memory: - CONFIG_RAMLOG_CONSOLE_BUFSIZE=16384 + CONFIG_RAMLOG_BUFSIZE=16384 There are a few other configuration differences as necessary to support this different device configuration. Just the do the 'diff' if you are diff --git a/nuttx/configs/pic32-starterkit/nsh2/defconfig b/nuttx/configs/pic32-starterkit/nsh2/defconfig index cf0fc455a..0ac44bc69 100644 --- a/nuttx/configs/pic32-starterkit/nsh2/defconfig +++ b/nuttx/configs/pic32-starterkit/nsh2/defconfig @@ -525,7 +525,7 @@ CONFIG_SERIAL=y CONFIG_RAMLOG=y CONFIG_RAMLOG_SYSLOG=y # CONFIG_RAMLOG_CONSOLE is not set -CONFIG_RAMLOG_CONSOLE_BUFSIZE=16384 +CONFIG_RAMLOG_BUFSIZE=16384 # CONFIG_RAMLOG_CRLF is not set CONFIG_RAMLOG_NONBLOCKING=y CONFIG_RAMLOG_NPOLLWAITERS=4 diff --git a/nuttx/configs/stm3220g-eval/nsh2/defconfig b/nuttx/configs/stm3220g-eval/nsh2/defconfig index 88ed24d93..076e7cd70 100644 --- a/nuttx/configs/stm3220g-eval/nsh2/defconfig +++ b/nuttx/configs/stm3220g-eval/nsh2/defconfig @@ -610,7 +610,7 @@ CONFIG_SERIAL=y # CONFIG_RAMLOG=y CONFIG_RAMLOG_SYSLOG=y -CONFIG_RAMLOG_CONSOLE_BUFSIZE=1024 +CONFIG_RAMLOG_BUFSIZE=1024 # CONFIG_RAMLOG_CRLF is not set CONFIG_RAMLOG_NONBLOCKING=y CONFIG_RAMLOG_NPOLLWAITERS=4 diff --git a/nuttx/configs/stm3240g-eval/nsh2/defconfig b/nuttx/configs/stm3240g-eval/nsh2/defconfig index 01e2963d6..9f88c2fff 100644 --- a/nuttx/configs/stm3240g-eval/nsh2/defconfig +++ b/nuttx/configs/stm3240g-eval/nsh2/defconfig @@ -612,7 +612,7 @@ CONFIG_SERIAL=y # CONFIG_RAMLOG=y CONFIG_RAMLOG_SYSLOG=y -CONFIG_RAMLOG_CONSOLE_BUFSIZE=1024 +CONFIG_RAMLOG_BUFSIZE=1024 # CONFIG_RAMLOG_CRLF is not set CONFIG_RAMLOG_NONBLOCKING=y CONFIG_RAMLOG_NPOLLWAITERS=4 diff --git a/nuttx/configs/sure-pic32mx/README.txt b/nuttx/configs/sure-pic32mx/README.txt index 89f563efd..0c0b99427 100644 --- a/nuttx/configs/sure-pic32mx/README.txt +++ b/nuttx/configs/sure-pic32mx/README.txt @@ -932,7 +932,7 @@ Where <subdir> is one of the following: Logging is currently can be set up to use any amount of memory (here 8KB): - CONFIG_RAMLOG_CONSOLE_BUFSIZE=8192 + CONFIG_RAMLOG_BUFSIZE=8192 STATUS: 2013-7-4: This configuration was last verified. diff --git a/nuttx/drivers/syslog/Kconfig b/nuttx/drivers/syslog/Kconfig index 3ec8c7490..0d07bf4b2 100644 --- a/nuttx/drivers/syslog/Kconfig +++ b/nuttx/drivers/syslog/Kconfig @@ -43,7 +43,7 @@ config RAMLOG_CONSOLE 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_CONSOLE_BUFSIZE +config RAMLOG_BUFSIZE int "RAMLOG buffer size" default 1024 depends on RAMLOG_SYSLOG || RAMLOG_CONSOLE diff --git a/nuttx/drivers/syslog/README.txt b/nuttx/drivers/syslog/README.txt index a27b72d86..1bb5d5ea3 100644 --- a/nuttx/drivers/syslog/README.txt +++ b/nuttx/drivers/syslog/README.txt @@ -61,4 +61,4 @@ ramlog.c 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_RAMLOG_BUFSIZE - Size of the console RAM log. Default: 1024 diff --git a/nuttx/drivers/syslog/ramlog.c b/nuttx/drivers/syslog/ramlog.c index 2b28b1586..e73637f2a 100644 --- a/nuttx/drivers/syslog/ramlog.c +++ b/nuttx/drivers/syslog/ramlog.c @@ -136,7 +136,7 @@ static const struct file_operations g_ramlogfops = */ #if defined(CONFIG_RAMLOG_CONSOLE) || defined(CONFIG_RAMLOG_SYSLOG) -static char g_sysbuffer[CONFIG_RAMLOG_CONSOLE_BUFSIZE]; +static char g_sysbuffer[CONFIG_RAMLOG_BUFSIZE]; /* This is the device structure for the console or syslogging function. It * must be statically initialized because the RAMLOG syslog_putc function @@ -154,7 +154,7 @@ static struct ramlog_dev_s g_sysdev = #ifndef CONFIG_RAMLOG_NONBLOCKING SEM_INITIALIZER(0), /* rl_waitsem */ #endif - CONFIG_RAMLOG_CONSOLE_BUFSIZE, /* rl_bufsize */ + CONFIG_RAMLOG_BUFSIZE, /* rl_bufsize */ g_sysbuffer /* rl_buffer */ }; #endif diff --git a/nuttx/include/nuttx/syslog/ramlog.h b/nuttx/include/nuttx/syslog/ramlog.h index ab60426b1..0358d439f 100644 --- a/nuttx/include/nuttx/syslog/ramlog.h +++ b/nuttx/include/nuttx/syslog/ramlog.h @@ -82,7 +82,7 @@ * 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_RAMLOG_BUFSIZE - Size of the console RAM log. Default: 1024 */ #ifndef CONFIG_DEV_CONSOLE @@ -105,8 +105,8 @@ # undef CONFIG_RAMLOG_SYSLOG #endif -#ifndef CONFIG_RAMLOG_CONSOLE_BUFSIZE -# define CONFIG_RAMLOG_CONSOLE_BUFSIZE 1024 +#ifndef CONFIG_RAMLOG_BUFSIZE +# define CONFIG_RAMLOG_BUFSIZE 1024 #endif /* The normal behavior of the RAM log when used as a SYSLOG is to return |