Aksal/nuttx-apps
1
0
Fork 1
mirror of https://github.com/apache/nuttx-apps.git synced 2026-08-01 20:29:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

apps: Remove the check of CONFIG_SERIAL_TERMIOS

Browse source 
If the code only change c_oflag, c_iflag and c_lflag, not c_cflag in termios.
Follow up the change from kernel: https://github.com/apache/nuttx/pull/8843

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2023-03-20 01:07:21 +08:00 • committed by patacongo
parent 369c354dc7
commit 86080a110e
21 changed files with 24 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

7
logging/embedlog/Makefile
View file

@ -130,12 +130,6 @@ else
CFLAGS += -DENABLE_PTHREAD=0
endif
ifeq ($(CONFIG_SERIAL_TERMIOS),y)
CFLAGS += -DHAVE_TERMIOS_H
else
CFLAGS += -DHAVE_TERMIOS_H=0
endif
CFLAGS += -DEL_LOG_MAX=$(CONFIG_EMBEDLOG_LOG_MAX)
CFLAGS += -DEL_MEM_LINE_SIZE=$(CONFIG_EMBEDLOG_MEM_LINE_SIZE)
@ -151,6 +145,7 @@ CFLAGS += -DHAVE_ACCESS=0
CFLAGS += -DENABLE_REENTRANT
CFLAGS += -DENABLE_OUT_SYSLOG
CFLAGS += -DHAVE_STAT
CFLAGS += -DHAVE_TERMIOS_H
CFLAGS += -DHAVE_UNISTD_H
CFLAGS += -DHAVE_FSYNC
CFLAGS += -DHAVE_FILENO

1
logging/nxscope/Kconfig
View file

@ -11,7 +11,6 @@ if LOGGING_NXSCOPE
config LOGGING_NXSCOPE_INTF_SERIAL
bool "NxScope serial port interface support"
select SERIAL_TERMIOS
default n
---help---
For details, see logging/nxscope/nxscope_iserial.c

10
logging/nxscope/nxscope_iser.c
View file

@ -33,14 +33,6 @@
#include <logging/nxscope/nxscope.h>
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#ifndef CONFIG_SERIAL_TERMIOS
# error Termios support must be enabled
#endif
/****************************************************************************
* Private Type Definition
****************************************************************************/
@ -214,6 +206,7 @@ int nxscope_ser_init(FAR struct nxscope_intf_s *intf,
tcgetattr(priv->fd, &tio);
#ifdef CONFIG_SERIAL_TERMIOS
/* Configure a baud rate */
DEBUGASSERT(priv->cfg->baud > 0);
@ -224,6 +217,7 @@ int nxscope_ser_init(FAR struct nxscope_intf_s *intf,
_err("ERROR: failed to set baud rate %d\n", errno);
goto errout;
}
#endif
/* Configure RAW mode */