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/18 18:36:49 UTC
[incubator-nuttx] branch pr297 updated (ba265e9 -> f43a534)
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a change to branch pr297
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from ba265e9 tools/testbuild.sh: select size_t to different type by testlist
new 8677384 arch/z80: Remove z80_lowserial_initialize related stuff
new 8a67489 drivers/serial: Remove the lowconsole driver
new ee7cf3a ramlog: Remove all ramlog_consoleinit related code
new f7ebc92 ramlog: Remove g_ramlog_syslog_channel since it's same as g_default_channel
new f43a534 arch: Cleanup syslog_console_init usage
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Documentation/NuttxPortingGuide.html | 31 +--
TODO | 7 -
arch/arm/src/common/up_initialize.c | 13 --
arch/arm/src/common/up_internal.h | 22 +-
arch/avr/src/at32uc3/at32uc3_config.h | 11 +-
arch/avr/src/at90usb/at90usb_config.h | 11 +-
arch/avr/src/atmega/atmega_config.h | 11 +-
arch/avr/src/common/up_initialize.c | 29 +--
arch/avr/src/common/up_internal.h | 8 -
arch/hc/src/common/up_initialize.c | 14 +-
arch/hc/src/common/up_internal.h | 25 +-
arch/mips/src/common/up_initialize.c | 14 +-
arch/mips/src/common/up_internal.h | 25 +-
arch/misoc/src/lm32/lm32.h | 15 +-
arch/misoc/src/lm32/lm32_initialize.c | 1 -
arch/misoc/src/minerva/minerva.h | 15 +-
arch/misoc/src/minerva/minerva_initialize.c | 1 -
arch/or1k/src/common/up_initialize.c | 14 +-
arch/or1k/src/common/up_internal.h | 25 +-
arch/renesas/src/common/up_initialize.c | 14 +-
arch/renesas/src/common/up_internal.h | 25 +-
arch/risc-v/src/common/up_initialize.c | 19 +-
arch/risc-v/src/common/up_internal.h | 15 +-
arch/sim/src/sim/up_initialize.c | 10 -
arch/sim/src/sim/up_internal.h | 3 +-
arch/x86/src/common/up_initialize.c | 14 +-
arch/x86/src/common/up_internal.h | 25 +-
arch/xtensa/src/common/xtensa.h | 23 +-
arch/xtensa/src/common/xtensa_initialize.c | 14 +-
arch/z16/src/common/up_initialize.c | 14 +-
arch/z16/src/common/up_internal.h | 23 +-
arch/z80/Kconfig | 7 -
arch/z80/src/common/up_initialize.c | 14 +-
arch/z80/src/common/z80_internal.h | 49 +---
arch/z80/src/ez80/Make.defs | 2 +-
arch/z80/src/ez80/ez80_lowuart.c | 256 ---------------------
arch/z80/src/z180/z180_lowscc.c | 22 --
arch/z80/src/z180/z180_lowserial.c | 18 --
arch/z80/src/z180/z180_lowuart.c | 22 --
arch/z80/src/z180/z180_serial.h | 30 ---
arch/z80/src/z8/Make.defs | 2 +-
arch/z80/src/z8/z8_lowuart.c | 134 -----------
.../kinetis/kwikstik-k40/configs/ostest/defconfig | 2 +-
.../lincoln60/configs/thttpd-binfs/defconfig | 2 +-
.../lpcxpresso-lpc1768/configs/thttpd/defconfig | 2 +-
.../olimex-lpc1766stk/configs/nettest/defconfig | 2 +-
.../configs/thttpd-binfs/defconfig | 2 +-
.../configs/thttpd-nxflat/defconfig | 2 +-
.../zkit-arm-1769/configs/hello/defconfig | 2 +-
.../zkit-arm-1769/configs/thttpd/defconfig | 2 +-
.../arm/lpc214x/zp214xpa/configs/nxlines/defconfig | 2 +-
.../arm/lpc31xx/ea3131/configs/usbserial/defconfig | 2 +-
boards/arm/lpc31xx/ea3152/configs/ostest/defconfig | 2 +-
boards/arm/sama5/sama5d2-xult/README.txt | 1 -
.../arm/sama5/sama5d3x-ek/configs/hello/defconfig | 2 +-
.../sama5/sama5d3x-ek/configs/norboot/defconfig | 2 +-
.../arm/sama5/sama5d3x-ek/configs/ov2640/defconfig | 2 +-
boards/arm/sama5/sama5d4-ek/README.txt | 1 -
boards/arm/samv7/samv71-xult/README.txt | 1 -
boards/arm/stm32/clicker2-stm32/README.txt | 1 -
.../stm32/olimex-stm32-p407/configs/kelf/defconfig | 2 +-
.../stm32/olimexino-stm32/configs/tiny/defconfig | 2 +-
.../arm/stm32/stm3210e-eval/configs/nx/defconfig | 2 +-
boards/arm/stm32/stm3220g-eval/README.txt | 2 +-
.../stm32/stm3220g-eval/configs/nettest/defconfig | 2 +-
.../stm32/stm3220g-eval/configs/telnetd/defconfig | 2 +-
boards/arm/stm32/stm3240g-eval/README.txt | 2 +-
.../stm32/stm3240g-eval/configs/nettest/defconfig | 2 +-
.../stm32/stm3240g-eval/configs/telnetd/defconfig | 2 +-
.../stm32/stm32f4discovery/configs/elf/defconfig | 2 +-
.../stm32f4discovery/configs/kostest/defconfig | 2 +-
.../stm32f4discovery/configs/posix_spawn/defconfig | 2 +-
.../stm32f4discovery/configs/winbuild/defconfig | 2 +-
.../olimex-strp711/configs/nettest/defconfig | 2 +-
boards/arm/tiva/eagle100/configs/httpd/defconfig | 2 +-
boards/arm/tiva/eagle100/configs/nettest/defconfig | 2 +-
boards/arm/tiva/eagle100/configs/nxflat/defconfig | 2 +-
boards/arm/tiva/eagle100/configs/thttpd/defconfig | 2 +-
.../avr/at32uc3/avr32dev1/configs/ostest/defconfig | 2 +-
.../at90usb/micropendous3/configs/hello/defconfig | 2 +-
.../avr/at90usb/teensy-2.0/configs/hello/defconfig | 2 +-
.../at90usb/teensy-2.0/configs/usbmsc/defconfig | 2 +-
boards/avr/atmega/amber/configs/hello/defconfig | 2 +-
.../arduino-mega2560/configs/hello/defconfig | 2 +-
.../atmega/moteino-mega/configs/hello/defconfig | 2 +-
boards/mips/pic32mx/pic32mx-starterkit/README.txt | 1 -
boards/mips/pic32mx/sure-pic32mx/README.txt | 1 -
.../renesas/m16c/skp16c26/configs/ostest/defconfig | 2 +-
boards/renesas/m16c/skp16c26/src/m16c_lcdconsole.c | 2 -
.../sh1/us7032evb1/configs/ostest/defconfig | 2 +-
boards/x86/qemu/qemu-i486/configs/ostest/defconfig | 2 +-
.../z16f/z16f2800100zcog/configs/ostest/defconfig | 2 +-
.../ez80/ez80f910200kitg/configs/ostest/defconfig | 2 +-
.../ez80/ez80f910200zco/configs/dhcpd/defconfig | 2 +-
.../ez80/ez80f910200zco/configs/httpd/defconfig | 2 +-
.../ez80/ez80f910200zco/configs/nettest/defconfig | 2 +-
.../z80/ez80/ez80f910200zco/configs/poll/defconfig | 2 +-
.../z80/z8/z8encore000zco/configs/ostest/defconfig | 2 +-
drivers/serial/Kconfig | 8 -
drivers/serial/Make.defs | 2 +-
drivers/serial/lowconsole.c | 134 -----------
drivers/syslog/Kconfig | 13 +-
drivers/syslog/README.txt | 31 +--
drivers/syslog/ramlog.c | 74 +-----
drivers/syslog/syslog_filechannel.c | 3 +-
drivers/syslog/syslog_initialize.c | 35 +--
include/nuttx/syslog/ramlog.h | 43 +---
include/nuttx/syslog/syslog.h | 15 +-
sched/init/nx_start.c | 2 +-
109 files changed, 134 insertions(+), 1379 deletions(-)
delete mode 100644 arch/z80/src/ez80/ez80_lowuart.c
delete mode 100644 arch/z80/src/z8/z8_lowuart.c
delete mode 100644 drivers/serial/lowconsole.c
[incubator-nuttx] 01/05: arch/z80: Remove z80_lowserial_initialize
related stuff
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch pr297
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 867738443447747057bae765bb47ed3ae11f0615
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Feb 18 11:42:54 2020 +0800
arch/z80: Remove z80_lowserial_initialize related stuff
since nobody call this function at all
Change-Id: I5cfdcd7ec1a40584a5693335c58c59d7ad63cdce
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/z80/Kconfig | 7 -
arch/z80/src/common/z80_internal.h | 11 --
arch/z80/src/ez80/Make.defs | 2 +-
arch/z80/src/ez80/ez80_lowuart.c | 256 -------------------------------------
arch/z80/src/z180/z180_lowscc.c | 22 ----
arch/z80/src/z180/z180_lowserial.c | 18 ---
arch/z80/src/z180/z180_lowuart.c | 22 ----
arch/z80/src/z180/z180_serial.h | 30 -----
arch/z80/src/z8/Make.defs | 2 +-
arch/z80/src/z8/z8_lowuart.c | 134 -------------------
10 files changed, 2 insertions(+), 502 deletions(-)
diff --git a/arch/z80/Kconfig b/arch/z80/Kconfig
index 2aee96f..a41ba39 100644
--- a/arch/z80/Kconfig
+++ b/arch/z80/Kconfig
@@ -338,7 +338,6 @@ config ARCH_CHIP_Z8F6403
select ARCH_CHIP_Z8
select ARCH_CHIP_Z8F640X
select ENDIAN_BIG
- select HAVE_LOWSERIALINIT
---help---
ZiLOG Z8F6403 (z8 Encore)
@@ -347,7 +346,6 @@ config ARCH_CHIP_Z8F6423
select ARCH_CHIP_Z8
select ARCH_CHIP_Z8F642X
select ENDIAN_BIG
- select HAVE_LOWSERIALINIT
---help---
ZiLOG Z8F6423 (z8 Encore)
@@ -383,7 +381,6 @@ config ARCH_CHIP_Z180
select ARCH_NOINTC
select ARCH_HAVE_ADDRENV
select ARCH_ADDRENV
- select HAVE_LOWSERIALINIT
config ARCH_CHIP_Z80180
bool
@@ -413,12 +410,8 @@ config ARCH_CHIP_Z8
config ARCH_CHIP_EZ80
bool
select MM_SMALL if EZ80_Z80MODE
- select HAVE_LOWSERIALINIT
select ARCH_HAVE_PHY
-config HAVE_LOWSERIALINIT
- bool
-
config ARCH_CHIP
string
default "z80" if ARCH_CHIP_Z80
diff --git a/arch/z80/src/common/z80_internal.h b/arch/z80/src/common/z80_internal.h
index 5b488c0..32e6605 100644
--- a/arch/z80/src/common/z80_internal.h
+++ b/arch/z80/src/common/z80_internal.h
@@ -59,18 +59,11 @@
#if defined(CONFIG_DEV_LOWCONSOLE)
# undef USE_SERIALDRIVER
-# ifdef CONFIG_HAVE_LOWSERIALINIT
-# define USE_LOWSERIALINIT 1
-# else
-# undef USE_LOWSERIALINIT
-# endif
#elif !defined(CONFIG_DEV_CONSOLE)
# undef USE_SERIALDRIVER
-# undef USE_LOWSERIALINIT
# undef CONFIG_DEV_LOWCONSOLE
# undef CONFIG_RAMLOG_CONSOLE
#else
-# undef USE_LOWSERIALINIT
# if defined(CONFIG_RAMLOG_CONSOLE)
# undef USE_SERIALDRIVER
# undef CONFIG_DEV_LOWCONSOLE
@@ -104,10 +97,6 @@ extern "C"
{
#endif
-#ifdef USE_LOWSERIALINIT
-void z80_lowserial_initialize(void);
-#endif
-
/* Defined in xyz_doirq.c */
FAR chipreg_t *z80_doirq(uint8_t irq, FAR chipreg_t *regs);
diff --git a/arch/z80/src/ez80/Make.defs b/arch/z80/src/ez80/Make.defs
index ac8c588..c369fd5 100644
--- a/arch/z80/src/ez80/Make.defs
+++ b/arch/z80/src/ez80/Make.defs
@@ -61,7 +61,7 @@ endif
CHIP_SSRCS =
CHIP_CSRCS = ez80_clock.c ez80_initialstate.c ez80_irq.c ez80_copystate.c
-CHIP_CSRCS += ez80_schedulesigaction.c ez80_sigdeliver.c ez80_lowuart.c
+CHIP_CSRCS += ez80_schedulesigaction.c ez80_sigdeliver.c
CHIP_CSRCS += ez80_timerisr.c ez80_serial.c
ifeq ($(CONFIG_ARCH_STACKDUMP),y)
diff --git a/arch/z80/src/ez80/ez80_lowuart.c b/arch/z80/src/ez80/ez80_lowuart.c
deleted file mode 100644
index d0029a8..0000000
--- a/arch/z80/src/ez80/ez80_lowuart.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/****************************************************************************
- * arch/z80/src/ez80/ez80_loweruart.c
- *
- * Copyright (C) 2008-2009, 2012 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <stdint.h>
-#include <string.h>
-
-#include <arch/io.h>
-#include <nuttx/arch.h>
-#include <nuttx/sched.h>
-
-#include "chip.h"
-#include "z80_internal.h"
-
-#ifdef USE_LOWSERIALINIT
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/* Is there any serial support? This might be the case if the board does
- * not have serial ports but supports stdout through, say, an LCD.
- */
-
-#if defined(CONFIG_EZ80_UART0) || defined(CONFIG_EZ80_UART1)
-# define HAVE_SERIAL
-#else
-# undef HAVE_SERIAL
-#endif
-
-/* Is one of the serial ports a console? */
-
-#if defined(CONFIG_UART0_SERIAL_CONSOLE) && defined(CONFIG_EZ80_UART0)
-# define HAVE_SERIALCONSOLE 1
-# undef CONFIG_UART1_SERIAL_CONSOLE
-#elif defined(CONFIG_UART1_SERIAL_CONSOLE) && defined(CONFIG_EZ80_UART1)
-# define HAVE_SERIALCONSOLE 1
-# undef CONFIG_UART0_SERIAL_CONSOLE
-#else
-# warning "No console is defined"
-# if defined(CONFIG_UART0_SERIAL_CONSOLE) || defined(CONFIG_UART1_SERIAL_CONSOLE)
-# error "A serial console selected, but corresponding UART not enabled"
-# endif
-# undef CONFIG_UART0_SERIAL_CONSOLE
-# undef CONFIG_UART1_SERIAL_CONSOLE
-# undef HAVE_SERIALCONSOLE
-#endif
-
-/* Select UART parameters for the selected console */
-
-#if defined(CONFIG_UART0_SERIAL_CONSOLE)
-# define ez80_inp(offs) inp((EZ80_UART0_BASE+(offs)))
-# define ez80_outp(offs,val) outp((EZ80_UART0_BASE+(offs)), (val))
-# define CONFIG_UART_BAUD CONFIG_UART0_BAUD
-# if CONFIG_UART0_BITS == 7
-# define CONFIG_UART_BITS EZ80_UARTCHAR_7BITS
-# else
-# define CONFIG_UART_BITS EZ80_UARTCHAR_8BITS
-# endif
-# if CONFIG_UART0_2STOP != 0
-# define CONFIG_UART_2STOP EZ80_UARTLCTl_2STOP
-# else
-# define CONFIG_UART_2STOP 0
-# endif
-# if CONFIG_UART0_PARITY == 1 /* Odd parity */
-# define CONFIG_UART_PARITY EZ80_UARTLCTL_PEN
-# elif CONFIG_UART0_PARITY == 2 /* Even parity */
-# define CONFIG_UART_PARITY (EZ80_UARTLCTL_PEN|EZ80_UARTLCTL_EPS)
-# else
-# define CONFIG_UART_PARITY 0
-# endif
-#elif defined(CONFIG_UART1_SERIAL_CONSOLE)
-# define ez80_inp(offs) inp((EZ80_UART1_BASE+(offs)))
-# define ez80_outp(offs.val) outp((EZ80_UART1_BASE+(offs)), (val))
-# define CONFIG_UART_BAUD CONFIG_UART1_BAUD
-# if CONFIG_UART1_BITS == 7
-# define CONFIG_UART_BITS EZ80_UARTCHAR_7BITS
-# else
-# define CONFIG_UART_BITS EZ80_UARTCHAR_8BITS
-# endif
-# if CONFIG_UART1_2STOP != 0
-# define CONFIG_UART_2STOP EZ80_UARTLCTl_2STOP
-# else
-# define CONFIG_UART_2STOP 0
-# endif
-# if CONFIG_UART1_PARITY == 1 /* Odd parity */
-# define CONFIG_UART_PARITY EZ80_UARTLCTL_PEN
-# elif CONFIG_UART1_PARITY == 2 /* Even parity */
-# define CONFIG_UART_PARITY (EZ80_UARTLCTL_PEN|EZ80_UARTLCTL_EPS)
-# else
-# define CONFIG_UART_PARITY 0
-# endif
-#endif
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-#if defined(HAVE_SERIALCONSOLE) && !defined(CONFIG_SUPPRESS_UART_CONFIG)
-static void ez80_setbaud(void)
-{
- uint32_t brg_divisor;
- uint8_t lctl;
-
- /* The resulting BAUD and depends on the system clock frequency and the
- * BRG divisor as follows:
- *
- * BAUD = SYSTEM_CLOCK_FREQUENCY / (16 * BRG_Divisor)
- *
- * Or
- *
- * BRG_Divisor = SYSTEM_CLOCK_FREQUENCY / 16 / BAUD
- *
- * NOTE: The system clock frequency value is defined in the board.h file
- */
-
- brg_divisor = (ez80_systemclock + (CONFIG_UART_BAUD << 3)) / (CONFIG_UART_BAUD << 4);
-
- /* Set the DLAB bit to enable access to the BRG registers */
-
- lctl = ez80_inp(EZ80_UART_LCTL);
- lctl |= EZ80_UARTLCTL_DLAB;
- ez80_outp(EZ80_UART_LCTL, lctl);
-
- ez80_outp(EZ80_UART_BRGL, (uint8_t)(brg_divisor & 0xff));
- ez80_outp(EZ80_UART_BRGH, (uint8_t)(brg_divisor >> 8));
-
- lctl &= ~EZ80_UARTLCTL_DLAB;
- ez80_outp(EZ80_UART_LCTL, lctl);
-}
-#endif /* HAVE_SERIALCONSOLE && !CONFIG_SUPPRESS_UART_CONFIG */
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: z80_lowserial_initialize
- ****************************************************************************/
-
-void z80_lowserial_initialize(void)
-{
-#ifdef HAVE_SERIAL
- uint8_t regval;
-
- /* Configure pins for usage of UARTs (whether or not we have a console) */
-
-#ifdef CONFIG_EZ80_UART0
- /* Set Port D, pins 0 and 1 for their alternate function (Mode 7) to enable UART0 */
-
- regval = inp(EZ80_PD_DDR);
- regval |= 3;
- outp(EZ80_PD_DDR, regval);
-
- regval = inp(EZ80_PD_ALT1);
- regval &= ~3;
- outp(EZ80_PD_ALT1, regval);
-
- regval = inp(EZ80_PD_ALT2);
- regval |= 3;
- outp(EZ80_PD_ALT2, regval);
-#endif
-
-#ifdef CONFIG_EZ80_UART1
- /* Set Port C, pins 0 and 1 for their alternate function (Mode 7) to enable UART1 */
-
- regval = inp(EZ80_PC_DDR);
- regval |= 3;
- outp(EZ80_PC_DDR, regval);
-
- regval = inp(EZ80_PC_ALT1);
- regval &= ~3;
- outp(EZ80_PC_ALT1, regval);
-
- regval = inp(EZ80_PC_ALT2);
- regval |= 3;
- outp(EZ80_PC_ALT2, regval);
-#endif
-
-#if defined(HAVE_SERIALCONSOLE) && !defined(CONFIG_SUPPRESS_UART_CONFIG)
- /* Disable interrupts from the UART */
-
- regval = ez80_inp(EZ80_UART_IER);
- regval &= ~EZ80_UARTEIR_INTMASK;
- ez80_outp(EZ80_UART_IER, regval);
-
- /* Set the baud rate */
-
- ez80_setbaud();
- ez80_outp(EZ80_UART_MCTL, 0);
-
- /* Set the character properties */
-
- regval = ez80_inp(EZ80_UART_LCTL);
- regval &= ~EZ80_UARTLCTL_MASK;
- regval |= (CONFIG_UART_BITS | CONFIG_UART_2STOP | CONFIG_UART_PARITY);
- ez80_outp(EZ80_UART_LCTL, regval);
-
- /* Enable and flush the receive FIFO */
-
- regval = EZ80_UARTFCTL_FIFOEN;
- ez80_outp(EZ80_UART_FCTL, regval);
- regval |= (EZ80_UARTFCTL_CLRTxF|EZ80_UARTFCTL_CLRRxF);
- ez80_outp(EZ80_UART_FCTL, regval);
-
- /* Set the receive trigger level to 1 */
-
- regval |= EZ80_UARTTRIG_1;
- ez80_outp(EZ80_UART_FCTL, regval);
-
-#endif /* HAVE_SERIALCONSOLE && !CONFIG_SUPPRESS_UART_CONFIG */
-#endif /* HAVE_SERIAL */
-}
-
-#endif /* USE_LOWSERIALINIT */
diff --git a/arch/z80/src/z180/z180_lowscc.c b/arch/z80/src/z180/z180_lowscc.c
index 1b281ff..b12ec3d 100644
--- a/arch/z80/src/z180/z180_lowscc.c
+++ b/arch/z80/src/z180/z180_lowscc.c
@@ -50,8 +50,6 @@
#include "common/z80_internal.h"
#include "z180_config.h"
-#if defined(USE_LOWSERIALINIT) && defined(HAVE_SCC)
-
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
@@ -95,24 +93,6 @@
****************************************************************************/
/****************************************************************************
- * Name: z180_scc_lowinit
- *
- * Description:
- * Called early in the boot sequence to initialize the [E]SCC console
- * channel (only).
- *
- ****************************************************************************/
-
-#ifdef USE_LOWSERIALINIT
-void z180_scc_lowinit(void)
-{
-#ifdef HAVE_SCC_CONSOLE
-#warning "Missing logic"
-#endif
-}
-#endif
-
-/****************************************************************************
* Name: z180_putc
*
* Description:
@@ -135,5 +115,3 @@ txbe:
__endasm;
}
#endif
-
-#endif /* USE_LOWSERIALINIT && HAVE_SCC*/
diff --git a/arch/z80/src/z180/z180_lowserial.c b/arch/z80/src/z180/z180_lowserial.c
index 68a40df..6e985de 100644
--- a/arch/z80/src/z180/z180_lowserial.c
+++ b/arch/z80/src/z180/z180_lowserial.c
@@ -63,24 +63,6 @@
****************************************************************************/
/****************************************************************************
- * Name: z80_lowserial_initialize
- *
- * Description:
- * Called early in the boot sequence to initialize the serial ports
- *
- ****************************************************************************/
-
-#ifdef USE_LOWSERIALINIT
-void z80_lowserial_initialize(void)
-{
- /* Initialize UART and [E]SCC serial devices */
-
- z180_uart_lowinit();
- z180_scc_lowinit();
-}
-#endif
-
-/****************************************************************************
* Name: up_putc/up_lowputc
*
* Description:
diff --git a/arch/z80/src/z180/z180_lowuart.c b/arch/z80/src/z180/z180_lowuart.c
index 8ec775c..eeade15 100644
--- a/arch/z80/src/z180/z180_lowuart.c
+++ b/arch/z80/src/z180/z180_lowuart.c
@@ -50,8 +50,6 @@
#include "common/z80_internal.h"
#include "z180_config.h"
-#if defined(USE_LOWSERIALINIT) && defined(HAVE_UART)
-
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
@@ -88,24 +86,6 @@
****************************************************************************/
/****************************************************************************
- * Name: z180_uart_lowinit
- *
- * Description:
- * Called early in the boot sequence to initialize the uart console
- * channel (only).
- *
- ****************************************************************************/
-
-#ifdef USE_LOWSERIALINIT
-void z180_uart_lowinit(void)
-{
-#ifdef HAVE_UART_CONSOLE
-#warning "Missing logic"
-#endif
-}
-#endif
-
-/****************************************************************************
* Name: z180_putc
*
* Description:
@@ -119,5 +99,3 @@ void z180_putc(uint8_t ch)
#warning "Missing logic"
}
#endif
-
-#endif /* USE_LOWSERIALINIT && HAVE_UART*/
diff --git a/arch/z80/src/z180/z180_serial.h b/arch/z80/src/z180/z180_serial.h
index b07c644..c72079e 100644
--- a/arch/z80/src/z180/z180_serial.h
+++ b/arch/z80/src/z180/z180_serial.h
@@ -54,36 +54,6 @@
****************************************************************************/
/****************************************************************************
- * Name: z180_uart_lowinit
- *
- * Description:
- * Called early in the boot sequence to initialize the uart console
- * channel (only).
- *
- ****************************************************************************/
-
-#if defined(HAVE_UART) && defined(USE_LOWSERIALINIT)
-void z180_uart_lowinit(void);
-#else
-# define z180_uart_lowinit()
-#endif
-
-/****************************************************************************
- * Name: z180_scc_lowinit
- *
- * Description:
- * Called early in the boot sequence to initialize the [E]SCC console
- * channel (only).
- *
- ****************************************************************************/
-
-#if defined(HAVE_SCC) && defined(USE_LOWSERIALINIT)
-void z180_scc_lowinit(void);
-#else
-# define z180_scc_lowinit()
-#endif
-
-/****************************************************************************
* Name: z180_putc
*
* Description:
diff --git a/arch/z80/src/z8/Make.defs b/arch/z80/src/z8/Make.defs
index 4f19363..023e5bb 100644
--- a/arch/z80/src/z8/Make.defs
+++ b/arch/z80/src/z8/Make.defs
@@ -44,7 +44,7 @@ CMN_CSRCS += up_mdelay.c up_stackframe.c up_udelay.c up_usestack.c
CHIP_SSRCS = z8_vector.S z8_saveusercontext.S z8_restorecontext.S
CHIP_CSRCS = z8_initialstate.c z8_irq.c z8_saveirqcontext.c
-CHIP_CSRCS += z8_schedulesigaction.c z8_sigdeliver.c z8_lowuart.c
+CHIP_CSRCS += z8_schedulesigaction.c z8_sigdeliver.c
CHIP_CSRCS += z8_serial.c z8_i2c.c z8_registerdump.c
ifneq ($(CONFIG_SCHED_TICKLESS),y)
diff --git a/arch/z80/src/z8/z8_lowuart.c b/arch/z80/src/z8/z8_lowuart.c
deleted file mode 100644
index c1b3393..0000000
--- a/arch/z80/src/z8/z8_lowuart.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/****************************************************************************
- * arch/z80/src/z8/z8_loweruart.c
- *
- * Copyright (C) 2008-2009, 2012 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <stdint.h>
-#include <string.h>
-#include <ez8.h>
-
-#include <nuttx/arch.h>
-#include <nuttx/sched.h>
-
-#include "chip.h"
-#include "z80_internal.h"
-
-#ifdef USE_LOWSERIALINIT
-
-extern uint32_t get_freq(void);
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: z80_lowserial_initialize
- ****************************************************************************/
-
-void z80_lowserial_initialize(void)
-{
-#if defined(CONFIG_UART0_SERIAL_CONSOLE) || \
- (defined(EZ8_UART1) && defined(CONFIG_UART1_SERIAL_CONSOLE))
- uint32_t freq = get_freq();
- uint16_t brg;
- uint8_t val;
-#endif
-
-#ifdef CONFIG_UART0_SERIAL_CONSOLE
- /* Set the baudrate */
-
- brg = (freq +(uint32_t)CONFIG_UART0_BAUD * 8) /((uint32_t)CONFIG_UART0_BAUD * 16) ;
-
- putreg8(brg >> 8, U0BRH);
- putreg8(brg & 0xff, U0BRL);
-
- /* Configure GPIO Port A pins 4 & 5 for alternate function */
-
- putreg8(0x02, PAADDR);
- val = getreg8(PACTL) | 0x30; /* Set bits in alternate function register */
- putreg8(val, PACTL);
- putreg8(0x07, PAADDR);
- val = getreg8(PACTL) & 0xcf; /* Reset bits in alternate function set-1 register */
- putreg8(val, PACTL);
- putreg8(0x08, PAADDR);
- val = getreg8(PACTL) & 0xcf; /* Reset bits in alternate function set-2 register */
- putreg8(val, PACTL);
- putreg8(0x00, PAADDR);
-
- putreg8(0x00, U0CTL1); /* no multi-processor operation mode */
- putreg8(0xc0, U0CTL0); /* Transmit enable, Receive enable, no Parity, 1 Stop bit */
-
-#elif defined(EZ8_UART1) && defined(CONFIG_UART1_SERIAL_CONSOLE)
- /* Set the baudrate */
-
- brg = (freq +(uint32_t)CONFIG_UART1_BAUD * 8) /((uint32_t)CONFIG_UART1_BAUD * 16) ;
-
- putreg8(brg >> 8, U1BRH);
- putreg8(brg & 0xff, U1BRL);
-
- /* Configure GPIO Port D pins 4 & 5 for alternate function */
-
- putreg8(0x02, PAADDR);
- val = getreg8(PDCTL) | 0x30; /* Set bits in alternate function register */
- putreg8(val, PDCTL);
- putreg8(0x07, PDADDR);
- val = getreg8(PDCTL) & 0xcf; /* Reset bits in alternate function set-1 register */
- putreg8(val, PDCTL);
- putreg8(0x08, PDADDR);
- val = getreg8(PDCTL) & 0xcf; /* Reset bits in alternate function set-2 register */
- putreg8(val, PDCTL);
- putreg8(0x00, PDADDR);
-
- putreg8(0x00, U1CTL1); /* no multi-processor operation mode */
- putreg8(0xc0, U1CTL0); /* Transmit enable, Receive enable, no Parity, 1 Stop bit */
-#endif
-}
-#endif /* USE_LOWSERIALINIT */
[incubator-nuttx] 04/05: ramlog: Remove g_ramlog_syslog_channel
since it's same as g_default_channel
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch pr297
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit f7ebc92caee70e379b489db15201a718025df8ef
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Feb 18 16:40:59 2020 +0800
ramlog: Remove g_ramlog_syslog_channel since it's same as g_default_channel
And remove syslog_init_e because all initialition is later now and we don't
distinguish the initialition phase anymore after ramlog don't need specially
initialize.
Change-Id: Ie6d06cd899196b5735073a714d371858beeb6643
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
Documentation/NuttxPortingGuide.html | 24 ++--------------
arch/arm/src/common/up_initialize.c | 8 ------
arch/avr/src/common/up_initialize.c | 8 ------
arch/hc/src/common/up_initialize.c | 8 ------
arch/mips/src/common/up_initialize.c | 8 ------
arch/or1k/src/common/up_initialize.c | 8 ------
arch/renesas/src/common/up_initialize.c | 8 ------
arch/risc-v/src/common/up_initialize.c | 8 ------
arch/sim/src/sim/up_initialize.c | 8 ------
arch/x86/src/common/up_initialize.c | 8 ------
arch/xtensa/src/common/xtensa_initialize.c | 8 ------
arch/z16/src/common/up_initialize.c | 8 ------
arch/z80/src/common/up_initialize.c | 8 ------
drivers/syslog/README.txt | 20 ++-----------
drivers/syslog/ramlog.c | 46 ++----------------------------
drivers/syslog/syslog_filechannel.c | 3 +-
drivers/syslog/syslog_initialize.c | 35 +++++++----------------
include/nuttx/syslog/ramlog.h | 4 +--
include/nuttx/syslog/syslog.h | 15 ++--------
sched/init/nx_start.c | 2 +-
20 files changed, 26 insertions(+), 219 deletions(-)
diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index ef2ffdb..17f7652 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -6668,9 +6668,9 @@ int syslog_channel(FAR const struct syslog_channel_s *channel);
<ul><pre>
#include <nuttx/syslog/syslog.h>
#ifndef CONFIG_ARCH_SYSLOG
-int syslog_initialize(enum syslog_init_e phase);
+int syslog_initialize(void);
#else
-# define syslog_initialize(phase)
+# define syslog_initialize()
#endif
</ul></pre>
<p><b>Description:</b>
@@ -6693,13 +6693,6 @@ int syslog_initialize(enum syslog_init_e phase);
If <code>CONFIG_ARCH_SYSLOG</code> is selected, then the architecture-specific logic will provide its own SYSLOG device initialize which must include as a minimum a call to <code>syslog_channel()</code> to use the device.
</li>
</ul>
-<p><b>Input Parameters:</b>
-<ul>
- <li>
- <p>
- <code>phase</code>: One of {<code>SYSLOG_INIT_EARLY</code>, <code>SYSLOG_INIT_LATE</code>}
- </li>
-</ul>
<p><b>Returned Value:</b>
Zero (<code>OK</code>) is returned on success; a negated <code>errno</code> value is returned on any failure.
</p>
@@ -6707,19 +6700,8 @@ int syslog_initialize(enum syslog_init_e phase);
Different types of SYSLOG devices have different OS initialization
requirements. Some are available immediately at reset, some are available
after some basic OS initialization, and some only after OS is fully
- initialized. In order to satisfy these different initialization
- requirements, <code>syslog_initialize()</code> is called twice from the boot-up logic:
+ initialized.
</p>
-<ul>
- <li>
- <p>
- <code>syslog_initialize()</code> is called from the architecture-specific <code>up_initialize()</code> function as some as basic hardware resources have been initialized: Timers, interrupts, etc. In this case, <code>syslog_initialize()</code> is called with the argument <code>SYSLOG_INIT_EARLY</code>.
- </li>
- <li>
- <p>
- <code>syslog_initialize()</code> is called again from <code>nx_start()</code> when the full OS initialization has completed, just before the application main entry point is spawned. In this case, <code>syslog_initialize()</code> is called with the argument <code>SYSLOG_INIT_LATE</code>.
- </li>
-</ul>
<p>
There are other types of SYSLOG channel devices that may require even further initialization. For example, the file SYSLOG channel (described below) cannot be initialized until the necessary file systems have been mounted.
</p>
diff --git a/arch/arm/src/common/up_initialize.c b/arch/arm/src/common/up_initialize.c
index e4d63b8..7e802f4 100644
--- a/arch/arm/src/common/up_initialize.c
+++ b/arch/arm/src/common/up_initialize.c
@@ -49,7 +49,6 @@
#include <nuttx/net/loopback.h>
#include <nuttx/net/tun.h>
#include <nuttx/net/telnet.h>
-#include <nuttx/syslog/syslog.h>
#include <nuttx/syslog/syslog_console.h>
#include <nuttx/serial/pty.h>
#include <nuttx/crypto/crypto.h>
@@ -201,13 +200,6 @@ void up_initialize(void)
ptmx_register();
#endif
- /* Early initialization of the system logging device. Some SYSLOG channel
- * can be initialized early in the initialization sequence because they
- * depend on only minimal OS initialization.
- */
-
- syslog_initialize(SYSLOG_INIT_EARLY);
-
#if defined(CONFIG_CRYPTO)
/* Initialize the HW crypto and /dev/crypto */
diff --git a/arch/avr/src/common/up_initialize.c b/arch/avr/src/common/up_initialize.c
index 7b4cbc1..4c76df0 100644
--- a/arch/avr/src/common/up_initialize.c
+++ b/arch/avr/src/common/up_initialize.c
@@ -48,7 +48,6 @@
#include <nuttx/net/loopback.h>
#include <nuttx/net/tun.h>
#include <nuttx/net/telnet.h>
-#include <nuttx/syslog/syslog.h>
#include <nuttx/syslog/syslog_console.h>
#include <nuttx/serial/pty.h>
#include <nuttx/crypto/crypto.h>
@@ -230,13 +229,6 @@ void up_initialize(void)
ptmx_register();
#endif
- /* Early initialization of the system logging device. Some SYSLOG channel
- * can be initialized early in the initialization sequence because they
- * depend on only minimal OS initialization.
- */
-
- syslog_initialize(SYSLOG_INIT_EARLY);
-
#if defined(CONFIG_CRYPTO)
/* Initialize the HW crypto and /dev/crypto */
diff --git a/arch/hc/src/common/up_initialize.c b/arch/hc/src/common/up_initialize.c
index 95b7a7a..3397f04 100644
--- a/arch/hc/src/common/up_initialize.c
+++ b/arch/hc/src/common/up_initialize.c
@@ -49,7 +49,6 @@
#include <nuttx/net/loopback.h>
#include <nuttx/net/tun.h>
#include <nuttx/net/telnet.h>
-#include <nuttx/syslog/syslog.h>
#include <nuttx/syslog/syslog_console.h>
#include <nuttx/serial/pty.h>
#include <nuttx/crypto/crypto.h>
@@ -163,13 +162,6 @@ void up_initialize(void)
ptmx_register();
#endif
- /* Early initialization of the system logging device. Some SYSLOG channel
- * can be initialized early in the initialization sequence because they
- * depend on only minimal OS initialization.
- */
-
- syslog_initialize(SYSLOG_INIT_EARLY);
-
#if defined(CONFIG_CRYPTO)
/* Initialize the HW crypto and /dev/crypto */
diff --git a/arch/mips/src/common/up_initialize.c b/arch/mips/src/common/up_initialize.c
index a741582..2bab501 100644
--- a/arch/mips/src/common/up_initialize.c
+++ b/arch/mips/src/common/up_initialize.c
@@ -49,7 +49,6 @@
#include <nuttx/net/loopback.h>
#include <nuttx/net/tun.h>
#include <nuttx/net/telnet.h>
-#include <nuttx/syslog/syslog.h>
#include <nuttx/syslog/syslog_console.h>
#include <nuttx/serial/pty.h>
#include <nuttx/crypto/crypto.h>
@@ -165,13 +164,6 @@ void up_initialize(void)
ptmx_register();
#endif
- /* Early initialization of the system logging device. Some SYSLOG channel
- * can be initialized early in the initialization sequence because they
- * depend on only minimal OS initialization.
- */
-
- syslog_initialize(SYSLOG_INIT_EARLY);
-
#if defined(CONFIG_CRYPTO)
/* Initialize the HW crypto and /dev/crypto */
diff --git a/arch/or1k/src/common/up_initialize.c b/arch/or1k/src/common/up_initialize.c
index e0015f1..bfc6d42 100644
--- a/arch/or1k/src/common/up_initialize.c
+++ b/arch/or1k/src/common/up_initialize.c
@@ -49,7 +49,6 @@
#include <nuttx/net/loopback.h>
#include <nuttx/net/tun.h>
#include <nuttx/net/telnet.h>
-#include <nuttx/syslog/syslog.h>
#include <nuttx/syslog/syslog_console.h>
#include <nuttx/serial/pty.h>
#include <nuttx/crypto/crypto.h>
@@ -256,13 +255,6 @@ void up_initialize(void)
ptmx_register();
#endif
- /* Early initialization of the system logging device. Some SYSLOG channel
- * can be initialized early in the initialization sequence because they
- * depend on only minimal OS initialization.
- */
-
- syslog_initialize(SYSLOG_INIT_EARLY);
-
/* Print OpenRISC CPU information */
or1k_print_cpuinfo();
diff --git a/arch/renesas/src/common/up_initialize.c b/arch/renesas/src/common/up_initialize.c
index 1e04034..af51398 100644
--- a/arch/renesas/src/common/up_initialize.c
+++ b/arch/renesas/src/common/up_initialize.c
@@ -49,7 +49,6 @@
#include <nuttx/net/loopback.h>
#include <nuttx/net/tun.h>
#include <nuttx/net/telnet.h>
-#include <nuttx/syslog/syslog.h>
#include <nuttx/syslog/syslog_console.h>
#include <nuttx/serial/pty.h>
#include <nuttx/crypto/crypto.h>
@@ -149,13 +148,6 @@ void up_initialize(void)
ptmx_register();
#endif
- /* Early initialization of the system logging device. Some SYSLOG channel
- * can be initialized early in the initialization sequence because they
- * depend on only minimal OS initialization.
- */
-
- syslog_initialize(SYSLOG_INIT_EARLY);
-
#if defined(CONFIG_CRYPTO)
/* Initialize the HW crypto and /dev/crypto */
diff --git a/arch/risc-v/src/common/up_initialize.c b/arch/risc-v/src/common/up_initialize.c
index a6d0191..989837b 100644
--- a/arch/risc-v/src/common/up_initialize.c
+++ b/arch/risc-v/src/common/up_initialize.c
@@ -44,7 +44,6 @@
#include <nuttx/arch.h>
#include <nuttx/board.h>
#include <nuttx/serial/pty.h>
-#include <nuttx/syslog/syslog.h>
#include <nuttx/drivers/drivers.h>
#include <arch/board/board.h>
@@ -147,12 +146,5 @@ void up_initialize(void)
ptmx_register();
#endif
- /* Early initialization of the system logging device. Some SYSLOG channel
- * can be initialized early in the initialization sequence because they
- * depend on only minimal OS initialization.
- */
-
- syslog_initialize(SYSLOG_INIT_EARLY);
-
board_autoled_on(LED_IRQSENABLED);
}
diff --git a/arch/sim/src/sim/up_initialize.c b/arch/sim/src/sim/up_initialize.c
index 5ef6abb..ee2531d 100644
--- a/arch/sim/src/sim/up_initialize.c
+++ b/arch/sim/src/sim/up_initialize.c
@@ -50,7 +50,6 @@
#include <nuttx/net/tun.h>
#include <nuttx/net/telnet.h>
#include <nuttx/mtd/mtd.h>
-#include <nuttx/syslog/syslog.h>
#include <nuttx/syslog/syslog_console.h>
#include <nuttx/serial/pty.h>
#include <nuttx/crypto/crypto.h>
@@ -240,13 +239,6 @@ void up_initialize(void)
ptmx_register();
#endif
- /* Early initialization of the system logging device. Some SYSLOG channel
- * can be initialized early in the initialization sequence because they
- * depend on only minimal OS initialization.
- */
-
- syslog_initialize(SYSLOG_INIT_EARLY);
-
#if defined(CONFIG_CRYPTO)
/* Initialize the HW crypto and /dev/crypto */
diff --git a/arch/x86/src/common/up_initialize.c b/arch/x86/src/common/up_initialize.c
index efc6f73..82731be 100644
--- a/arch/x86/src/common/up_initialize.c
+++ b/arch/x86/src/common/up_initialize.c
@@ -49,7 +49,6 @@
#include <nuttx/net/loopback.h>
#include <nuttx/net/tun.h>
#include <nuttx/net/telnet.h>
-#include <nuttx/syslog/syslog.h>
#include <nuttx/syslog/syslog_console.h>
#include <nuttx/serial/pty.h>
#include <nuttx/crypto/crypto.h>
@@ -165,13 +164,6 @@ void up_initialize(void)
ptmx_register();
#endif
- /* Early initialization of the system logging device. Some SYSLOG channel
- * can be initialized early in the initialization sequence because they
- * depend on only minimal OS initialization.
- */
-
- syslog_initialize(SYSLOG_INIT_EARLY);
-
#if defined(CONFIG_CRYPTO)
/* Initialize the HW crypto and /dev/crypto */
diff --git a/arch/xtensa/src/common/xtensa_initialize.c b/arch/xtensa/src/common/xtensa_initialize.c
index 5161468..9d92d6e 100644
--- a/arch/xtensa/src/common/xtensa_initialize.c
+++ b/arch/xtensa/src/common/xtensa_initialize.c
@@ -49,7 +49,6 @@
#include <nuttx/net/loopback.h>
#include <nuttx/net/tun.h>
#include <nuttx/net/telnet.h>
-#include <nuttx/syslog/syslog.h>
#include <nuttx/syslog/syslog_console.h>
#include <nuttx/serial/pty.h>
#include <nuttx/crypto/crypto.h>
@@ -173,13 +172,6 @@ void up_initialize(void)
ptmx_register();
#endif
- /* Early initialization of the system logging device. Some SYSLOG channel
- * can be initialized early in the initialization sequence because they
- * depend on only minimal OS initialization.
- */
-
- syslog_initialize(SYSLOG_INIT_EARLY);
-
#if defined(CONFIG_CRYPTO)
/* Initialize the HW crypto and /dev/crypto */
diff --git a/arch/z16/src/common/up_initialize.c b/arch/z16/src/common/up_initialize.c
index 51cd2eb..4ce2e09e 100644
--- a/arch/z16/src/common/up_initialize.c
+++ b/arch/z16/src/common/up_initialize.c
@@ -49,7 +49,6 @@
#include <nuttx/net/loopback.h>
#include <nuttx/net/tun.h>
#include <nuttx/net/telnet.h>
-#include <nuttx/syslog/syslog.h>
#include <nuttx/syslog/syslog_console.h>
#include <nuttx/serial/pty.h>
#include <nuttx/crypto/crypto.h>
@@ -165,13 +164,6 @@ void up_initialize(void)
ptmx_register();
#endif
- /* Early initialization of the system logging device. Some SYSLOG channel
- * can be initialized early in the initialization sequence because they
- * depend on only minimal OS initialization.
- */
-
- syslog_initialize(SYSLOG_INIT_EARLY);
-
#if defined(CONFIG_CRYPTO)
/* Initialize the HW crypto and /dev/crypto */
diff --git a/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/up_initialize.c
index 61556c9..beaf3d0 100644
--- a/arch/z80/src/common/up_initialize.c
+++ b/arch/z80/src/common/up_initialize.c
@@ -50,7 +50,6 @@
#include <nuttx/net/loopback.h>
#include <nuttx/net/telnet.h>
#include <nuttx/net/tun.h>
-#include <nuttx/syslog/syslog.h>
#include <nuttx/syslog/syslog_console.h>
#include <nuttx/serial/pty.h>
#include <nuttx/crypto/crypto.h>
@@ -164,13 +163,6 @@ void up_initialize(void)
ptmx_register();
#endif
- /* Early initialization of the system logging device. Some SYSLOG channel
- * can be initialized early in the initialization sequence because they
- * depend on minimal OS initialization.
- */
-
- syslog_initialize(SYSLOG_INIT_EARLY);
-
#if defined(CONFIG_CRYPTO)
/* Initialize the HW crypto and /dev/crypto */
diff --git a/drivers/syslog/README.txt b/drivers/syslog/README.txt
index dbc46df..6b8541c 100644
--- a/drivers/syslog/README.txt
+++ b/drivers/syslog/README.txt
@@ -189,9 +189,9 @@ SYSLOG Channels
Prototype:
#ifndef CONFIG_ARCH_SYSLOG
- int syslog_initialize(enum syslog_init_e phase);
+ int syslog_initialize(void);
#else
- # define syslog_initialize(phase)
+ # define syslog_initialize()
#endif
Description:
@@ -209,10 +209,6 @@ SYSLOG Channels
logic will provide its own SYSLOG device initialize which must include
as a minimum a call to syslog_channel() to use the device.
- Input Parameters:
-
- * phase - One of {SYSLOG_INIT_EARLY, SYSLOG_INIT_LATE}
-
Returned Value:
Zero (OK) is returned on success; a negated errno value is returned on
any failure.
@@ -220,17 +216,7 @@ SYSLOG Channels
Different types of SYSLOG devices have different OS initialization
requirements. Some are available immediately at reset, some are available
after some basic OS initialization, and some only after OS is fully
- initialized. In order to satisfy these different initialization
- requirements, syslog_initialize() is called twice from the boot-up logic:
-
- * syslog_initialize() is called from the architecture-specific
- up_initialize() function as some as basic hardware resources have been
- initialized: Timers, interrupts, etc. In this case,
- syslog_initialize() is called with the argument SYSLOG_INIT_EARLY.
- * syslog_initialize() is called again from nx_start() when the full OS
- initialization has completed, just before the application main entry
- point is spawned. In this case, syslog_initialize() is called with
- the argument SYSLOG_INIT_LATE.
+ initialized.
There are other types of SYSLOG channel devices that may require even
further initialization. For example, the file SYSLOG channel (described
diff --git a/drivers/syslog/ramlog.c b/drivers/syslog/ramlog.c
index bbb7670..7823d45 100644
--- a/drivers/syslog/ramlog.c
+++ b/drivers/syslog/ramlog.c
@@ -93,12 +93,6 @@ struct ramlog_dev_s
* Private Function Prototypes
****************************************************************************/
-/* Syslog channel methods */
-
-#ifdef CONFIG_RAMLOG_SYSLOG
-static int ramlog_flush(void);
-#endif
-
/* Helper functions */
#ifndef CONFIG_RAMLOG_NONBLOCKING
@@ -121,19 +115,6 @@ static int ramlog_poll(FAR struct file *filep, FAR struct pollfd *fds,
* Private Data
****************************************************************************/
-#ifdef CONFIG_RAMLOG_SYSLOG
-static const struct syslog_channel_s g_ramlog_syslog_channel =
-{
- ramlog_putc,
- ramlog_putc,
- ramlog_flush
-};
-#endif
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
static const struct file_operations g_ramlogfops =
{
NULL, /* open */
@@ -181,17 +162,6 @@ static struct ramlog_dev_s g_sysdev =
****************************************************************************/
/****************************************************************************
- * Name: ramlog_flush
- ****************************************************************************/
-
-#ifdef CONFIG_RAMLOG_SYSLOG
-static int ramlog_flush(void)
-{
- return OK;
-}
-#endif
-
-/****************************************************************************
* Name: ramlog_readnotify
****************************************************************************/
@@ -720,7 +690,7 @@ int ramlog_register(FAR const char *devpath, FAR char *buffer, size_t buflen)
}
/****************************************************************************
- * Name: ramlog_syslog_channel
+ * Name: ramlog_syslog_register
*
* Description:
* Use a pre-allocated RAM logging device and register it at the path
@@ -729,21 +699,11 @@ int ramlog_register(FAR const char *devpath, FAR char *buffer, size_t buflen)
****************************************************************************/
#ifdef CONFIG_RAMLOG_SYSLOG
-int ramlog_syslog_channel(void)
+void ramlog_syslog_register(void)
{
- int ret;
-
/* Register the syslog character driver */
- ret = register_driver(CONFIG_SYSLOG_DEVPATH, &g_ramlogfops, 0666, &g_sysdev);
- if (ret < 0)
- {
- return ret;
- }
-
- /* Use the RAMLOG as the SYSLOG channel */
-
- return syslog_channel(&g_ramlog_syslog_channel);
+ register_driver(CONFIG_SYSLOG_DEVPATH, &g_ramlogfops, 0666, &g_sysdev);
}
#endif
diff --git a/drivers/syslog/syslog_filechannel.c b/drivers/syslog/syslog_filechannel.c
index e7db192..ce6fa1f 100644
--- a/drivers/syslog/syslog_filechannel.c
+++ b/drivers/syslog/syslog_filechannel.c
@@ -178,8 +178,7 @@ int syslog_file_channel(FAR const char *devpath)
{
/* We should still be able to back-up and re-initialized everything */
- syslog_initialize(SYSLOG_INIT_EARLY);
- syslog_initialize(SYSLOG_INIT_LATE);
+ syslog_channel(saved_channel);
goto errout_with_lock;
}
diff --git a/drivers/syslog/syslog_initialize.c b/drivers/syslog/syslog_initialize.c
index 87c575b..45baf8d 100644
--- a/drivers/syslog/syslog_initialize.c
+++ b/drivers/syslog/syslog_initialize.c
@@ -71,7 +71,7 @@
* as a minimum a call to syslog_channel() to use the device.
*
* Input Parameters:
- * phase - One of {SYSLOG_INIT_EARLY, SYSLOG_INIT_LATE}
+ * None
*
* Returned Value:
* Zero (OK) is returned on success; a negated errno value is returned on
@@ -79,41 +79,26 @@
*
****************************************************************************/
-int syslog_initialize(enum syslog_init_e phase)
+int syslog_initialize(void)
{
int ret = OK;
#if defined(CONFIG_SYSLOG_CHAR)
- if (phase == SYSLOG_INIT_LATE)
- {
- /* Enable use of a character device as the SYSLOG device */
-
- ret = syslog_dev_channel();
- }
-
-#elif defined(CONFIG_RAMLOG_SYSLOG)
- if (phase == SYSLOG_INIT_EARLY)
- {
- /* Use the RAMLOG as the SYSLOG device */
-
- ret = ramlog_syslog_channel();
- }
+ /* Enable use of a character device as the SYSLOG device */
+ ret = syslog_dev_channel();
#elif defined(CONFIG_SYSLOG_CONSOLE)
- if (phase == SYSLOG_INIT_LATE)
- {
- /* Use the console device as the SYSLOG device */
+ /* Use the console device as the SYSLOG device */
- ret = syslog_console_channel();
- }
+ ret = syslog_console_channel();
+#endif
+#ifdef CONFIG_RAMLOG_SYSLOG
+ ramlog_syslog_register();
#endif
#ifdef CONFIG_SYSLOG_CHARDEV
- if (phase == SYSLOG_INIT_EARLY)
- {
- syslog_register();
- }
+ syslog_register();
#endif
return ret;
diff --git a/include/nuttx/syslog/ramlog.h b/include/nuttx/syslog/ramlog.h
index c25471e..a764eae 100644
--- a/include/nuttx/syslog/ramlog.h
+++ b/include/nuttx/syslog/ramlog.h
@@ -130,7 +130,7 @@ extern "C"
int ramlog_register(FAR const char *devpath, FAR char *buffer, size_t buflen);
/****************************************************************************
- * Name: ramlog_syslog_channel
+ * Name: ramlog_syslog_register
*
* Description:
* Create the RAM logging device and register it at the specified path.
@@ -139,7 +139,7 @@ int ramlog_register(FAR const char *devpath, FAR char *buffer, size_t buflen);
****************************************************************************/
#ifdef CONFIG_RAMLOG_SYSLOG
-int ramlog_syslog_channel(void);
+void ramlog_syslog_register(void);
#endif
/****************************************************************************
diff --git a/include/nuttx/syslog/syslog.h b/include/nuttx/syslog/syslog.h
index cd9a982..de57bdd 100644
--- a/include/nuttx/syslog/syslog.h
+++ b/include/nuttx/syslog/syslog.h
@@ -97,15 +97,6 @@
* Public Types
****************************************************************************/
-/* Initialization phases */
-
-enum syslog_init_e
-{
- SYSLOG_INIT_RESET = 0, /* Power on SYSLOG initialization phase */
- SYSLOG_INIT_EARLY, /* Early initialization in up_initialize() */
- SYSLOG_INIT_LATE /* Late initialization in nx_start(). */
-};
-
/* This structure provides the interface to a SYSLOG device */
typedef CODE ssize_t (*syslog_write_t)(FAR const char *buf, size_t buflen);
@@ -181,7 +172,7 @@ int syslog_channel(FAR const struct syslog_channel_s *channel);
* as a minimum a call to syslog_channel() to use the device.
*
* Input Parameters:
- * phase - One of {SYSLOG_INIT_EARLY, SYSLOG_INIT_LATE}
+ * None
*
* Returned Value:
* Zero (OK) is returned on success; a negated errno value is returned on
@@ -190,9 +181,9 @@ int syslog_channel(FAR const struct syslog_channel_s *channel);
****************************************************************************/
#ifndef CONFIG_ARCH_SYSLOG
-int syslog_initialize(enum syslog_init_e phase);
+int syslog_initialize(void);
#else
-# define syslog_initialize(phase)
+# define syslog_initialize()
#endif
/****************************************************************************
diff --git a/sched/init/nx_start.c b/sched/init/nx_start.c
index 8992cd5..c840cb9 100644
--- a/sched/init/nx_start.c
+++ b/sched/init/nx_start.c
@@ -801,7 +801,7 @@ void nx_start(void)
* depend on having IDLE task file structures setup.
*/
- syslog_initialize(SYSLOG_INIT_LATE);
+ syslog_initialize();
#ifdef CONFIG_SMP
/* Start all CPUs *********************************************************/
[incubator-nuttx] 05/05: arch: Cleanup syslog_console_init usage
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch pr297
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit f43a534ea82c4274541a4abe7e4b7304c32850b3
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Feb 18 15:43:51 2020 +0800
arch: Cleanup syslog_console_init usage
1.Remove the private declaration
2.Ensure nuttx/syslog/syslog_console.h get included
3.Remove syslog_console.h inclusion if not really used
Change-Id: I6d6267c38f0dfe37c56d4b1771dd1df5393fd0a5
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/misoc/src/lm32/lm32_initialize.c | 1 -
arch/misoc/src/minerva/minerva_initialize.c | 1 -
arch/risc-v/src/common/up_initialize.c | 1 +
arch/z80/src/common/z80_internal.h | 8 --------
4 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/arch/misoc/src/lm32/lm32_initialize.c b/arch/misoc/src/lm32/lm32_initialize.c
index aea7dba..f218dbd 100644
--- a/arch/misoc/src/lm32/lm32_initialize.c
+++ b/arch/misoc/src/lm32/lm32_initialize.c
@@ -50,7 +50,6 @@
#include <nuttx/net/tun.h>
#include <nuttx/net/telnet.h>
#include <nuttx/syslog/syslog.h>
-#include <nuttx/syslog/syslog_console.h>
#include <nuttx/serial/pty.h>
#include <nuttx/crypto/crypto.h>
#include <nuttx/power/pm.h>
diff --git a/arch/misoc/src/minerva/minerva_initialize.c b/arch/misoc/src/minerva/minerva_initialize.c
index 14d2d89..2c6714c 100644
--- a/arch/misoc/src/minerva/minerva_initialize.c
+++ b/arch/misoc/src/minerva/minerva_initialize.c
@@ -50,7 +50,6 @@
#include <nuttx/net/tun.h>
#include <nuttx/net/telnet.h>
#include <nuttx/syslog/syslog.h>
-#include <nuttx/syslog/syslog_console.h>
#include <nuttx/serial/pty.h>
#include <nuttx/crypto/crypto.h>
#include <nuttx/power/pm.h>
diff --git a/arch/risc-v/src/common/up_initialize.c b/arch/risc-v/src/common/up_initialize.c
index 989837b..142115a 100644
--- a/arch/risc-v/src/common/up_initialize.c
+++ b/arch/risc-v/src/common/up_initialize.c
@@ -44,6 +44,7 @@
#include <nuttx/arch.h>
#include <nuttx/board.h>
#include <nuttx/serial/pty.h>
+#include <nuttx/syslog/syslog_console.h>
#include <nuttx/drivers/drivers.h>
#include <arch/board/board.h>
diff --git a/arch/z80/src/common/z80_internal.h b/arch/z80/src/common/z80_internal.h
index 4c08e3c..59f8397 100644
--- a/arch/z80/src/common/z80_internal.h
+++ b/arch/z80/src/common/z80_internal.h
@@ -115,14 +115,6 @@ void rpmsg_serialinit(void);
# define rpmsg_serialinit()
#endif
-/* Defined in drivers/syslog_console.c */
-
-#ifdef CONFIG_CONSOLE_SYSLOG
-void syslog_console_init();
-#else
-# define syslog_console_init()
-#endif
-
/* Low level string output */
void up_puts(const char *str);
[incubator-nuttx] 02/05: drivers/serial: Remove the lowconsole
driver
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch pr297
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 8a674894a7648256f0d6d599742a0b2c2a18275f
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Feb 18 09:55:04 2020 +0800
drivers/serial: Remove the lowconsole driver
replace with the syslog console driver which has more capability than lowconsole
Change-Id: I108a587ecb22537c43a5a9e218556d242ab47b9a
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/common/up_initialize.c | 2 -
arch/arm/src/common/up_internal.h | 16 ---
arch/avr/src/at32uc3/at32uc3_config.h | 5 -
arch/avr/src/at90usb/at90usb_config.h | 5 -
arch/avr/src/atmega/atmega_config.h | 5 -
arch/avr/src/common/up_initialize.c | 9 +-
arch/avr/src/common/up_internal.h | 8 --
arch/hc/src/common/up_initialize.c | 4 +-
arch/hc/src/common/up_internal.h | 11 --
arch/mips/src/common/up_initialize.c | 4 +-
arch/mips/src/common/up_internal.h | 13 --
arch/misoc/src/lm32/lm32.h | 5 -
arch/misoc/src/minerva/minerva.h | 5 -
arch/or1k/src/common/up_initialize.c | 4 +-
arch/or1k/src/common/up_internal.h | 13 --
arch/renesas/src/common/up_initialize.c | 4 +-
arch/renesas/src/common/up_internal.h | 13 --
arch/risc-v/src/common/up_initialize.c | 4 +-
arch/risc-v/src/common/up_internal.h | 5 -
arch/x86/src/common/up_initialize.c | 4 +-
arch/x86/src/common/up_internal.h | 13 --
arch/xtensa/src/common/xtensa.h | 13 --
arch/xtensa/src/common/xtensa_initialize.c | 4 +-
arch/z16/src/common/up_initialize.c | 4 +-
arch/z16/src/common/up_internal.h | 13 +-
arch/z80/src/common/up_initialize.c | 4 +-
arch/z80/src/common/z80_internal.h | 17 +--
.../kinetis/kwikstik-k40/configs/ostest/defconfig | 2 +-
.../lincoln60/configs/thttpd-binfs/defconfig | 2 +-
.../lpcxpresso-lpc1768/configs/thttpd/defconfig | 2 +-
.../olimex-lpc1766stk/configs/nettest/defconfig | 2 +-
.../configs/thttpd-binfs/defconfig | 2 +-
.../configs/thttpd-nxflat/defconfig | 2 +-
.../zkit-arm-1769/configs/hello/defconfig | 2 +-
.../zkit-arm-1769/configs/thttpd/defconfig | 2 +-
.../arm/lpc214x/zp214xpa/configs/nxlines/defconfig | 2 +-
.../arm/lpc31xx/ea3131/configs/usbserial/defconfig | 2 +-
boards/arm/lpc31xx/ea3152/configs/ostest/defconfig | 2 +-
.../arm/sama5/sama5d3x-ek/configs/hello/defconfig | 2 +-
.../sama5/sama5d3x-ek/configs/norboot/defconfig | 2 +-
.../arm/sama5/sama5d3x-ek/configs/ov2640/defconfig | 2 +-
.../stm32/olimex-stm32-p407/configs/kelf/defconfig | 2 +-
.../stm32/olimexino-stm32/configs/tiny/defconfig | 2 +-
.../arm/stm32/stm3210e-eval/configs/nx/defconfig | 2 +-
.../stm32/stm3220g-eval/configs/nettest/defconfig | 2 +-
.../stm32/stm3220g-eval/configs/telnetd/defconfig | 2 +-
.../stm32/stm3240g-eval/configs/nettest/defconfig | 2 +-
.../stm32/stm3240g-eval/configs/telnetd/defconfig | 2 +-
.../stm32/stm32f4discovery/configs/elf/defconfig | 2 +-
.../stm32f4discovery/configs/kostest/defconfig | 2 +-
.../stm32f4discovery/configs/posix_spawn/defconfig | 2 +-
.../stm32f4discovery/configs/winbuild/defconfig | 2 +-
.../olimex-strp711/configs/nettest/defconfig | 2 +-
boards/arm/tiva/eagle100/configs/httpd/defconfig | 2 +-
boards/arm/tiva/eagle100/configs/nettest/defconfig | 2 +-
boards/arm/tiva/eagle100/configs/nxflat/defconfig | 2 +-
boards/arm/tiva/eagle100/configs/thttpd/defconfig | 2 +-
.../avr/at32uc3/avr32dev1/configs/ostest/defconfig | 2 +-
.../at90usb/micropendous3/configs/hello/defconfig | 2 +-
.../avr/at90usb/teensy-2.0/configs/hello/defconfig | 2 +-
.../at90usb/teensy-2.0/configs/usbmsc/defconfig | 2 +-
boards/avr/atmega/amber/configs/hello/defconfig | 2 +-
.../arduino-mega2560/configs/hello/defconfig | 2 +-
.../atmega/moteino-mega/configs/hello/defconfig | 2 +-
.../renesas/m16c/skp16c26/configs/ostest/defconfig | 2 +-
boards/renesas/m16c/skp16c26/src/m16c_lcdconsole.c | 2 -
.../sh1/us7032evb1/configs/ostest/defconfig | 2 +-
boards/x86/qemu/qemu-i486/configs/ostest/defconfig | 2 +-
.../z16f/z16f2800100zcog/configs/ostest/defconfig | 2 +-
.../ez80/ez80f910200kitg/configs/ostest/defconfig | 2 +-
.../ez80/ez80f910200zco/configs/dhcpd/defconfig | 2 +-
.../ez80/ez80f910200zco/configs/httpd/defconfig | 2 +-
.../ez80/ez80f910200zco/configs/nettest/defconfig | 2 +-
.../z80/ez80/ez80f910200zco/configs/poll/defconfig | 2 +-
.../z80/z8/z8encore000zco/configs/ostest/defconfig | 2 +-
drivers/serial/Kconfig | 8 --
drivers/serial/Make.defs | 2 +-
drivers/serial/lowconsole.c | 134 ---------------------
78 files changed, 60 insertions(+), 387 deletions(-)
diff --git a/arch/arm/src/common/up_initialize.c b/arch/arm/src/common/up_initialize.c
index 5056480..67d94ea 100644
--- a/arch/arm/src/common/up_initialize.c
+++ b/arch/arm/src/common/up_initialize.c
@@ -192,8 +192,6 @@ void up_initialize(void)
#if defined (CONFIG_ARM_LWL_CONSOLE)
lwlconsole_init();
-#elif defined(CONFIG_DEV_LOWCONSOLE)
- lowconsole_init();
#elif defined(CONFIG_CONSOLE_SYSLOG)
syslog_console_init();
#elif defined(CONFIG_RAMLOG_CONSOLE)
diff --git a/arch/arm/src/common/up_internal.h b/arch/arm/src/common/up_internal.h
index fcd30d0..9c96779 100644
--- a/arch/arm/src/common/up_internal.h
+++ b/arch/arm/src/common/up_internal.h
@@ -60,20 +60,14 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
# undef CONFIG_RAMLOG_CONSOLE
#else
# if defined(CONFIG_ARM_LWL_CONSOLE)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
# elif defined(CONFIG_RAMLOG_CONSOLE)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
-# elif defined(CONFIG_DEV_LOWCONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
# else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
@@ -454,19 +448,9 @@ void rpmsg_serialinit(void);
#endif
#ifdef CONFIG_ARM_LWL_CONSOLE
-
/* Defined in src/common/up_lwl_console.c */
void lwlconsole_init(void);
-
-#elif defined(CONFIG_DEV_LOWCONSOLE)
-
-/* Defined in drivers/lowconsole.c */
-
-void lowconsole_init(void);
-
-#else
-# define lowconsole_init()
#endif
/* DMA **********************************************************************/
diff --git a/arch/avr/src/at32uc3/at32uc3_config.h b/arch/avr/src/at32uc3/at32uc3_config.h
index 8d2c70f..ec5e57f 100644
--- a/arch/avr/src/at32uc3/at32uc3_config.h
+++ b/arch/avr/src/at32uc3/at32uc3_config.h
@@ -152,16 +152,11 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
# undef CONFIG_RAMLOG_CONSOLE
#else
# if defined(CONFIG_RAMLOG_CONSOLE)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
-# elif defined(CONFIG_DEV_LOWCONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
# elif defined(HAVE_RS232_DEVICE)
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
diff --git a/arch/avr/src/at90usb/at90usb_config.h b/arch/avr/src/at90usb/at90usb_config.h
index be9e431..6fa0771 100644
--- a/arch/avr/src/at90usb/at90usb_config.h
+++ b/arch/avr/src/at90usb/at90usb_config.h
@@ -71,16 +71,11 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
# undef CONFIG_RAMLOG_CONSOLE
#else
# if defined(CONFIG_RAMLOG_CONSOLE)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
-# elif defined(CONFIG_DEV_LOWCONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
# elif defined(HAVE_USART_DEVICE)
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
diff --git a/arch/avr/src/atmega/atmega_config.h b/arch/avr/src/atmega/atmega_config.h
index 6e02aab..38f2e99 100644
--- a/arch/avr/src/atmega/atmega_config.h
+++ b/arch/avr/src/atmega/atmega_config.h
@@ -77,16 +77,11 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
# undef CONFIG_RAMLOG_CONSOLE
#else
# if defined(CONFIG_RAMLOG_CONSOLE)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
-# elif defined(CONFIG_DEV_LOWCONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
# elif defined(HAVE_USART_DEVICE)
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
diff --git a/arch/avr/src/common/up_initialize.c b/arch/avr/src/common/up_initialize.c
index 04a5958..10efac3 100644
--- a/arch/avr/src/common/up_initialize.c
+++ b/arch/avr/src/common/up_initialize.c
@@ -76,16 +76,11 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
# undef CONFIG_RAMLOG_CONSOLE
#else
# if defined(CONFIG_RAMLOG_CONSOLE)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
-# elif defined(CONFIG_DEV_LOWCONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
# else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
@@ -231,9 +226,7 @@ void up_initialize(void)
* serial driver).
*/
-#if defined(CONFIG_DEV_LOWCONSOLE)
- lowconsole_init();
-#elif defined(CONFIG_CONSOLE_SYSLOG)
+#if defined(CONFIG_CONSOLE_SYSLOG)
syslog_console_init();
#elif defined(CONFIG_RAMLOG_CONSOLE)
ramlog_consoleinit();
diff --git a/arch/avr/src/common/up_internal.h b/arch/avr/src/common/up_internal.h
index fa42ea3..ae16ec2 100644
--- a/arch/avr/src/common/up_internal.h
+++ b/arch/avr/src/common/up_internal.h
@@ -159,14 +159,6 @@ void rpmsg_serialinit(void);
# define rpmsg_serialinit()
#endif
-/* Defined in drivers/lowconsole.c */
-
-#ifdef CONFIG_DEV_LOWCONSOLE
-void lowconsole_init(void);
-#else
-# define lowconsole_init()
-#endif
-
/* Defined in chip/xxx_ethernet.c */
#if defined(CONFIG_NET) && !defined(CONFIG_NETDEV_LATEINIT)
diff --git a/arch/hc/src/common/up_initialize.c b/arch/hc/src/common/up_initialize.c
index e2f7f92..f931ede 100644
--- a/arch/hc/src/common/up_initialize.c
+++ b/arch/hc/src/common/up_initialize.c
@@ -153,9 +153,7 @@ void up_initialize(void)
* serial driver).
*/
-#if defined(CONFIG_DEV_LOWCONSOLE)
- lowconsole_init();
-#elif defined(CONFIG_CONSOLE_SYSLOG)
+#if defined(CONFIG_CONSOLE_SYSLOG)
syslog_console_init();
#elif defined(CONFIG_RAMLOG_CONSOLE)
ramlog_consoleinit();
diff --git a/arch/hc/src/common/up_internal.h b/arch/hc/src/common/up_internal.h
index b8847ea..8681298 100644
--- a/arch/hc/src/common/up_internal.h
+++ b/arch/hc/src/common/up_internal.h
@@ -60,16 +60,11 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
# undef CONFIG_RAMLOG_CONSOLE
#else
# if defined(CONFIG_RAMLOG_CONSOLE)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
-# elif defined(CONFIG_DEV_LOWCONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
# else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
@@ -167,12 +162,6 @@ void rpmsg_serialinit(void);
# define rpmsg_serialinit()
#endif
-#ifdef CONFIG_DEV_LOWCONSOLE
-void lowconsole_init(void);
-#else
-# define lowconsole_init()
-#endif
-
void up_lowputc(char ch);
void up_puts(const char *str);
void up_lowputs(const char *str);
diff --git a/arch/mips/src/common/up_initialize.c b/arch/mips/src/common/up_initialize.c
index dc98820..559fe23 100644
--- a/arch/mips/src/common/up_initialize.c
+++ b/arch/mips/src/common/up_initialize.c
@@ -155,9 +155,7 @@ void up_initialize(void)
* serial driver).
*/
-#if defined(CONFIG_DEV_LOWCONSOLE)
- lowconsole_init();
-#elif defined(CONFIG_CONSOLE_SYSLOG)
+#if defined(CONFIG_CONSOLE_SYSLOG)
syslog_console_init();
#elif defined(CONFIG_RAMLOG_CONSOLE)
ramlog_consoleinit();
diff --git a/arch/mips/src/common/up_internal.h b/arch/mips/src/common/up_internal.h
index 6ba82f4..9a2c8d8 100644
--- a/arch/mips/src/common/up_internal.h
+++ b/arch/mips/src/common/up_internal.h
@@ -57,16 +57,11 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
# undef CONFIG_RAMLOG_CONSOLE
#else
# if defined(CONFIG_RAMLOG_CONSOLE)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
-# elif defined(CONFIG_DEV_LOWCONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
# else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
@@ -199,14 +194,6 @@ void up_copystate(uint32_t *dest, uint32_t *src);
void up_puts(const char *str);
void up_lowputs(const char *str);
-/* Defined in drivers/lowconsole.c */
-
-#ifdef CONFIG_DEV_LOWCONSOLE
-void lowconsole_init(void);
-#else
-# define lowconsole_init()
-#endif
-
/* Debug */
#ifdef CONFIG_ARCH_STACKDUMP
diff --git a/arch/misoc/src/lm32/lm32.h b/arch/misoc/src/lm32/lm32.h
index 9e21881..9b54bf2 100644
--- a/arch/misoc/src/lm32/lm32.h
+++ b/arch/misoc/src/lm32/lm32.h
@@ -77,16 +77,11 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
# undef CONFIG_RAMLOG_CONSOLE
#else
# if defined(CONFIG_RAMLOG_CONSOLE)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
-# elif defined(CONFIG_DEV_LOWCONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
# else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
diff --git a/arch/misoc/src/minerva/minerva.h b/arch/misoc/src/minerva/minerva.h
index c663704..086183d 100644
--- a/arch/misoc/src/minerva/minerva.h
+++ b/arch/misoc/src/minerva/minerva.h
@@ -77,16 +77,11 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
# undef CONFIG_RAMLOG_CONSOLE
#else
# if defined(CONFIG_RAMLOG_CONSOLE)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
-# elif defined(CONFIG_DEV_LOWCONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
# else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
diff --git a/arch/or1k/src/common/up_initialize.c b/arch/or1k/src/common/up_initialize.c
index def37ab..47981b9 100644
--- a/arch/or1k/src/common/up_initialize.c
+++ b/arch/or1k/src/common/up_initialize.c
@@ -246,9 +246,7 @@ void up_initialize(void)
* serial driver).
*/
-#if defined(CONFIG_DEV_LOWCONSOLE)
- lowconsole_init();
-#elif defined(CONFIG_CONSOLE_SYSLOG)
+#if defined(CONFIG_CONSOLE_SYSLOG)
syslog_console_init();
#elif defined(CONFIG_RAMLOG_CONSOLE)
ramlog_consoleinit();
diff --git a/arch/or1k/src/common/up_internal.h b/arch/or1k/src/common/up_internal.h
index da5ae50..8ba24d8 100644
--- a/arch/or1k/src/common/up_internal.h
+++ b/arch/or1k/src/common/up_internal.h
@@ -60,16 +60,11 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
# undef CONFIG_RAMLOG_CONSOLE
#else
# if defined(CONFIG_RAMLOG_CONSOLE)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
-# elif defined(CONFIG_DEV_LOWCONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
# else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
@@ -307,14 +302,6 @@ void rpmsg_serialinit(void);
# define rpmsg_serialinit()
#endif
-/* Defined in drivers/lowconsole.c */
-
-#ifdef CONFIG_DEV_LOWCONSOLE
-void lowconsole_init(void);
-#else
-# define lowconsole_init()
-#endif
-
/* DMA **********************************************************************/
#ifdef CONFIG_ARCH_DMA
diff --git a/arch/renesas/src/common/up_initialize.c b/arch/renesas/src/common/up_initialize.c
index ad0ae69..8f45916 100644
--- a/arch/renesas/src/common/up_initialize.c
+++ b/arch/renesas/src/common/up_initialize.c
@@ -139,9 +139,7 @@ void up_initialize(void)
* Architecture-specific logic will have to detect that case.
*/
-#if defined(CONFIG_DEV_LOWCONSOLE)
- lowconsole_init();
-#elif defined(CONFIG_CONSOLE_SYSLOG)
+#if defined(CONFIG_CONSOLE_SYSLOG)
syslog_console_init();
#elif defined(CONFIG_RAMLOG_CONSOLE)
ramlog_consoleinit();
diff --git a/arch/renesas/src/common/up_internal.h b/arch/renesas/src/common/up_internal.h
index 17fa607..d81e5e3 100644
--- a/arch/renesas/src/common/up_internal.h
+++ b/arch/renesas/src/common/up_internal.h
@@ -65,16 +65,11 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
# undef CONFIG_RAMLOG_CONSOLE
#else
# if defined(CONFIG_RAMLOG_CONSOLE)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
-# elif defined(CONFIG_DEV_LOWCONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
# else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
@@ -173,14 +168,6 @@ void rpmsg_serialinit(void);
# define rpmsg_serialinit()
#endif
-/* Defined in drivers/lowconsole.c */
-
-#ifdef CONFIG_DEV_LOWCONSOLE
-void lowconsole_init(void);
-#else
-# define lowconsole_init()
-#endif
-
/* Defined in xyz_watchdog.c */
void up_wdtinit(void);
diff --git a/arch/risc-v/src/common/up_initialize.c b/arch/risc-v/src/common/up_initialize.c
index 3dc6bd0..546a21e 100644
--- a/arch/risc-v/src/common/up_initialize.c
+++ b/arch/risc-v/src/common/up_initialize.c
@@ -137,9 +137,7 @@ void up_initialize(void)
* serial driver).
*/
-#if defined(CONFIG_DEV_LOWCONSOLE)
- lowconsole_init();
-#elif defined(CONFIG_CONSOLE_SYSLOG)
+#if defined(CONFIG_CONSOLE_SYSLOG)
syslog_console_init();
#elif defined(CONFIG_RAMLOG_CONSOLE)
ramlog_consoleinit();
diff --git a/arch/risc-v/src/common/up_internal.h b/arch/risc-v/src/common/up_internal.h
index 26e1343..72aa1eb 100644
--- a/arch/risc-v/src/common/up_internal.h
+++ b/arch/risc-v/src/common/up_internal.h
@@ -85,16 +85,11 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
# undef CONFIG_RAMLOG_CONSOLE
#else
# if defined(CONFIG_RAMLOG_CONSOLE)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
-# elif defined(CONFIG_DEV_LOWCONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
# else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
diff --git a/arch/x86/src/common/up_initialize.c b/arch/x86/src/common/up_initialize.c
index 2573373..4a4c767 100644
--- a/arch/x86/src/common/up_initialize.c
+++ b/arch/x86/src/common/up_initialize.c
@@ -155,9 +155,7 @@ void up_initialize(void)
* serial driver).
*/
-#if defined(CONFIG_DEV_LOWCONSOLE)
- lowconsole_init();
-#elif defined(CONFIG_CONSOLE_SYSLOG)
+#if defined(CONFIG_CONSOLE_SYSLOG)
syslog_console_init();
#elif defined(CONFIG_RAMLOG_CONSOLE)
ramlog_consoleinit();
diff --git a/arch/x86/src/common/up_internal.h b/arch/x86/src/common/up_internal.h
index e4a9bbc..729ba1a 100644
--- a/arch/x86/src/common/up_internal.h
+++ b/arch/x86/src/common/up_internal.h
@@ -59,16 +59,11 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
# undef CONFIG_RAMLOG_CONSOLE
#else
# if defined(CONFIG_RAMLOG_CONSOLE)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
-# elif defined(CONFIG_DEV_LOWCONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
# else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
@@ -210,14 +205,6 @@ void rpmsg_serialinit(void);
# define rpmsg_serialinit()
#endif
-/* Defined in drivers/lowconsole.c */
-
-#ifdef CONFIG_DEV_LOWCONSOLE
-void lowconsole_init(void);
-#else
-# define lowconsole_init()
-#endif
-
/* Defined in xyz_watchdog.c */
void up_wdtinit(void);
diff --git a/arch/xtensa/src/common/xtensa.h b/arch/xtensa/src/common/xtensa.h
index b8edff0..13f97ef 100644
--- a/arch/xtensa/src/common/xtensa.h
+++ b/arch/xtensa/src/common/xtensa.h
@@ -60,16 +60,11 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
# undef CONFIG_RAMLOG_CONSOLE
#else
# if defined(CONFIG_RAMLOG_CONSOLE)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
-# elif defined(CONFIG_DEV_LOWCONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
# else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
@@ -247,14 +242,6 @@ void xtensa_copystate(uint32_t *dest, uint32_t *src);
void up_puts(const char *str);
void up_lowputs(const char *str);
-/* Defined in drivers/lowconsole.c */
-
-#ifdef CONFIG_DEV_LOWCONSOLE
-void lowconsole_init(void);
-#else
-# define lowconsole_init()
-#endif
-
/* Debug */
#ifdef CONFIG_ARCH_STACKDUMP
diff --git a/arch/xtensa/src/common/xtensa_initialize.c b/arch/xtensa/src/common/xtensa_initialize.c
index f276284..997f676 100644
--- a/arch/xtensa/src/common/xtensa_initialize.c
+++ b/arch/xtensa/src/common/xtensa_initialize.c
@@ -163,9 +163,7 @@ void up_initialize(void)
* serial driver).
*/
-#if defined(CONFIG_DEV_LOWCONSOLE)
- lowconsole_init();
-#elif defined(CONFIG_CONSOLE_SYSLOG)
+#if defined(CONFIG_CONSOLE_SYSLOG)
syslog_console_init();
#elif defined(CONFIG_RAMLOG_CONSOLE)
ramlog_consoleinit();
diff --git a/arch/z16/src/common/up_initialize.c b/arch/z16/src/common/up_initialize.c
index dca43d6..32aa687 100644
--- a/arch/z16/src/common/up_initialize.c
+++ b/arch/z16/src/common/up_initialize.c
@@ -155,9 +155,7 @@ void up_initialize(void)
* serial driver).
*/
-#if defined(CONFIG_DEV_LOWCONSOLE)
- lowconsole_init();
-#elif defined(CONFIG_CONSOLE_SYSLOG)
+#if defined(CONFIG_CONSOLE_SYSLOG)
syslog_console_init();
#elif defined(CONFIG_RAMLOG_CONSOLE)
ramlog_consoleinit();
diff --git a/arch/z16/src/common/up_internal.h b/arch/z16/src/common/up_internal.h
index c1e922f..2e12797 100644
--- a/arch/z16/src/common/up_internal.h
+++ b/arch/z16/src/common/up_internal.h
@@ -61,23 +61,16 @@
* assumed.
*/
-#if defined(CONFIG_Z16_LOWPUTC) || defined(CONFIG_Z16_LOWGETC) || \
- defined(CONFIG_DEV_LOWCONSOLE)
-# define USE_LOWCONSOLE 1
+#if defined(CONFIG_Z16_LOWPUTC) || defined(CONFIG_Z16_LOWGETC)
# define USE_LOWUARTINIT 1
#elif !defined(CONFIG_DEV_CONSOLE)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
# undef CONFIG_RAMLOG_CONSOLE
#else
# if defined(CONFIG_RAMLOG_CONSOLE)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_DEV_LOWCONSOLE
-# elif defined(CONFIG_DEV_LOWCONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
# else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
@@ -163,10 +156,6 @@ void rpmsg_serialinit(void);
# define rpmsg_serialinit()
#endif
-#ifdef USE_LOWCONSOLE
-void lowconsole_init(void);
-#endif
-
/* Defined in xyz_irq.c */
void up_ack_irq(int irq);
diff --git a/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/up_initialize.c
index dbde260..4942511 100644
--- a/arch/z80/src/common/up_initialize.c
+++ b/arch/z80/src/common/up_initialize.c
@@ -154,9 +154,7 @@ void up_initialize(void)
* serial driver).
*/
-#if defined(CONFIG_DEV_LOWCONSOLE)
- lowconsole_init();
-#elif defined(CONFIG_CONSOLE_SYSLOG)
+#if defined(CONFIG_CONSOLE_SYSLOG)
syslog_console_init();
#elif defined(CONFIG_RAMLOG_CONSOLE)
ramlog_consoleinit();
diff --git a/arch/z80/src/common/z80_internal.h b/arch/z80/src/common/z80_internal.h
index 32e6605..365f8b3 100644
--- a/arch/z80/src/common/z80_internal.h
+++ b/arch/z80/src/common/z80_internal.h
@@ -57,21 +57,14 @@
* assumed.
*/
-#if defined(CONFIG_DEV_LOWCONSOLE)
-# undef USE_SERIALDRIVER
-#elif !defined(CONFIG_DEV_CONSOLE)
+#if !defined(CONFIG_DEV_CONSOLE)
# undef USE_SERIALDRIVER
-# undef CONFIG_DEV_LOWCONSOLE
# undef CONFIG_RAMLOG_CONSOLE
#else
# if defined(CONFIG_RAMLOG_CONSOLE)
# undef USE_SERIALDRIVER
-# undef CONFIG_DEV_LOWCONSOLE
# elif defined(CONFIG_CONSOLE_SYSLOG)
# undef USE_SERIALDRIVER
-# undef CONFIG_DEV_LOWCONSOLE
-# elif defined(CONFIG_DEV_LOWCONSOLE)
-# undef USE_SERIALDRIVER
# else
# define USE_SERIALDRIVER 1
# endif
@@ -125,14 +118,6 @@ void rpmsg_serialinit(void);
# define rpmsg_serialinit()
#endif
-/* Defined in drivers/lowconsole.c */
-
-#ifdef CONFIG_DEV_LOWCONSOLE
-void lowconsole_init(void);
-#else
-# define lowconsole_init()
-#endif
-
/* Defined in drivers/syslog_console.c */
#ifdef CONFIG_CONSOLE_SYSLOG
diff --git a/boards/arm/kinetis/kwikstik-k40/configs/ostest/defconfig b/boards/arm/kinetis/kwikstik-k40/configs/ostest/defconfig
index 1925776..433177a 100644
--- a/boards/arm/kinetis/kwikstik-k40/configs/ostest/defconfig
+++ b/boards/arm/kinetis/kwikstik-k40/configs/ostest/defconfig
@@ -16,7 +16,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_OABI_TOOLCHAIN=y
CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=9535
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_INTELHEX_BINARY=y
diff --git a/boards/arm/lpc17xx_40xx/lincoln60/configs/thttpd-binfs/defconfig b/boards/arm/lpc17xx_40xx/lincoln60/configs/thttpd-binfs/defconfig
index 923caf0..e1a66aa 100644
--- a/boards/arm/lpc17xx_40xx/lincoln60/configs/thttpd-binfs/defconfig
+++ b/boards/arm/lpc17xx_40xx/lincoln60/configs/thttpd-binfs/defconfig
@@ -16,7 +16,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=7982
CONFIG_BUILTIN=y
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POSIX_TIMERS=y
CONFIG_DISABLE_PTHREAD=y
diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/defconfig b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/defconfig
index 6f27672..ecd0f31 100644
--- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/defconfig
+++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/defconfig
@@ -14,7 +14,7 @@ CONFIG_ARCH_CHIP_LPC17XX_40XX=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_CODEREDL=y
CONFIG_BOARD_LOOPSPERMSEC=8079
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POSIX_TIMERS=y
CONFIG_DISABLE_PTHREAD=y
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nettest/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nettest/defconfig
index 6942ef7..14fc6ea 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nettest/defconfig
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nettest/defconfig
@@ -15,7 +15,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_OABI_TOOLCHAIN=y
CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=8111
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/defconfig
index 23903c1..4dfa78e 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/defconfig
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/defconfig
@@ -15,7 +15,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=8111
CONFIG_BUILTIN=y
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POSIX_TIMERS=y
CONFIG_DISABLE_PTHREAD=y
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig
index 7199a02..6c78c07 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig
@@ -14,7 +14,7 @@ CONFIG_ARCH_CHIP_LPC17XX_40XX=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=8111
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POSIX_TIMERS=y
CONFIG_DISABLE_PTHREAD=y
diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/hello/defconfig b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/hello/defconfig
index b348090..55f12d3 100644
--- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/hello/defconfig
+++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/hello/defconfig
@@ -15,7 +15,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_OABI_TOOLCHAIN=y
CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=8079
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POSIX_TIMERS=y
CONFIG_DISABLE_PTHREAD=y
diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/thttpd/defconfig b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/thttpd/defconfig
index 150578d..0a64b34 100644
--- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/thttpd/defconfig
+++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/thttpd/defconfig
@@ -15,7 +15,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_OABI_TOOLCHAIN=y
CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=8079
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POSIX_TIMERS=y
CONFIG_DISABLE_PTHREAD=y
diff --git a/boards/arm/lpc214x/zp214xpa/configs/nxlines/defconfig b/boards/arm/lpc214x/zp214xpa/configs/nxlines/defconfig
index acececb..94109ab 100644
--- a/boards/arm/lpc214x/zp214xpa/configs/nxlines/defconfig
+++ b/boards/arm/lpc214x/zp214xpa/configs/nxlines/defconfig
@@ -17,7 +17,7 @@ CONFIG_ARCH_CHIP_LPC2148=y
CONFIG_ARCH_CHIP_LPC214X=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=3270
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_EXAMPLES_NXLINES=y
CONFIG_EXAMPLES_NXLINES_BORDERCOLOR=0x01
CONFIG_EXAMPLES_NXLINES_BORDERWIDTH=4
diff --git a/boards/arm/lpc31xx/ea3131/configs/usbserial/defconfig b/boards/arm/lpc31xx/ea3131/configs/usbserial/defconfig
index 536b405..679ed84 100644
--- a/boards/arm/lpc31xx/ea3131/configs/usbserial/defconfig
+++ b/boards/arm/lpc31xx/ea3131/configs/usbserial/defconfig
@@ -17,7 +17,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARM_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=16945
CONFIG_BOOT_RUNFROMISRAM=y
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_EXAMPLES_USBSERIAL=y
CONFIG_HOST_WINDOWS=y
diff --git a/boards/arm/lpc31xx/ea3152/configs/ostest/defconfig b/boards/arm/lpc31xx/ea3152/configs/ostest/defconfig
index bafc083..4256c08 100644
--- a/boards/arm/lpc31xx/ea3152/configs/ostest/defconfig
+++ b/boards/arm/lpc31xx/ea3152/configs/ostest/defconfig
@@ -17,7 +17,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARM_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=16945
CONFIG_BOOT_RUNFROMISRAM=y
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_HOST_WINDOWS=y
diff --git a/boards/arm/sama5/sama5d3x-ek/configs/hello/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/hello/defconfig
index b0b0b1b..1992798 100644
--- a/boards/arm/sama5/sama5d3x-ek/configs/hello/defconfig
+++ b/boards/arm/sama5/sama5d3x-ek/configs/hello/defconfig
@@ -17,7 +17,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=49341
CONFIG_BOOT_RUNFROMISRAM=y
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_EXAMPLES_HELLO=y
diff --git a/boards/arm/sama5/sama5d3x-ek/configs/norboot/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/norboot/defconfig
index 1831a68..153f4a0 100644
--- a/boards/arm/sama5/sama5d3x-ek/configs/norboot/defconfig
+++ b/boards/arm/sama5/sama5d3x-ek/configs/norboot/defconfig
@@ -17,7 +17,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=49341
CONFIG_BOOT_RUNFROMISRAM=y
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_EXAMPLES_HELLO=y
diff --git a/boards/arm/sama5/sama5d3x-ek/configs/ov2640/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/ov2640/defconfig
index 333def4..98899b7 100644
--- a/boards/arm/sama5/sama5d3x-ek/configs/ov2640/defconfig
+++ b/boards/arm/sama5/sama5d3x-ek/configs/ov2640/defconfig
@@ -17,7 +17,7 @@ CONFIG_ARCH_LOWVECTORS=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=49341
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DRIVERS_VIDEO=y
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig
index 6f16f68..522e968 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig
@@ -19,7 +19,7 @@ CONFIG_BINFMT_CONSTRUCTORS=y
CONFIG_BOARD_LATE_INITIALIZE=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILD_PROTECTED=y
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_ELF=y
CONFIG_ELF_STACKSIZE=4096
CONFIG_EXAMPLES_ELF=y
diff --git a/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig b/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig
index cffad9a..35f104d 100644
--- a/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig
+++ b/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig
@@ -27,7 +27,7 @@ CONFIG_CAN_LOOPBACK=y
CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEFAULT_SMALL=y
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_EXAMPLES_CAN=y
CONFIG_FDCLONE_DISABLE=y
diff --git a/boards/arm/stm32/stm3210e-eval/configs/nx/defconfig b/boards/arm/stm32/stm3210e-eval/configs/nx/defconfig
index 8bbeb72..0647a38 100644
--- a/boards/arm/stm32/stm3210e-eval/configs/nx/defconfig
+++ b/boards/arm/stm32/stm3210e-eval/configs/nx/defconfig
@@ -21,7 +21,7 @@ CONFIG_ARCH_CHIP_STM32F103ZE=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=5483
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_POSIX_TIMERS=y
diff --git a/boards/arm/stm32/stm3220g-eval/configs/nettest/defconfig b/boards/arm/stm32/stm3220g-eval/configs/nettest/defconfig
index 118767c..1901afe 100644
--- a/boards/arm/stm32/stm3220g-eval/configs/nettest/defconfig
+++ b/boards/arm/stm32/stm3220g-eval/configs/nettest/defconfig
@@ -14,7 +14,7 @@ CONFIG_ARCH_CHIP_STM32F207IG=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=10926
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
diff --git a/boards/arm/stm32/stm3220g-eval/configs/telnetd/defconfig b/boards/arm/stm32/stm3220g-eval/configs/telnetd/defconfig
index 01e1803..9762a59 100644
--- a/boards/arm/stm32/stm3220g-eval/configs/telnetd/defconfig
+++ b/boards/arm/stm32/stm3220g-eval/configs/telnetd/defconfig
@@ -14,7 +14,7 @@ CONFIG_ARCH_CHIP_STM32F207IG=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=10926
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
diff --git a/boards/arm/stm32/stm3240g-eval/configs/nettest/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nettest/defconfig
index 7559757..4547e43 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/nettest/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/nettest/defconfig
@@ -15,7 +15,7 @@ CONFIG_ARCH_CHIP_STM32F407IG=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
diff --git a/boards/arm/stm32/stm3240g-eval/configs/telnetd/defconfig b/boards/arm/stm32/stm3240g-eval/configs/telnetd/defconfig
index 6f73e25..e2c6732 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/telnetd/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/telnetd/defconfig
@@ -15,7 +15,7 @@ CONFIG_ARCH_CHIP_STM32F407IG=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
diff --git a/boards/arm/stm32/stm32f4discovery/configs/elf/defconfig b/boards/arm/stm32/stm32f4discovery/configs/elf/defconfig
index 1d01657..d88c28c 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/elf/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/elf/defconfig
@@ -17,7 +17,7 @@ CONFIG_ARMV7M_USEBASEPRI=y
CONFIG_BINFMT_CONSTRUCTORS=y
CONFIG_BOARD_LATE_INITIALIZE=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_ELF=y
CONFIG_ELF_STACKSIZE=4096
CONFIG_EXAMPLES_ELF=y
diff --git a/boards/arm/stm32/stm32f4discovery/configs/kostest/defconfig b/boards/arm/stm32/stm32f4discovery/configs/kostest/defconfig
index f2f5f8b..ae85642 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/kostest/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/kostest/defconfig
@@ -17,7 +17,7 @@ CONFIG_ARM_MPU=y
CONFIG_BOARD_LATE_INITIALIZE=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILD_PROTECTED=y
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_HOST_WINDOWS=y
diff --git a/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/defconfig b/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/defconfig
index f65cf9e..8c6858c 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/defconfig
@@ -16,7 +16,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_BINFMT_CONSTRUCTORS=y
CONFIG_BOARDCTL_APP_SYMTAB=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_ELF=y
CONFIG_EXAMPLES_POSIXSPAWN=y
CONFIG_EXECFUNCS_HAVE_SYMTAB=y
diff --git a/boards/arm/stm32/stm32f4discovery/configs/winbuild/defconfig b/boards/arm/stm32/stm32f4discovery/configs/winbuild/defconfig
index 6909ed4..40e0201 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/winbuild/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/winbuild/defconfig
@@ -15,7 +15,7 @@ CONFIG_ARCH_CHIP_STM32F407VG=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_EXPERIMENTAL=y
diff --git a/boards/arm/str71x/olimex-strp711/configs/nettest/defconfig b/boards/arm/str71x/olimex-strp711/configs/nettest/defconfig
index 235c67f..af0f6c5 100644
--- a/boards/arm/str71x/olimex-strp711/configs/nettest/defconfig
+++ b/boards/arm/str71x/olimex-strp711/configs/nettest/defconfig
@@ -15,7 +15,7 @@ CONFIG_ARCH_CHIP_STR71X=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_ARM_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=1431
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_ENC28J60=y
diff --git a/boards/arm/tiva/eagle100/configs/httpd/defconfig b/boards/arm/tiva/eagle100/configs/httpd/defconfig
index c551b51..9fdef02 100644
--- a/boards/arm/tiva/eagle100/configs/httpd/defconfig
+++ b/boards/arm/tiva/eagle100/configs/httpd/defconfig
@@ -15,7 +15,7 @@ CONFIG_ARCH_CHIP_LM=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=4531
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
diff --git a/boards/arm/tiva/eagle100/configs/nettest/defconfig b/boards/arm/tiva/eagle100/configs/nettest/defconfig
index e6b2f33..feb3594 100644
--- a/boards/arm/tiva/eagle100/configs/nettest/defconfig
+++ b/boards/arm/tiva/eagle100/configs/nettest/defconfig
@@ -15,7 +15,7 @@ CONFIG_ARCH_CHIP_LM=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=4531
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
diff --git a/boards/arm/tiva/eagle100/configs/nxflat/defconfig b/boards/arm/tiva/eagle100/configs/nxflat/defconfig
index 8e46c3e..edabf1b 100644
--- a/boards/arm/tiva/eagle100/configs/nxflat/defconfig
+++ b/boards/arm/tiva/eagle100/configs/nxflat/defconfig
@@ -16,7 +16,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LATE_INITIALIZE=y
CONFIG_BOARD_LOOPSPERMSEC=4531
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_EXAMPLES_NXFLAT=y
CONFIG_FS_ROMFS=y
diff --git a/boards/arm/tiva/eagle100/configs/thttpd/defconfig b/boards/arm/tiva/eagle100/configs/thttpd/defconfig
index 85d839a..87d5b6d 100644
--- a/boards/arm/tiva/eagle100/configs/thttpd/defconfig
+++ b/boards/arm/tiva/eagle100/configs/thttpd/defconfig
@@ -15,7 +15,7 @@ CONFIG_ARCH_CHIP_LM=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
CONFIG_BOARD_LOOPSPERMSEC=4531
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_POSIX_TIMERS=y
CONFIG_DISABLE_PTHREAD=y
diff --git a/boards/avr/at32uc3/avr32dev1/configs/ostest/defconfig b/boards/avr/at32uc3/avr32dev1/configs/ostest/defconfig
index 52ee6f6..cd31e1f 100644
--- a/boards/avr/at32uc3/avr32dev1/configs/ostest/defconfig
+++ b/boards/avr/at32uc3/avr32dev1/configs/ostest/defconfig
@@ -20,7 +20,7 @@ CONFIG_AVR32_GPIOIRQSETA=0
CONFIG_AVR32_GPIOIRQSETB=0x0000000c
CONFIG_AVR32_USART1=y
CONFIG_BOARD_LOOPSPERMSEC=1140
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_ENDIAN_BIG=y
diff --git a/boards/avr/at90usb/micropendous3/configs/hello/defconfig b/boards/avr/at90usb/micropendous3/configs/hello/defconfig
index 67b16a4..de7d580 100644
--- a/boards/avr/at90usb/micropendous3/configs/hello/defconfig
+++ b/boards/avr/at90usb/micropendous3/configs/hello/defconfig
@@ -17,7 +17,7 @@ CONFIG_AVR_BUILDROOT_TOOLCHAIN=y
CONFIG_AVR_USART1=y
CONFIG_BOARD_LOOPSPERMSEC=864
CONFIG_DEFAULT_SMALL=y
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_PTHREAD=y
diff --git a/boards/avr/at90usb/teensy-2.0/configs/hello/defconfig b/boards/avr/at90usb/teensy-2.0/configs/hello/defconfig
index 1240e64..1cbbf0a 100644
--- a/boards/avr/at90usb/teensy-2.0/configs/hello/defconfig
+++ b/boards/avr/at90usb/teensy-2.0/configs/hello/defconfig
@@ -17,7 +17,7 @@ CONFIG_AVR_BUILDROOT_TOOLCHAIN=y
CONFIG_AVR_USART1=y
CONFIG_BOARD_LOOPSPERMSEC=864
CONFIG_DEFAULT_SMALL=y
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_PTHREAD=y
diff --git a/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig b/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig
index 7321ef8..61b826a 100644
--- a/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig
+++ b/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig
@@ -20,7 +20,7 @@ CONFIG_AVR_USART1=y
CONFIG_AVR_USBDEV=y
CONFIG_BOARD_LOOPSPERMSEC=864
CONFIG_DEFAULT_SMALL=y
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_HOST_WINDOWS=y
CONFIG_IDLETHREAD_STACKSIZE=512
diff --git a/boards/avr/atmega/amber/configs/hello/defconfig b/boards/avr/atmega/amber/configs/hello/defconfig
index ebc1fb0..62c8b06 100644
--- a/boards/avr/atmega/amber/configs/hello/defconfig
+++ b/boards/avr/atmega/amber/configs/hello/defconfig
@@ -17,7 +17,7 @@ CONFIG_AVR_BUILDROOT_TOOLCHAIN=y
CONFIG_AVR_USART0=y
CONFIG_BOARD_LOOPSPERMSEC=800
CONFIG_DEFAULT_SMALL=y
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_PTHREAD=y
diff --git a/boards/avr/atmega/arduino-mega2560/configs/hello/defconfig b/boards/avr/atmega/arduino-mega2560/configs/hello/defconfig
index 956990b..fbfe370 100644
--- a/boards/avr/atmega/arduino-mega2560/configs/hello/defconfig
+++ b/boards/avr/atmega/arduino-mega2560/configs/hello/defconfig
@@ -18,7 +18,7 @@ CONFIG_BOARD_LOOPSPERMSEC=800
CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEFAULT_SMALL=y
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_PTHREAD=y
diff --git a/boards/avr/atmega/moteino-mega/configs/hello/defconfig b/boards/avr/atmega/moteino-mega/configs/hello/defconfig
index fe408ea..a7c5b61 100644
--- a/boards/avr/atmega/moteino-mega/configs/hello/defconfig
+++ b/boards/avr/atmega/moteino-mega/configs/hello/defconfig
@@ -16,7 +16,7 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_AVR_USART0=y
CONFIG_BOARD_LOOPSPERMSEC=888
CONFIG_DEFAULT_SMALL=y
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_PTHREAD=y
diff --git a/boards/renesas/m16c/skp16c26/configs/ostest/defconfig b/boards/renesas/m16c/skp16c26/configs/ostest/defconfig
index 2465ac9..0220415 100644
--- a/boards/renesas/m16c/skp16c26/configs/ostest/defconfig
+++ b/boards/renesas/m16c/skp16c26/configs/ostest/defconfig
@@ -16,7 +16,7 @@ CONFIG_ARCH_RENESAS=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=16945
CONFIG_DEFAULT_SMALL=y
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_ENDIAN_BIG=y
diff --git a/boards/renesas/m16c/skp16c26/src/m16c_lcdconsole.c b/boards/renesas/m16c/skp16c26/src/m16c_lcdconsole.c
index d5fe115..695f06c 100644
--- a/boards/renesas/m16c/skp16c26/src/m16c_lcdconsole.c
+++ b/boards/renesas/m16c/skp16c26/src/m16c_lcdconsole.c
@@ -107,8 +107,6 @@ void up_earlyconsoleinit(void)
void up_consoleinit(void)
{
/* There is probably a problem if we are here */
-
- lowconsole_init();
}
#endif
diff --git a/boards/renesas/sh1/us7032evb1/configs/ostest/defconfig b/boards/renesas/sh1/us7032evb1/configs/ostest/defconfig
index 0e934c4..727e21e 100644
--- a/boards/renesas/sh1/us7032evb1/configs/ostest/defconfig
+++ b/boards/renesas/sh1/us7032evb1/configs/ostest/defconfig
@@ -14,7 +14,7 @@ CONFIG_ARCH_CHIP_SH7032=y
CONFIG_ARCH_RENESAS=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_BOARD_LOOPSPERMSEC=572
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
diff --git a/boards/x86/qemu/qemu-i486/configs/ostest/defconfig b/boards/x86/qemu/qemu-i486/configs/ostest/defconfig
index ad0814b..126b7d5 100644
--- a/boards/x86/qemu/qemu-i486/configs/ostest/defconfig
+++ b/boards/x86/qemu/qemu-i486/configs/ostest/defconfig
@@ -15,7 +15,7 @@ CONFIG_ARCH_X86=y
CONFIG_ARCH_X86_M32=y
CONFIG_BOARD_LOOPSPERMSEC=999
CONFIG_BOOT_RUNFROMEXTSRAM=y
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_FS_FAT=y
CONFIG_IDLETHREAD_STACKSIZE=2048
CONFIG_MAX_TASKS=64
diff --git a/boards/z16/z16f/z16f2800100zcog/configs/ostest/defconfig b/boards/z16/z16f/z16f2800100zcog/configs/ostest/defconfig
index cc25cf3..c9ac1ee 100644
--- a/boards/z16/z16f/z16f2800100zcog/configs/ostest/defconfig
+++ b/boards/z16/z16f/z16f2800100zcog/configs/ostest/defconfig
@@ -13,7 +13,7 @@ CONFIG_ARCH_CHIP_Z16F2811=y
CONFIG_ARCH_CHIP_Z16F=y
CONFIG_ARCH_Z16=y
CONFIG_BOARD_LOOPSPERMSEC=1250
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_ENDIAN_BIG=y
CONFIG_HOST_WINDOWS=y
CONFIG_IDLETHREAD_STACKSIZE=4096
diff --git a/boards/z80/ez80/ez80f910200kitg/configs/ostest/defconfig b/boards/z80/ez80/ez80f910200kitg/configs/ostest/defconfig
index 37a60e1..4aa81e8 100644
--- a/boards/z80/ez80/ez80f910200kitg/configs/ostest/defconfig
+++ b/boards/z80/ez80/ez80f910200kitg/configs/ostest/defconfig
@@ -14,7 +14,7 @@ CONFIG_ARCH_CHIP_EZ80=y
CONFIG_ARCH_CHIP_EZ80F91=y
CONFIG_ARCH_Z80=y
CONFIG_BOARD_LOOPSPERMSEC=1250
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
diff --git a/boards/z80/ez80/ez80f910200zco/configs/dhcpd/defconfig b/boards/z80/ez80/ez80f910200zco/configs/dhcpd/defconfig
index ea04861..5414cf3 100644
--- a/boards/z80/ez80/ez80f910200zco/configs/dhcpd/defconfig
+++ b/boards/z80/ez80/ez80f910200zco/configs/dhcpd/defconfig
@@ -15,7 +15,7 @@ CONFIG_ARCH_CHIP_EZ80F91=y
CONFIG_ARCH_TIMERHOOK=y
CONFIG_ARCH_Z80=y
CONFIG_BOARD_LOOPSPERMSEC=1250
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
diff --git a/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig b/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig
index 076bdbd..eecc329 100644
--- a/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig
+++ b/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig
@@ -14,7 +14,7 @@ CONFIG_ARCH_CHIP_EZ80F91=y
CONFIG_ARCH_TIMERHOOK=y
CONFIG_ARCH_Z80=y
CONFIG_BOARD_LOOPSPERMSEC=1250
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
diff --git a/boards/z80/ez80/ez80f910200zco/configs/nettest/defconfig b/boards/z80/ez80/ez80f910200zco/configs/nettest/defconfig
index fedd8f8..7663504 100644
--- a/boards/z80/ez80/ez80f910200zco/configs/nettest/defconfig
+++ b/boards/z80/ez80/ez80f910200zco/configs/nettest/defconfig
@@ -14,7 +14,7 @@ CONFIG_ARCH_CHIP_EZ80F91=y
CONFIG_ARCH_TIMERHOOK=y
CONFIG_ARCH_Z80=y
CONFIG_BOARD_LOOPSPERMSEC=1250
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
diff --git a/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig b/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig
index dae7dbf..978fb53 100644
--- a/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig
+++ b/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig
@@ -14,7 +14,7 @@ CONFIG_ARCH_CHIP_EZ80F91=y
CONFIG_ARCH_TIMERHOOK=y
CONFIG_ARCH_Z80=y
CONFIG_BOARD_LOOPSPERMSEC=1250
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
diff --git a/boards/z80/z8/z8encore000zco/configs/ostest/defconfig b/boards/z80/z8/z8encore000zco/configs/ostest/defconfig
index 44f3cd2..0bfe63b 100644
--- a/boards/z80/z8/z8encore000zco/configs/ostest/defconfig
+++ b/boards/z80/z8/z8encore000zco/configs/ostest/defconfig
@@ -16,7 +16,7 @@ CONFIG_ARCH_CHIP_Z8F640X=y
CONFIG_ARCH_Z80=y
CONFIG_BOARD_LOOPSPERMSEC=1250
CONFIG_DEFAULT_SMALL=y
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_CONSOLE_SYSLOG=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_MQUEUE=y
CONFIG_DISABLE_PTHREAD=y
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index b9de050..5f651e0 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -17,13 +17,6 @@ menuconfig SERIAL
if SERIAL
-config DEV_LOWCONSOLE
- bool "Low-level console support"
- default n
- depends on ARCH_LOWPUTC && DEV_CONSOLE
- ---help---
- Use the simple, low-level, write-only serial console driver (minimal support)
-
config SERIAL_PM_ACTIVITY_DOMAIN
int "PM activity domain"
default 0
@@ -93,7 +86,6 @@ config STANDARD_SERIAL
bool "Enable standard \"upper-half\" serial driver"
default y if MCU_SERIAL
default n if !MCU_SERIAL
- depends on !DEV_LOWCONSOLE
---help---
Enable the standard, upper-half serial driver used by most MCU serial peripherals.
diff --git a/drivers/serial/Make.defs b/drivers/serial/Make.defs
index 2a4a45a..35cb5d3 100644
--- a/drivers/serial/Make.defs
+++ b/drivers/serial/Make.defs
@@ -35,7 +35,7 @@
# Include serial drivers
-CSRCS += serial.c serial_io.c lowconsole.c
+CSRCS += serial.c serial_io.c
ifeq ($(CONFIG_SERIAL_RXDMA),y)
CSRCS += serial_dma.c
diff --git a/drivers/serial/lowconsole.c b/drivers/serial/lowconsole.c
deleted file mode 100644
index 173efe0..0000000
--- a/drivers/serial/lowconsole.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/****************************************************************************
- * drivers/serial/lowconsole.c
- *
- * Copyright (C) 2008-2009, 2012 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <sys/types.h>
-#include <errno.h>
-#include <debug.h>
-
-#include <nuttx/arch.h>
-#include <nuttx/fs/fs.h>
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/* The architecture must provide up_putc for this driver */
-
-#ifndef CONFIG_ARCH_LOWPUTC
-# error "Architecture must provide up_putc() for this driver"
-#endif
-
-/****************************************************************************
- * Private Function Prototypes
- ****************************************************************************/
-
-static ssize_t lowconsole_read(struct file *filep, char *buffer, size_t buflen);
-static ssize_t lowconsole_write(struct file *filep, const char *buffer, size_t buflen);
-static int lowconsole_ioctl(struct file *filep, int cmd, unsigned long arg);
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-static const struct file_operations g_consoleops =
-{
- NULL, /* open */
- NULL, /* close */
- lowconsole_read, /* read */
- lowconsole_write, /* write */
- NULL, /* seek */
- lowconsole_ioctl, /* ioctl */
- NULL /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
- , NULL /* unlink */
-#endif
-};
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: lowconsole_ioctl
- ****************************************************************************/
-
-static int lowconsole_ioctl(struct file *filep, int cmd, unsigned long arg)
-{
- return -ENOTTY;
-}
-
-/****************************************************************************
- * Name: lowconsole_read
- ****************************************************************************/
-
-static ssize_t lowconsole_read(struct file *filep, char *buffer, size_t buflen)
-{
- return 0;
-}
-
-/****************************************************************************
- * Name: lowconsole_write
- ****************************************************************************/
-
-static ssize_t lowconsole_write(struct file *filep, const char *buffer, size_t buflen)
-{
- ssize_t ret = buflen;
-
- for (; buflen; buflen--)
- {
- up_putc(*buffer++);
- }
-
- return ret;
-}
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: lowconsole_init
- ****************************************************************************/
-
-void lowconsole_init(void)
-{
- register_driver("/dev/console", &g_consoleops, 0666, NULL);
-}
[incubator-nuttx] 03/05: ramlog: Remove all ramlog_consoleinit
related code
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch pr297
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit ee7cf3a1c8775c391ec32b766758b598287a35f4
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Feb 18 02:10:15 2020 +0800
ramlog: Remove all ramlog_consoleinit related code
because we can get the same function by CONSOLE_SYSLOG/syslog_console_init.
BTW, it isn't a good choice to use g_ramlogfops as /dev/console since nsh
will read back what it send out which will surprise most people.
Change-Id: If1e4a8c3d8342a58015b9c7fc5422e44d5c77f9b
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
Documentation/NuttxPortingGuide.html | 7 ----
TODO | 7 ----
arch/arm/src/common/up_initialize.c | 3 --
arch/arm/src/common/up_internal.h | 6 +---
arch/avr/src/at32uc3/at32uc3_config.h | 6 +---
arch/avr/src/at90usb/at90usb_config.h | 6 +---
arch/avr/src/atmega/atmega_config.h | 6 +---
arch/avr/src/common/up_initialize.c | 12 ++-----
arch/hc/src/common/up_initialize.c | 2 --
arch/hc/src/common/up_internal.h | 14 +++-----
arch/mips/src/common/up_initialize.c | 2 --
arch/mips/src/common/up_internal.h | 12 ++-----
arch/misoc/src/lm32/lm32.h | 10 ++----
arch/misoc/src/minerva/minerva.h | 10 ++----
arch/or1k/src/common/up_initialize.c | 2 --
arch/or1k/src/common/up_internal.h | 12 ++-----
arch/renesas/src/common/up_initialize.c | 2 --
arch/renesas/src/common/up_internal.h | 12 ++-----
arch/risc-v/src/common/up_initialize.c | 6 ----
arch/risc-v/src/common/up_internal.h | 10 ++----
arch/sim/src/sim/up_initialize.c | 2 --
arch/sim/src/sim/up_internal.h | 3 +-
arch/x86/src/common/up_initialize.c | 2 --
arch/x86/src/common/up_internal.h | 12 ++-----
arch/xtensa/src/common/xtensa.h | 10 ++----
arch/xtensa/src/common/xtensa_initialize.c | 2 --
arch/z16/src/common/up_initialize.c | 2 --
arch/z16/src/common/up_internal.h | 10 ++----
arch/z80/src/common/up_initialize.c | 2 --
arch/z80/src/common/z80_internal.h | 13 +-------
boards/arm/sama5/sama5d2-xult/README.txt | 1 -
boards/arm/sama5/sama5d4-ek/README.txt | 1 -
boards/arm/samv7/samv71-xult/README.txt | 1 -
boards/arm/stm32/clicker2-stm32/README.txt | 1 -
boards/arm/stm32/stm3220g-eval/README.txt | 2 +-
boards/arm/stm32/stm3240g-eval/README.txt | 2 +-
boards/mips/pic32mx/pic32mx-starterkit/README.txt | 1 -
boards/mips/pic32mx/sure-pic32mx/README.txt | 1 -
drivers/syslog/Kconfig | 13 +-------
drivers/syslog/README.txt | 11 ++-----
drivers/syslog/ramlog.c | 28 ++--------------
include/nuttx/syslog/ramlog.h | 39 +++--------------------
42 files changed, 45 insertions(+), 261 deletions(-)
diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index e0a5d3e..ef2ffdb 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -6931,10 +6931,6 @@ int syslog_file_channel(FAR const char *devpath);
</li>
<li>
<p>
- <code>CONFIG_RAMLOG_CONSOLE</code>: Use the RAM logging device as a system console. If this feature is enabled (along with <code>CONFIG_DEV_CONSOLE</code>), then all console output will be re-directed to a circular buffer in RAM. This might be 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 <code>dmesg</code> command. This optional is not useful [...]
- </li>
- <li>
- <p>
<code>CONFIG_RAMLOG_SYSLOG</code>: Use the RAM logging device for the SYSLOG interface. If this feature is enabled, then all debug output will be re-directed to the circular buffer in RAM. This RAM log can be viewed from NSH using the <code>dmesg</code> command. NOTE: Unlike the limited, generic character driver SYSLOG device, the RAMLOG <i>can</i> be used to capture debug output from
interrupt level handlers.
</li>
@@ -6943,9 +6939,6 @@ int syslog_file_channel(FAR const char *devpath);
<code>CONFIG_RAMLOG_NPOLLWAITERS</code>: The number of threads than can be waiting for this driver on <code>poll()</code>. Default: 4
</li>
</ul>
-<p>
- If <code>CONFIG_RAMLOG_CONSOLE</code> or <code>CONFIG_RAMLOG_SYSLOG</code> is selected, then the following must also be provided:
-</p>
<ul>
<li>
<p>
diff --git a/TODO b/TODO
index 779a2be..961523d 100644
--- a/TODO
+++ b/TODO
@@ -2117,13 +2117,6 @@ o File system / Generic drivers (fs/, drivers/)
Status: Open
Priority: Medium-Low
- Title: CONFIG_RAMLOG_CONSOLE DOES NOT WORK
- Description: When I enable CONFIG_RAMLOG_CONSOLE, the system does not come up
- properly (using configuration stm3240g-eval/nsh2). The problem
- may be an assertion that is occurring before we have a console.
- Status: Open
- Priority: Medium
-
Title: UNIFIED DESCRIPTOR REPRESENTATION
Description: There are two separate ranges of descriptors for file and
socket descriptors: if a descriptor is in one range then it is
diff --git a/arch/arm/src/common/up_initialize.c b/arch/arm/src/common/up_initialize.c
index 67d94ea..e4d63b8 100644
--- a/arch/arm/src/common/up_initialize.c
+++ b/arch/arm/src/common/up_initialize.c
@@ -50,7 +50,6 @@
#include <nuttx/net/tun.h>
#include <nuttx/net/telnet.h>
#include <nuttx/syslog/syslog.h>
-#include <nuttx/syslog/ramlog.h>
#include <nuttx/syslog/syslog_console.h>
#include <nuttx/serial/pty.h>
#include <nuttx/crypto/crypto.h>
@@ -194,8 +193,6 @@ void up_initialize(void)
lwlconsole_init();
#elif defined(CONFIG_CONSOLE_SYSLOG)
syslog_console_init();
-#elif defined(CONFIG_RAMLOG_CONSOLE)
- ramlog_consoleinit();
#endif
#ifdef CONFIG_PSEUDOTERM_SUSV1
diff --git a/arch/arm/src/common/up_internal.h b/arch/arm/src/common/up_internal.h
index 9c96779..71d08ab 100644
--- a/arch/arm/src/common/up_internal.h
+++ b/arch/arm/src/common/up_internal.h
@@ -60,14 +60,10 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_RAMLOG_CONSOLE
#else
# if defined(CONFIG_ARM_LWL_CONSOLE)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# elif defined(CONFIG_RAMLOG_CONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
# else
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
@@ -87,7 +83,7 @@
/* Check if an interrupt stack size is configured */
#ifndef CONFIG_ARCH_INTERRUPTSTACK
-# define CONFIG_ARCH_INTERRUPTSTACK 0
+# define CONFIG_ARCH_INTERRUPTSTACK 0
#endif
/* Macros to handle saving and restoring interrupt state. In the current ARM
diff --git a/arch/avr/src/at32uc3/at32uc3_config.h b/arch/avr/src/at32uc3/at32uc3_config.h
index ec5e57f..2a5d1e0 100644
--- a/arch/avr/src/at32uc3/at32uc3_config.h
+++ b/arch/avr/src/at32uc3/at32uc3_config.h
@@ -152,12 +152,8 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_RAMLOG_CONSOLE
#else
-# if defined(CONFIG_RAMLOG_CONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
-# elif defined(HAVE_RS232_DEVICE)
+# if defined(HAVE_RS232_DEVICE)
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# else
diff --git a/arch/avr/src/at90usb/at90usb_config.h b/arch/avr/src/at90usb/at90usb_config.h
index 6fa0771..91b172e 100644
--- a/arch/avr/src/at90usb/at90usb_config.h
+++ b/arch/avr/src/at90usb/at90usb_config.h
@@ -71,12 +71,8 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_RAMLOG_CONSOLE
#else
-# if defined(CONFIG_RAMLOG_CONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
-# elif defined(HAVE_USART_DEVICE)
+# if defined(HAVE_USART_DEVICE)
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# else
diff --git a/arch/avr/src/atmega/atmega_config.h b/arch/avr/src/atmega/atmega_config.h
index 38f2e99..f764b8a 100644
--- a/arch/avr/src/atmega/atmega_config.h
+++ b/arch/avr/src/atmega/atmega_config.h
@@ -77,12 +77,8 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_RAMLOG_CONSOLE
#else
-# if defined(CONFIG_RAMLOG_CONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
-# elif defined(HAVE_USART_DEVICE)
+# if defined(HAVE_USART_DEVICE)
# define USE_SERIALDRIVER 1
# define USE_EARLYSERIALINIT 1
# else
diff --git a/arch/avr/src/common/up_initialize.c b/arch/avr/src/common/up_initialize.c
index 10efac3..7b4cbc1 100644
--- a/arch/avr/src/common/up_initialize.c
+++ b/arch/avr/src/common/up_initialize.c
@@ -76,15 +76,9 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_RAMLOG_CONSOLE
#else
-# if defined(CONFIG_RAMLOG_CONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
-# else
-# define USE_SERIALDRIVER 1
-# define USE_EARLYSERIALINIT 1
-# endif
+# define USE_SERIALDRIVER 1
+# define USE_EARLYSERIALINIT 1
#endif
/* If some other device is used as the console, then the serial driver may
@@ -228,8 +222,6 @@ void up_initialize(void)
#if defined(CONFIG_CONSOLE_SYSLOG)
syslog_console_init();
-#elif defined(CONFIG_RAMLOG_CONSOLE)
- ramlog_consoleinit();
#endif
#ifdef CONFIG_PSEUDOTERM_SUSV1
diff --git a/arch/hc/src/common/up_initialize.c b/arch/hc/src/common/up_initialize.c
index f931ede..95b7a7a 100644
--- a/arch/hc/src/common/up_initialize.c
+++ b/arch/hc/src/common/up_initialize.c
@@ -155,8 +155,6 @@ void up_initialize(void)
#if defined(CONFIG_CONSOLE_SYSLOG)
syslog_console_init();
-#elif defined(CONFIG_RAMLOG_CONSOLE)
- ramlog_consoleinit();
#endif
#ifdef CONFIG_PSEUDOTERM_SUSV1
diff --git a/arch/hc/src/common/up_internal.h b/arch/hc/src/common/up_internal.h
index 8681298..3f84559 100644
--- a/arch/hc/src/common/up_internal.h
+++ b/arch/hc/src/common/up_internal.h
@@ -60,15 +60,9 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_RAMLOG_CONSOLE
#else
-# if defined(CONFIG_RAMLOG_CONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
-# else
-# define USE_SERIALDRIVER 1
-# define USE_EARLYSERIALINIT 1
-# endif
+# define USE_SERIALDRIVER 1
+# define USE_EARLYSERIALINIT 1
#endif
/* If some other device is used as the console, then the serial driver may
@@ -78,13 +72,13 @@
*/
#if !defined(USE_SERIALDRIVER) && defined(CONFIG_STANDARD_SERIAL)
-# define USE_SERIALDRIVER 1
+# define USE_SERIALDRIVER 1
#endif
/* Check if an interrupt stack size is configured */
#ifndef CONFIG_ARCH_INTERRUPTSTACK
-# define CONFIG_ARCH_INTERRUPTSTACK 0
+# define CONFIG_ARCH_INTERRUPTSTACK 0
#endif
/* Macros to handle saving and restore interrupt state. In the current CPU12
diff --git a/arch/mips/src/common/up_initialize.c b/arch/mips/src/common/up_initialize.c
index 559fe23..a741582 100644
--- a/arch/mips/src/common/up_initialize.c
+++ b/arch/mips/src/common/up_initialize.c
@@ -157,8 +157,6 @@ void up_initialize(void)
#if defined(CONFIG_CONSOLE_SYSLOG)
syslog_console_init();
-#elif defined(CONFIG_RAMLOG_CONSOLE)
- ramlog_consoleinit();
#endif
#ifdef CONFIG_PSEUDOTERM_SUSV1
diff --git a/arch/mips/src/common/up_internal.h b/arch/mips/src/common/up_internal.h
index 9a2c8d8..5de04e5 100644
--- a/arch/mips/src/common/up_internal.h
+++ b/arch/mips/src/common/up_internal.h
@@ -57,15 +57,9 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_RAMLOG_CONSOLE
#else
-# if defined(CONFIG_RAMLOG_CONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
-# else
-# define USE_SERIALDRIVER 1
-# define USE_EARLYSERIALINIT 1
-# endif
+# define USE_SERIALDRIVER 1
+# define USE_EARLYSERIALINIT 1
#endif
/* If some other device is used as the console, then the serial driver may
@@ -81,7 +75,7 @@
/* Check if an interrupt stack size is configured */
#ifndef CONFIG_ARCH_INTERRUPTSTACK
-# define CONFIG_ARCH_INTERRUPTSTACK 0
+# define CONFIG_ARCH_INTERRUPTSTACK 0
#endif
/* In the MIPS model, the state is copied from the stack to the TCB, but
diff --git a/arch/misoc/src/lm32/lm32.h b/arch/misoc/src/lm32/lm32.h
index 9b54bf2..fab887b 100644
--- a/arch/misoc/src/lm32/lm32.h
+++ b/arch/misoc/src/lm32/lm32.h
@@ -77,15 +77,9 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_RAMLOG_CONSOLE
#else
-# if defined(CONFIG_RAMLOG_CONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
-# else
-# define USE_SERIALDRIVER 1
-# define USE_EARLYSERIALINIT 1
-# endif
+# define USE_SERIALDRIVER 1
+# define USE_EARLYSERIALINIT 1
#endif
/****************************************************************************
diff --git a/arch/misoc/src/minerva/minerva.h b/arch/misoc/src/minerva/minerva.h
index 086183d..6c73a7b 100644
--- a/arch/misoc/src/minerva/minerva.h
+++ b/arch/misoc/src/minerva/minerva.h
@@ -77,15 +77,9 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_RAMLOG_CONSOLE
#else
-# if defined(CONFIG_RAMLOG_CONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
-# else
-# define USE_SERIALDRIVER 1
-# define USE_EARLYSERIALINIT 1
-# endif
+# define USE_SERIALDRIVER 1
+# define USE_EARLYSERIALINIT 1
#endif
/****************************************************************************
diff --git a/arch/or1k/src/common/up_initialize.c b/arch/or1k/src/common/up_initialize.c
index 47981b9..e0015f1 100644
--- a/arch/or1k/src/common/up_initialize.c
+++ b/arch/or1k/src/common/up_initialize.c
@@ -248,8 +248,6 @@ void up_initialize(void)
#if defined(CONFIG_CONSOLE_SYSLOG)
syslog_console_init();
-#elif defined(CONFIG_RAMLOG_CONSOLE)
- ramlog_consoleinit();
#endif
#ifdef CONFIG_PSEUDOTERM_SUSV1
diff --git a/arch/or1k/src/common/up_internal.h b/arch/or1k/src/common/up_internal.h
index 8ba24d8..ed5cfe0 100644
--- a/arch/or1k/src/common/up_internal.h
+++ b/arch/or1k/src/common/up_internal.h
@@ -60,15 +60,9 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_RAMLOG_CONSOLE
#else
-# if defined(CONFIG_RAMLOG_CONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
-# else
-# define USE_SERIALDRIVER 1
-# define USE_EARLYSERIALINIT 1
-# endif
+# define USE_SERIALDRIVER 1
+# define USE_EARLYSERIALINIT 1
#endif
/* If some other device is used as the console, then the serial driver may
@@ -84,7 +78,7 @@
/* Check if an interrupt stack size is configured */
#ifndef CONFIG_ARCH_INTERRUPTSTACK
-# define CONFIG_ARCH_INTERRUPTSTACK 0
+# define CONFIG_ARCH_INTERRUPTSTACK 0
#endif
#define up_savestate(regs) up_copyfullstate(regs, (uint32_t*)CURRENT_REGS)
diff --git a/arch/renesas/src/common/up_initialize.c b/arch/renesas/src/common/up_initialize.c
index 8f45916..1e04034 100644
--- a/arch/renesas/src/common/up_initialize.c
+++ b/arch/renesas/src/common/up_initialize.c
@@ -141,8 +141,6 @@ void up_initialize(void)
#if defined(CONFIG_CONSOLE_SYSLOG)
syslog_console_init();
-#elif defined(CONFIG_RAMLOG_CONSOLE)
- ramlog_consoleinit();
#endif
#ifdef CONFIG_PSEUDOTERM_SUSV1
diff --git a/arch/renesas/src/common/up_internal.h b/arch/renesas/src/common/up_internal.h
index d81e5e3..03f0067 100644
--- a/arch/renesas/src/common/up_internal.h
+++ b/arch/renesas/src/common/up_internal.h
@@ -65,15 +65,9 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_RAMLOG_CONSOLE
#else
-# if defined(CONFIG_RAMLOG_CONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
-# else
-# define USE_SERIALDRIVER 1
-# define USE_EARLYSERIALINIT 1
-# endif
+# define USE_SERIALDRIVER 1
+# define USE_EARLYSERIALINIT 1
#endif
/* If some other device is used as the console, then the serial driver may
@@ -89,7 +83,7 @@
/* Check if an interrupt stack size is configured */
#ifndef CONFIG_ARCH_INTERRUPTSTACK
-# define CONFIG_ARCH_INTERRUPTSTACK 0
+# define CONFIG_ARCH_INTERRUPTSTACK 0
#endif
/****************************************************************************
diff --git a/arch/risc-v/src/common/up_initialize.c b/arch/risc-v/src/common/up_initialize.c
index 546a21e..a6d0191 100644
--- a/arch/risc-v/src/common/up_initialize.c
+++ b/arch/risc-v/src/common/up_initialize.c
@@ -139,8 +139,6 @@ void up_initialize(void)
#if defined(CONFIG_CONSOLE_SYSLOG)
syslog_console_init();
-#elif defined(CONFIG_RAMLOG_CONSOLE)
- ramlog_consoleinit();
#endif
#ifdef CONFIG_PSEUDOTERM_SUSV1
@@ -156,9 +154,5 @@ void up_initialize(void)
syslog_initialize(SYSLOG_INIT_EARLY);
-#ifdef CONFIG_RAMLOG_SYSLOG
- ramlog_sysloginit();
-#endif
-
board_autoled_on(LED_IRQSENABLED);
}
diff --git a/arch/risc-v/src/common/up_internal.h b/arch/risc-v/src/common/up_internal.h
index 72aa1eb..50a5b36 100644
--- a/arch/risc-v/src/common/up_internal.h
+++ b/arch/risc-v/src/common/up_internal.h
@@ -85,15 +85,9 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_RAMLOG_CONSOLE
#else
-# if defined(CONFIG_RAMLOG_CONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
-# else
-# define USE_SERIALDRIVER 1
-# define USE_EARLYSERIALINIT 1
-# endif
+# define USE_SERIALDRIVER 1
+# define USE_EARLYSERIALINIT 1
#endif
/****************************************************************************
diff --git a/arch/sim/src/sim/up_initialize.c b/arch/sim/src/sim/up_initialize.c
index 0f52405..5ef6abb 100644
--- a/arch/sim/src/sim/up_initialize.c
+++ b/arch/sim/src/sim/up_initialize.c
@@ -232,8 +232,6 @@ void up_initialize(void)
up_devconsole(); /* Our private /dev/console */
#elif defined(CONFIG_CONSOLE_SYSLOG)
syslog_console_init();
-#elif defined(CONFIG_RAMLOG_CONSOLE)
- ramlog_consoleinit();
#endif
#ifdef CONFIG_PSEUDOTERM_SUSV1
diff --git a/arch/sim/src/sim/up_internal.h b/arch/sim/src/sim/up_internal.h
index e83214f..e57538e 100644
--- a/arch/sim/src/sim/up_internal.h
+++ b/arch/sim/src/sim/up_internal.h
@@ -89,9 +89,8 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_DEVCONSOLE
-# undef CONFIG_RAMLOG_CONSOLE
#else
-# if defined(CONFIG_RAMLOG_CONSOLE) || defined(CONFIG_SYSLOG_RPMSG)
+# ifdef CONFIG_SYSLOG_RPMSG
# undef USE_DEVCONSOLE
# else
# define USE_DEVCONSOLE 1
diff --git a/arch/x86/src/common/up_initialize.c b/arch/x86/src/common/up_initialize.c
index 4a4c767..efc6f73 100644
--- a/arch/x86/src/common/up_initialize.c
+++ b/arch/x86/src/common/up_initialize.c
@@ -157,8 +157,6 @@ void up_initialize(void)
#if defined(CONFIG_CONSOLE_SYSLOG)
syslog_console_init();
-#elif defined(CONFIG_RAMLOG_CONSOLE)
- ramlog_consoleinit();
#endif
#ifdef CONFIG_PSEUDOTERM_SUSV1
diff --git a/arch/x86/src/common/up_internal.h b/arch/x86/src/common/up_internal.h
index 729ba1a..fcd06cc 100644
--- a/arch/x86/src/common/up_internal.h
+++ b/arch/x86/src/common/up_internal.h
@@ -59,15 +59,9 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_RAMLOG_CONSOLE
#else
-# if defined(CONFIG_RAMLOG_CONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
-# else
-# define USE_SERIALDRIVER 1
-# define USE_EARLYSERIALINIT 1
-# endif
+# define USE_SERIALDRIVER 1
+# define USE_EARLYSERIALINIT 1
#endif
/* If some other device is used as the console, then the serial driver may
@@ -83,7 +77,7 @@
/* Check if an interrupt stack size is configured */
#ifndef CONFIG_ARCH_INTERRUPTSTACK
-# define CONFIG_ARCH_INTERRUPTSTACK 0
+# define CONFIG_ARCH_INTERRUPTSTACK 0
#endif
/* Macros to handle saving and restore interrupt state. In the current
diff --git a/arch/xtensa/src/common/xtensa.h b/arch/xtensa/src/common/xtensa.h
index 13f97ef..b9a4d5f 100644
--- a/arch/xtensa/src/common/xtensa.h
+++ b/arch/xtensa/src/common/xtensa.h
@@ -60,15 +60,9 @@
#ifndef CONFIG_DEV_CONSOLE
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_RAMLOG_CONSOLE
#else
-# if defined(CONFIG_RAMLOG_CONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
-# else
-# define USE_SERIALDRIVER 1
-# define USE_EARLYSERIALINIT 1
-# endif
+# define USE_SERIALDRIVER 1
+# define USE_EARLYSERIALINIT 1
#endif
/* If some other device is used as the console, then the serial driver may
diff --git a/arch/xtensa/src/common/xtensa_initialize.c b/arch/xtensa/src/common/xtensa_initialize.c
index 997f676..5161468 100644
--- a/arch/xtensa/src/common/xtensa_initialize.c
+++ b/arch/xtensa/src/common/xtensa_initialize.c
@@ -165,8 +165,6 @@ void up_initialize(void)
#if defined(CONFIG_CONSOLE_SYSLOG)
syslog_console_init();
-#elif defined(CONFIG_RAMLOG_CONSOLE)
- ramlog_consoleinit();
#endif
#ifdef CONFIG_PSEUDOTERM_SUSV1
diff --git a/arch/z16/src/common/up_initialize.c b/arch/z16/src/common/up_initialize.c
index 32aa687..51cd2eb 100644
--- a/arch/z16/src/common/up_initialize.c
+++ b/arch/z16/src/common/up_initialize.c
@@ -157,8 +157,6 @@ void up_initialize(void)
#if defined(CONFIG_CONSOLE_SYSLOG)
syslog_console_init();
-#elif defined(CONFIG_RAMLOG_CONSOLE)
- ramlog_consoleinit();
#endif
#ifdef CONFIG_PSEUDOTERM_SUSV1
diff --git a/arch/z16/src/common/up_internal.h b/arch/z16/src/common/up_internal.h
index 2e12797..4645222 100644
--- a/arch/z16/src/common/up_internal.h
+++ b/arch/z16/src/common/up_internal.h
@@ -66,15 +66,9 @@
#elif !defined(CONFIG_DEV_CONSOLE)
# undef USE_SERIALDRIVER
# undef USE_EARLYSERIALINIT
-# undef CONFIG_RAMLOG_CONSOLE
#else
-# if defined(CONFIG_RAMLOG_CONSOLE)
-# undef USE_SERIALDRIVER
-# undef USE_EARLYSERIALINIT
-# else
-# define USE_SERIALDRIVER 1
-# define USE_EARLYSERIALINIT 1
-# endif
+# define USE_SERIALDRIVER 1
+# define USE_EARLYSERIALINIT 1
#endif
/* If some other device is used as the console, then the serial driver may
diff --git a/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/up_initialize.c
index 4942511..61556c9 100644
--- a/arch/z80/src/common/up_initialize.c
+++ b/arch/z80/src/common/up_initialize.c
@@ -156,8 +156,6 @@ void up_initialize(void)
#if defined(CONFIG_CONSOLE_SYSLOG)
syslog_console_init();
-#elif defined(CONFIG_RAMLOG_CONSOLE)
- ramlog_consoleinit();
#endif
#ifdef CONFIG_PSEUDOTERM_SUSV1
diff --git a/arch/z80/src/common/z80_internal.h b/arch/z80/src/common/z80_internal.h
index 365f8b3..4c08e3c 100644
--- a/arch/z80/src/common/z80_internal.h
+++ b/arch/z80/src/common/z80_internal.h
@@ -59,11 +59,8 @@
#if !defined(CONFIG_DEV_CONSOLE)
# undef USE_SERIALDRIVER
-# undef CONFIG_RAMLOG_CONSOLE
#else
-# if defined(CONFIG_RAMLOG_CONSOLE)
-# undef USE_SERIALDRIVER
-# elif defined(CONFIG_CONSOLE_SYSLOG)
+# if defined(CONFIG_CONSOLE_SYSLOG)
# undef USE_SERIALDRIVER
# else
# define USE_SERIALDRIVER 1
@@ -126,14 +123,6 @@ void syslog_console_init();
# define syslog_console_init()
#endif
-/* Defined in drivers/ramlog.c */
-
-#ifdef CONFIG_RAMLOG_CONSOLE
-void ramlog_consoleinit(void);
-#else
-# define ramlog_consoleinit()
-#endif
-
/* Low level string output */
void up_puts(const char *str);
diff --git a/boards/arm/sama5/sama5d2-xult/README.txt b/boards/arm/sama5/sama5d2-xult/README.txt
index f0e3b99..8b85937 100644
--- a/boards/arm/sama5/sama5d2-xult/README.txt
+++ b/boards/arm/sama5/sama5d2-xult/README.txt
@@ -834,7 +834,6 @@ Configurations
Device Drivers:
CONFIG_RAMLOG=y : Enable the RAM-based logging feature.
- CONFIG_RAMLOG_CONSOLE=n : (We don't use the RAMLOG console)
CONFIG_RAMLOG_SYSLOG=y : This enables the RAM-based logger as the
system logger.
CONFIG_RAMLOG_NONBLOCKING=y : Needs to be non-blocking for dmesg
diff --git a/boards/arm/sama5/sama5d4-ek/README.txt b/boards/arm/sama5/sama5d4-ek/README.txt
index 0056998..c409a96 100644
--- a/boards/arm/sama5/sama5d4-ek/README.txt
+++ b/boards/arm/sama5/sama5d4-ek/README.txt
@@ -4300,7 +4300,6 @@ Configurations
Device Drivers:
CONFIG_RAMLOG=y : Enable the RAM-based logging feature.
- CONFIG_RAMLOG_CONSOLE=n : (We don't use the RAMLOG console)
CONFIG_RAMLOG_SYSLOG=y : This enables the RAM-based logger as the
system logger.
CONFIG_RAMLOG_NONBLOCKING=y : Needs to be non-blocking for dmesg
diff --git a/boards/arm/samv7/samv71-xult/README.txt b/boards/arm/samv7/samv71-xult/README.txt
index fc55bbd..21b3b10 100644
--- a/boards/arm/samv7/samv71-xult/README.txt
+++ b/boards/arm/samv7/samv71-xult/README.txt
@@ -1877,7 +1877,6 @@ Configuration sub-directories
Device Drivers:
CONFIG_RAMLOG=y : Enable the RAM-based logging feature.
- CONFIG_RAMLOG_CONSOLE=n : (We don't use the RAMLOG console)
CONFIG_RAMLOG_SYSLOG=y : This enables the RAM-based logger as the
system logger.
CONFIG_RAMLOG_NONBLOCKING=y : Needs to be non-blocking for dmesg
diff --git a/boards/arm/stm32/clicker2-stm32/README.txt b/boards/arm/stm32/clicker2-stm32/README.txt
index c104640..c39ff41 100644
--- a/boards/arm/stm32/clicker2-stm32/README.txt
+++ b/boards/arm/stm32/clicker2-stm32/README.txt
@@ -406,7 +406,6 @@ Configurations
Device Drivers:
CONFIG_RAMLOG=y : Enable the RAM-based logging feature.
- CONFIG_RAMLOG_CONSOLE=n : (We don't use the RAMLOG console)
CONFIG_RAMLOG_SYSLOG=y : This enables the RAM-based logger as the
system logger.
CONFIG_RAMLOG_NONBLOCKING=y : Needs to be non-blocking for dmesg
diff --git a/boards/arm/stm32/stm3220g-eval/README.txt b/boards/arm/stm32/stm3220g-eval/README.txt
index a7f0a9e..3776b61 100644
--- a/boards/arm/stm32/stm3220g-eval/README.txt
+++ b/boards/arm/stm32/stm3220g-eval/README.txt
@@ -734,7 +734,7 @@ Where <subdir> is one of the following:
There are some special settings to make life with only a Telnet
CONFIG_RAMLOG=y - Enable the RAM-based logging feature.
- CONFIG_RAMLOG_CONSOLE=y - Use the RAM logger as the default console.
+ CONFIG_CONSOLE_SYSLOG=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
diff --git a/boards/arm/stm32/stm3240g-eval/README.txt b/boards/arm/stm32/stm3240g-eval/README.txt
index 05efcc0..6590785 100644
--- a/boards/arm/stm32/stm3240g-eval/README.txt
+++ b/boards/arm/stm32/stm3240g-eval/README.txt
@@ -1104,7 +1104,7 @@ Where <subdir> is one of the following:
There are some special settings to make life with only a Telnet
CONFIG_RAMLOG=y - Enable the RAM-based logging feature.
- CONFIG_RAMLOG_CONSOLE=y - Use the RAM logger as the default console.
+ CONFIG_CONSOLE_SYSLOG=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
diff --git a/boards/mips/pic32mx/pic32mx-starterkit/README.txt b/boards/mips/pic32mx/pic32mx-starterkit/README.txt
index 8078d72..5b45a8a 100644
--- a/boards/mips/pic32mx/pic32mx-starterkit/README.txt
+++ b/boards/mips/pic32mx/pic32mx-starterkit/README.txt
@@ -1111,7 +1111,6 @@ Where <subdir> is one of the following:
3. The RAM log is enabled"
CONFIG_RAMLOG=y : Enable the RAM-based logging feature.
- CONFIG_RAMLOG_CONSOLE=n : (there is no default console device)
CONFIG_RAMLOG_SYSLOG=y : This enables the RAM-based logger as the
system logger.
diff --git a/boards/mips/pic32mx/sure-pic32mx/README.txt b/boards/mips/pic32mx/sure-pic32mx/README.txt
index 6fba1bc..88edf86 100644
--- a/boards/mips/pic32mx/sure-pic32mx/README.txt
+++ b/boards/mips/pic32mx/sure-pic32mx/README.txt
@@ -893,7 +893,6 @@ Where <subdir> is one of the following:
Device Drivers -> System Logging Device Options:
CONFIG_RAMLOG=y : Enable the RAM-based logging feature.
- CONFIG_RAMLOG_CONSOLE=n : (there is no default console device)
CONFIG_RAMLOG_SYSLOG=y : This enables the RAM-based logger as the
system logger.
diff --git a/drivers/syslog/Kconfig b/drivers/syslog/Kconfig
index 6739939..181c209 100644
--- a/drivers/syslog/Kconfig
+++ b/drivers/syslog/Kconfig
@@ -32,21 +32,10 @@ config RAMLOG
details as needed to support logging.
if RAMLOG
-config RAMLOG_CONSOLE
- bool "Use RAMLOG for /dev/console"
- default n
- depends on DEV_CONSOLE
- ---help---
- Use the RAM logging device as a system console. If this feature is enabled (along
- with 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_BUFSIZE
int "RAMLOG buffer size"
default 1024
- depends on RAMLOG_SYSLOG || RAMLOG_CONSOLE
+ depends on RAMLOG_SYSLOG
---help---
Size of the console RAM log. Default: 1024
diff --git a/drivers/syslog/README.txt b/drivers/syslog/README.txt
index 962524c..dbc46df 100644
--- a/drivers/syslog/README.txt
+++ b/drivers/syslog/README.txt
@@ -469,13 +469,6 @@ RAM Logging Device
----------------------------
* 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 might be 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. This optional is not useful in other scenarios.
* CONFIG_RAMLOG_SYSLOG - Use the RAM logging device for the syslogging
interface. If this feature is enabled, then all debug output (only)
will be re-directed to the circular buffer in RAM. This RAM log can
@@ -485,8 +478,8 @@ RAM Logging Device
* 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 must also be provided:
+ If CONFIG_RAMLOG_SYSLOG is selected, then the following must also be
+ provided:
* CONFIG_RAMLOG_BUFSIZE - The size of the circular buffer to use.
Default: 1024 bytes.
diff --git a/drivers/syslog/ramlog.c b/drivers/syslog/ramlog.c
index 3605e14..bbb7670 100644
--- a/drivers/syslog/ramlog.c
+++ b/drivers/syslog/ramlog.c
@@ -152,7 +152,7 @@ static const struct file_operations g_ramlogfops =
* for the syslogging function.
*/
-#if defined(CONFIG_RAMLOG_CONSOLE) || defined(CONFIG_RAMLOG_SYSLOG)
+#ifdef CONFIG_RAMLOG_SYSLOG
static char g_sysbuffer[CONFIG_RAMLOG_BUFSIZE];
/* This is the device structure for the console or syslogging function. It
@@ -677,7 +677,6 @@ errout:
*
****************************************************************************/
-#if !defined(CONFIG_RAMLOG_CONSOLE) && !defined(CONFIG_RAMLOG_SYSLOG)
int ramlog_register(FAR const char *devpath, FAR char *buffer, size_t buflen)
{
FAR struct ramlog_dev_s *priv;
@@ -719,26 +718,6 @@ int ramlog_register(FAR const char *devpath, FAR char *buffer, size_t buflen)
return ret;
}
-#endif
-
-/****************************************************************************
- * Name: ramlog_consoleinit
- *
- * Description:
- * Use a pre-allocated RAM logging device and register it at /dev/console
- *
- ****************************************************************************/
-
-#ifdef CONFIG_RAMLOG_CONSOLE
-int ramlog_consoleinit(void)
-{
- FAR struct ramlog_dev_s *priv = &g_sysdev;
-
- /* Register the console character driver */
-
- return register_driver("/dev/console", &g_ramlogfops, 0666, priv);
-}
-#endif
/****************************************************************************
* Name: ramlog_syslog_channel
@@ -747,9 +726,6 @@ int ramlog_consoleinit(void)
* 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.
- *
****************************************************************************/
#ifdef CONFIG_RAMLOG_SYSLOG
@@ -779,7 +755,7 @@ int ramlog_syslog_channel(void)
*
****************************************************************************/
-#if defined(CONFIG_RAMLOG_CONSOLE) || defined(CONFIG_RAMLOG_SYSLOG)
+#ifdef CONFIG_RAMLOG_SYSLOG
int ramlog_putc(int ch)
{
FAR struct ramlog_dev_s *priv = &g_sysdev;
diff --git a/include/nuttx/syslog/ramlog.h b/include/nuttx/syslog/ramlog.h
index 48ca3ac..c25471e 100644
--- a/include/nuttx/syslog/ramlog.h
+++ b/include/nuttx/syslog/ramlog.h
@@ -66,12 +66,6 @@
/* Configuration ************************************************************/
/* 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 then all debug output (only)
* will be re-directed to the circular buffer in RAM. This RAM log can
@@ -81,16 +75,12 @@
* 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:
+ * If CONFIG_RAMLOG_SYSLOG is selected, then the following may also be
+ * provided:
*
* CONFIG_RAMLOG_BUFSIZE - Size of the console RAM log. Default: 1024
*/
-#ifndef CONFIG_DEV_CONSOLE
-# undef CONFIG_RAMLOG_CONSOLE
-#endif
-
#if defined(CONFIG_RAMLOG_SYSLOG) && !defined(CONFIG_SYSLOG_DEVPATH)
# define CONFIG_SYSLOG_DEVPATH "/dev/ramlog"
#endif
@@ -130,32 +120,14 @@ extern "C"
*
* This interface is not normally used but can be made available is
* someone just wants to tinker with the RAM log as a generic character
- * device. Normally both CONFIG_RAMLOG_CONSOLE and CONFIG_RAMLOG_SYSLOG
+ * device. Normally both CONFIG_CONSOLE_SYSLOG and CONFIG_RAMLOG_SYSLOG
* would be set (to capture all output in the log) -OR- just
* CONFIG_RAMLOG_SYSLOG would be set to capture debug output only
* in the log.
*
****************************************************************************/
-#if !defined(CONFIG_RAMLOG_CONSOLE) && !defined(CONFIG_RAMLOG_SYSLOG)
int ramlog_register(FAR const char *devpath, FAR char *buffer, size_t buflen);
-#endif
-
-/****************************************************************************
- * Name: ramlog_consoleinit
- *
- * Description:
- * Create the RAM logging device and register it at the specified path.
- * Mostly likely this path will be /dev/console.
- *
- * If CONFIG_RAMLOG_SYSLOG is also defined, then the same RAM logging
- * device is also registered at CONFIG_SYSLOG_DEVPATH
- *
- ****************************************************************************/
-
-#ifdef CONFIG_RAMLOG_CONSOLE
-int ramlog_consoleinit(void);
-#endif
/****************************************************************************
* Name: ramlog_syslog_channel
@@ -164,9 +136,6 @@ int ramlog_consoleinit(void);
* Create the RAM logging device and register it at the specified path.
* Mostly likely this path will be CONFIG_SYSLOG_DEVPATH
*
- * If CONFIG_RAMLOG_CONSOLE is also defined, then this functionality is
- * performed when ramlog_consoleinit() is called.
- *
****************************************************************************/
#ifdef CONFIG_RAMLOG_SYSLOG
@@ -181,7 +150,7 @@ int ramlog_syslog_channel(void);
*
****************************************************************************/
-#if defined(CONFIG_RAMLOG_CONSOLE) || defined(CONFIG_RAMLOG_SYSLOG)
+#ifdef CONFIG_RAMLOG_SYSLOG
int ramlog_putc(int ch);
#endif