sim/uart: support tty operation in arch/sim

Change-Id: I6943c1e928ed821aa913bc619e5b8c581b5610c3
Signed-off-by: dongjiuzhu <dongjiuzhu1@xiaomi.com>
This commit is contained in:
dongjiuzhu
2020-08-31 20:12:32 +08:00
committed by Matias N
parent 34b34e2d45
commit 3634bb6ba5
8 changed files with 706 additions and 388 deletions
+24
View File
@@ -485,4 +485,28 @@ config SIM_HCISOCKET
control of the device, but is abstracted from the
physical interface which is still handled by Linux.
config SIM_UART_NUMBER
int "The number of tty ports on sim platform, range is 0~4"
default 0
config SIM_UART0_NAME
string "the name of uart0 on sim"
default "/dev/ttySIM0"
depends on SIM_UART_NUMBER >= 1
config SIM_UART1_NAME
string "the name of uart1 on sim"
default "/dev/ttySIM1"
depends on SIM_UART_NUMBER >= 2
config SIM_UART2_NAME
string "the name of uart2 on sim"
default "/dev/ttySIM2"
depends on SIM_UART_NUMBER >= 3
config SIM_UART3_NAME
string "the name of uart3 on sim"
default "/dev/ttySIM3"
depends on SIM_UART_NUMBER >= 4
endif # ARCH_SIM
+2 -9
View File
@@ -73,7 +73,7 @@ CSRCS = up_initialize.c up_idle.c up_interruptcontext.c up_initialstate.c
CSRCS += up_createstack.c up_usestack.c up_releasestack.c up_stackframe.c
CSRCS += up_unblocktask.c up_blocktask.c up_releasepending.c
CSRCS += up_reprioritizertr.c up_exit.c up_schedulesigaction.c
CSRCS += up_allocateheap.c
CSRCS += up_allocateheap.c up_uart.c
VPATH = sim
DEPPATH = $(patsubst %,--dep-path %,$(subst :, ,$(VPATH)))
@@ -83,7 +83,7 @@ ifeq ($(CONFIG_HOST_MACOS),y)
HOSTCFLAGS += -Wno-deprecated-declarations
endif
HOSTSRCS = up_hostirq.c up_hostmemory.c up_hosttime.c
HOSTSRCS = up_hostirq.c up_hostmemory.c up_hosttime.c up_simuart.c
STDLIBS += -lpthread
ifneq ($(CONFIG_HOST_MACOS),y)
STDLIBS += -lrt
@@ -117,13 +117,6 @@ ifneq ($(CONFIG_SCHED_INSTRUMENTATION_BUFFER),y)
endif
endif
ifeq ($(CONFIG_DEV_CONSOLE),y)
ifneq ($(CONFIG_SYSLOG_RPMSG),y)
CSRCS += up_devconsole.c
HOSTSRCS += up_simuart.c
endif
endif
ifeq ($(CONFIG_ONESHOT),y)
CSRCS += up_oneshot.c
endif
-319
View File
@@ -1,319 +0,0 @@
/****************************************************************************
* arch/sim/src/sim/up_devconsole.c
*
* Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@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 <nuttx/serial/serial.h>
#include "up_internal.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#define DEVCONSOLE_BUFSIZE 256
/****************************************************************************
* Private Function Prototypes
****************************************************************************/
static int devconsole_setup(FAR struct uart_dev_s *dev);
static void devconsole_shutdown(FAR struct uart_dev_s *dev);
static int devconsole_attach(FAR struct uart_dev_s *dev);
static void devconsole_detach(FAR struct uart_dev_s *dev);
static int devconsole_ioctl(FAR struct file *filep, int cmd,
unsigned long arg);
static int devconsole_receive(FAR struct uart_dev_s *dev, uint32_t *status);
static void devconsole_rxint(FAR struct uart_dev_s *dev, bool enable);
static bool devconsole_rxavailable(FAR struct uart_dev_s *dev);
static void devconsole_send(FAR struct uart_dev_s *dev, int ch);
static void devconsole_txint(FAR struct uart_dev_s *dev, bool enable);
static bool devconsole_txready(FAR struct uart_dev_s *dev);
static bool devconsole_txempty(FAR struct uart_dev_s *dev);
/****************************************************************************
* Private Data
****************************************************************************/
static const struct uart_ops_s g_devconsole_ops =
{
.setup = devconsole_setup,
.shutdown = devconsole_shutdown,
.attach = devconsole_attach,
.detach = devconsole_detach,
.ioctl = devconsole_ioctl,
.receive = devconsole_receive,
.rxint = devconsole_rxint,
.rxavailable = devconsole_rxavailable,
.send = devconsole_send,
.txint = devconsole_txint,
.txready = devconsole_txready,
.txempty = devconsole_txempty,
};
static char g_devconsole_rxbuf[DEVCONSOLE_BUFSIZE];
static char g_devconsole_txbuf[DEVCONSOLE_BUFSIZE];
static struct uart_dev_s g_devconsole_dev =
{
.isconsole = true,
.ops = &g_devconsole_ops,
.xmit =
{
.size = DEVCONSOLE_BUFSIZE,
.buffer = g_devconsole_txbuf,
},
.recv =
{
.size = DEVCONSOLE_BUFSIZE,
.buffer = g_devconsole_rxbuf,
},
};
/****************************************************************************
* Private Functions
****************************************************************************/
/****************************************************************************
* Name: devconsole_setup
*
* Description:
* Configure the UART baud, bits, parity, fifos, etc. This
* method is called the first time that the serial port is
* opened.
*
****************************************************************************/
static int devconsole_setup(FAR struct uart_dev_s *dev)
{
return OK;
}
/****************************************************************************
* Name: devconsole_shutdown
*
* Description:
* Disable the UART. This method is called when the serial
* port is closed
*
****************************************************************************/
static void devconsole_shutdown(struct uart_dev_s *dev)
{
}
/****************************************************************************
* Name: devconsole_attach
*
* Description:
* Configure the UART to operation in interrupt driven mode. This method
* is called when the serial port is opened. Normally, this is just after
* the setup() method is called, however, the serial console may operate in
* a non-interrupt driven mode during the boot phase.
*
* RX and TX interrupts are not enabled when by the attach method (unless
* the hardware supports multiple levels of interrupt enabling). The RX
* and TX interrupts are not enabled until the txint() and rxint() methods
* are called.
*
****************************************************************************/
static int devconsole_attach(struct uart_dev_s *dev)
{
return OK;
}
/****************************************************************************
* Name: devconsole_detach
*
* Description:
* Detach UART interrupts. This method is called when the serial port is
* closed normally just before the shutdown method is called. The
* exception is the serial console which is never shutdown.
*
****************************************************************************/
static void devconsole_detach(FAR struct uart_dev_s *dev)
{
}
/****************************************************************************
* Name: devconsole_ioctl
*
* Description:
* All ioctl calls will be routed through this method
*
****************************************************************************/
static int devconsole_ioctl(struct file *filep, int cmd, unsigned long arg)
{
return -ENOTTY;
}
/****************************************************************************
* Name: devconsole_receive
*
* Description:
* Called (usually) from the interrupt level to receive one
* character from the UART. Error bits associated with the
* receipt are provided in the return 'status'.
*
****************************************************************************/
static int devconsole_receive(struct uart_dev_s *dev, uint32_t *status)
{
*status = 0;
return simuart_getc();
}
/****************************************************************************
* Name: devconsole_rxint
*
* Description:
* Call to enable or disable RX interrupts
*
****************************************************************************/
static void devconsole_rxint(struct uart_dev_s *dev, bool enable)
{
}
/****************************************************************************
* Name: devconsole_rxavailable
*
* Description:
* Return true if the receive fifo is not empty
*
****************************************************************************/
static bool devconsole_rxavailable(struct uart_dev_s *dev)
{
return simuart_checkc();
}
/****************************************************************************
* Name: devconsole_send
*
* Description:
* This method will send one byte on the UART
*
****************************************************************************/
static void devconsole_send(struct uart_dev_s *dev, int ch)
{
simuart_putc(ch);
}
/****************************************************************************
* Name: devconsole_txint
*
* Description:
* Call to enable or disable TX interrupts
*
****************************************************************************/
static void devconsole_txint(struct uart_dev_s *dev, bool enable)
{
if (enable)
{
uart_xmitchars(&g_devconsole_dev);
}
}
/****************************************************************************
* Name: devconsole_txready
*
* Description:
* Return true if the tranmsit fifo is not full
*
****************************************************************************/
static bool devconsole_txready(struct uart_dev_s *dev)
{
return true;
}
/****************************************************************************
* Name: devconsole_txempty
*
* Description:
* Return true if the transmit fifo is empty
*
****************************************************************************/
static bool devconsole_txempty(struct uart_dev_s *dev)
{
return true;
}
/****************************************************************************
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: up_devconsole
****************************************************************************/
void up_devconsole(void)
{
uart_register("/dev/console", &g_devconsole_dev);
uart_register("/dev/ttyS0", &g_devconsole_dev);
}
/****************************************************************************
* Name: up_devconloop
****************************************************************************/
void up_devconloop(void)
{
if (simuart_checkc())
{
uart_recvchars(&g_devconsole_dev);
}
}
/****************************************************************************
* Name: up_putc
****************************************************************************/
int up_putc(int ch)
{
/* Just map to the host simuart_putc routine */
return simuart_putc(ch);
}
+1 -3
View File
@@ -89,11 +89,9 @@ void up_idle(void)
}
#endif
#ifdef USE_DEVCONSOLE
/* Handle UART data availability */
up_devconloop();
#endif
up_uartloop();
#if defined(CONFIG_SIM_TOUCHSCREEN) || defined(CONFIG_SIM_AJOYSTICK)
/* Drive the X11 event loop */
+3 -7
View File
@@ -228,15 +228,11 @@ void up_initialize(void)
rpmsg_serialinit();
#endif
#if defined(USE_DEVCONSOLE)
/* Start the simulated UART device */
/* Register some tty-port to access tty-port on sim platform */
simuart_start();
up_uartinit();
/* Register a console (or not) */
up_devconsole(); /* Our private /dev/console */
#elif defined(CONFIG_CONSOLE_SYSLOG)
#if defined(CONFIG_CONSOLE_SYSLOG)
syslog_console_init();
#endif
+10 -6
View File
@@ -259,17 +259,21 @@ void up_timer_update(void);
void rpmsg_serialinit(void);
#endif
/* up_devconsole.c **********************************************************/
/* up_uart.c ****************************************************************/
void up_devconsole(void);
void up_devconloop(void);
void up_uartinit(void);
void up_uartloop(void);
/* up_simuart.c *************************************************************/
void simuart_start(void);
int simuart_putc(int ch);
int simuart_getc(void);
bool simuart_checkc(void);
int simuart_open(const char *pathname);
void simuart_close(int fd);
int simuart_putc(int fd, int ch);
int simuart_getc(int fd);
bool simuart_checkc(int fd);
int simuart_setcflag(int fd, unsigned int cflag);
int simuart_getcflag(int fd, unsigned int *cflag);
/* up_deviceimage.c *********************************************************/
+94 -44
View File
@@ -37,12 +37,14 @@
* Included Files
****************************************************************************/
#include <fcntl.h>
#include <stdbool.h>
#include <unistd.h>
#include <string.h>
#include <stdlib.h>
#include <termios.h>
#include <poll.h>
#include <errno.h>
/****************************************************************************
* Private Data
@@ -58,18 +60,14 @@ static struct termios g_cooked;
* Name: setrawmode
****************************************************************************/
static void setrawmode(void)
static void setrawmode(int fd)
{
struct termios raw;
/* Get the current stdin terminal mode */
tcgetattr(0, &g_cooked);
tcgetattr(fd, &raw);
/* Switch to raw mode */
memcpy(&raw, &g_cooked, sizeof(struct termios));
raw.c_iflag &= ~(IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR |
ICRNL | IXON);
raw.c_oflag &= ~OPOST;
@@ -77,7 +75,7 @@ static void setrawmode(void)
raw.c_cflag &= ~(CSIZE | PARENB);
raw.c_cflag |= CS8;
tcsetattr(0, TCSANOW, &raw);
tcsetattr(fd, TCSANOW, &raw);
}
/****************************************************************************
@@ -91,24 +89,6 @@ static void restoremode(void)
tcsetattr(0, TCSANOW, &g_cooked);
}
/****************************************************************************
* Name: simuart_putraw
****************************************************************************/
int simuart_putraw(int ch)
{
ssize_t nwritten;
unsigned char buf = ch;
nwritten = write(1, &buf, 1);
if (nwritten != 1)
{
return -1;
}
return ch;
}
/****************************************************************************
* Public Functions
****************************************************************************/
@@ -119,58 +99,128 @@ int simuart_putraw(int ch)
void simuart_start(void)
{
/* Get the current stdin terminal mode */
tcgetattr(0, &g_cooked);
/* Put stdin into raw mode */
setrawmode();
setrawmode(0);
/* Restore the original terminal mode before exit */
atexit(restoremode);
}
/****************************************************************************
* Name: simuart_open
****************************************************************************/
int simuart_open(const char *pathname)
{
int fd;
fd = open(pathname, O_RDWR | O_NONBLOCK);
if (fd >= 0)
{
/* keep raw mode */
setrawmode(fd);
}
else
{
fd = -errno;
}
return fd;
}
/****************************************************************************
* Name: simuart_close
****************************************************************************/
void simuart_close(int fd)
{
close(fd);
}
/****************************************************************************
* Name: simuart_putc
****************************************************************************/
int simuart_putc(int ch)
int simuart_putc(int fd, int ch)
{
int ret = ch;
if (ch == '\n')
{
ret = simuart_putraw('\r');
}
if (ret >= 0)
{
ret = simuart_putraw(ch);
}
return ret;
return write(fd, &ch, 1) == 1 ? ch : -1;
}
/****************************************************************************
* Name: simuart_getc
****************************************************************************/
int simuart_getc(void)
int simuart_getc(int fd)
{
int ret;
unsigned char ch;
ret = read(0, &ch, 1);
ret = read(fd, &ch, 1);
return ret < 0 ? ret : ch;
}
/****************************************************************************
* Name: simuart_getcflag
****************************************************************************/
int simuart_getcflag(int fd, tcflag_t *cflag)
{
struct termios t;
int ret;
ret = tcgetattr(fd, &t);
if (ret < 0)
{
ret = -errno;
}
else
{
*cflag = t.c_cflag;
}
return ret;
}
/****************************************************************************
* Name: simuart_setcflag
****************************************************************************/
int simuart_setcflag(int fd, tcflag_t cflag)
{
struct termios t;
int ret;
ret = tcgetattr(fd, &t);
if (!ret)
{
t.c_cflag = cflag;
ret = tcsetattr(fd, TCSANOW, &t);
}
if (ret < 0)
{
ret = -errno;
}
return ret;
}
/****************************************************************************
* Name: simuart_checkc
****************************************************************************/
bool simuart_checkc(void)
bool simuart_checkc(int fd)
{
struct pollfd pfd;
pfd.fd = 0;
pfd.fd = fd;
pfd.events = POLLIN;
return poll(&pfd, 1, 0) == 1;
}
File diff suppressed because it is too large Load Diff