You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/02/19 13:15:45 UTC
[incubator-nuttx] 01/02: syslog: Remove SYSLOG_SERIAL_CONSOLE which
isn't really used
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch pr302
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit cbbede9aedbbde6bf2f987b75e1a46da317d9f9b
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Feb 19 10:45:56 2020 +0800
syslog: Remove SYSLOG_SERIAL_CONSOLE which isn't really used
Change-Id: I9153c4cf5867165abb9ec8c77299cdeead0a256f
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
Documentation/NuttxPortingGuide.html | 8 ++------
boards/arm/samv7/samv71-xult/README.txt | 1 -
drivers/syslog/Kconfig | 5 -----
drivers/syslog/README.txt | 13 +++----------
4 files changed, 5 insertions(+), 22 deletions(-)
diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index 17f7652..626aed5 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -6716,7 +6716,7 @@ int syslog_initialize(void);
<ol>
<li>
<p><b>Low-Level Serial Output</b>.
- If you are using a SYSLOG console channel (<code>CONFIG_SYSLOG_CONSOLE</code>) with a serial console (<code>CONFIG_SYSLOG_SERIAL_CONSOLE</code>) and if the underlying architecture supports the low-level <code>up_putc()</code> interface(<code>CONFIG_ARCH_LOWPUTC</code>), then the SYLOG logic will direct the output to <code>up_putc()</code> which is capable of generating the serial output within the context of an interrupt handler.
+ If you are using a SYSLOG console channel (<code>CONFIG_SYSLOG_CONSOLE</code>) and if the underlying architecture supports the low-level <code>up_putc()</code> interface(<code>CONFIG_ARCH_LOWPUTC</code>), then the SYLOG logic will direct the output to <code>up_putc()</code> which is capable of generating the serial output within the context of an interrupt handler.
</p>
<p>
There are a few issues in doing this however:
@@ -6781,16 +6781,12 @@ int syslog_initialize(void);
</li>
<li>
<p>
- <code>CONFIG_SYSLOG_CONSOLE</code>. This configuration option is manually selected from the SYSLOG menu. This is the option that actually enables the SYSLOG console device. It depends on <code>CONFIG_DEV_CONSOLE</code> and it will automatically select <code>CONFIG_SYSLOG_SERIAL_CONSOLE</code> if <code>CONFIG_SERIAL_CONSOLE</code> is selected.
+ <code>CONFIG_SYSLOG_CONSOLE</code>. This configuration option is manually selected from the SYSLOG menu. This is the option that actually enables the SYSLOG console device. It depends on <code>CONFIG_DEV_CONSOLE</code>.
</li>
<li>
<p>
<code>CONFIG_ARCH_LOWPUTC</code>. This is an indication from the architecture configuration that the platform supports the <code>up_putc()</code> interface. <code>up_putc()</code> is a very low level UART interface that can even be used from interrupt handling.
</li>
- <li>
- <p>
- <code>CONFIG_SYSLOG_SERIAL_CONSOLE</code>. This enables certain features of the SYSLOG operation that depend on a serial console. If <code>CONFIG_ARCH_LOWPUTC</code> is also selected, for example, then <code>up_putc()</code> will be used for the forced SYSLOG output.
- </li>
</ul>
<p>
Interrupt level SYSLOG output will be lost unless: (1) the interrupt buffer
diff --git a/boards/arm/samv7/samv71-xult/README.txt b/boards/arm/samv7/samv71-xult/README.txt
index 21b3b10..426d09e 100644
--- a/boards/arm/samv7/samv71-xult/README.txt
+++ b/boards/arm/samv7/samv71-xult/README.txt
@@ -1902,7 +1902,6 @@ Configuration sub-directories
following in the .config file:
CONFIG_SYSLOG_CONSOLE=y
- CONFIG_SYSLOG_SERIAL_CONSOLE=y
7. Telnet: The clicker2-stm32 star point configuration supports the
Telnet daemon, but not the Telnet client; the star hub configuration
diff --git a/drivers/syslog/Kconfig b/drivers/syslog/Kconfig
index 181c209..0e18d32 100644
--- a/drivers/syslog/Kconfig
+++ b/drivers/syslog/Kconfig
@@ -126,10 +126,6 @@ config SYSLOG_PREFIX_STRING
---help---
The prefix string to be prepend.
-config SYSLOG_SERIAL_CONSOLE
- bool
- default n
-
choice
prompt "System log device"
default SYSLOG_CONSOLE if DEV_CONSOLE
@@ -156,7 +152,6 @@ config RAMLOG_SYSLOG
config SYSLOG_CONSOLE
bool "Log to /dev/console"
depends on DEV_CONSOLE
- select SYSLOG_SERIAL_CONSOLE if SERIAL_CONSOLE
select SYSLOG_WRITE
---help---
Use the system console as a SYSLOG output device.
diff --git a/drivers/syslog/README.txt b/drivers/syslog/README.txt
index 6b8541c..15d7b7e 100644
--- a/drivers/syslog/README.txt
+++ b/drivers/syslog/README.txt
@@ -235,9 +235,8 @@ SYSLOG Channels
1. Low-Level Serial Output
--------------------------
- If you are using a SYSLOG console channel (CONFIG_SYSLOG_CONSOLE) with a
- serial console (CONFIG_SYSLOG_SERIAL_CONSOLE) and if the underlying
- architecture supports the low-level up_putc() interface
+ If you are using a SYSLOG console channel (CONFIG_SYSLOG_CONSOLE) and if
+ the underlying architecture supports the low-level up_putc() interface
(CONFIG_ARCH_LOWPUTC), then the SYSLOG logic will direct the output to
up_putc() which is capable of generating the serial output within the
context of an interrupt handler.
@@ -301,17 +300,11 @@ SYSLOG Channel Options
There is no user selection.
* CONFIG_SYSLOG_CONSOLE. This configuration option is manually selected
from the SYSLOG menu. This is the option that acutally enables the
- SYSLOG console device. It depends on CONFIG_DEV_CONSOLE and it will
- automatically select CONFIG_SYSLOG_SERIAL_CONSOLE if
- CONFIG_SERIAL_CONSOLE is selected.
+ SYSLOG console device. It depends on CONFIG_DEV_CONSOLE.
* CONFIG_ARCH_LOWPUTC. This is an indication from the architecture
configuration that the platform supports the up_putc() interface.
up_putc() is a very low level UART interface that can even be used from
interrupt handling.
- * CONFIG_SYSLOG_SERIAL_CONSOLE. This enables certain features of the
- SYSLOG operation that depend on a serial console. If
- CONFIG_ARCH_LOWPUTC is also selected, for example, then up_putc() will
- be used for the forced SYSLOG output.
Interrupt level SYSLOG output will be lost unless: (1) the interrupt buffer
is enabled to support serialization, or (2) a serial console is used and