Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-30 13:27:01 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

serial: merge serial check signo to one place

Browse Source 
Signed-off-by: ligd <liguiding1@xiaomi.com>
This commit is contained in:
ligd
2021-12-20 17:44:08 +08:00
committed by Petro Karashchenko
parent 065553e59b
commit 5a0ab205ca
4 changed files with 96 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/serial/serial_dma.c
+9 -72
View File
@@ -39,68 +39,7 @@
****************************************************************************/
/****************************************************************************
* Name: uart_check_signo
*
* Description:
* Check if the SIGINT or SIGTSTP character is in the contiguous Rx DMA
* buffer region. The first signal associated with the first such
* character is returned.
*
* If there multiple such characters in the buffer, only the signal
* associated with the first is returned (this a bug!)
*
* Returned Value:
* 0 if a signal-related character does not appear in the. Otherwise,
* SIGKILL or SIGTSTP may be returned to indicate the appropriate signal
* action.
*
****************************************************************************/
#if defined(CONFIG_TTY_SIGINT) || defined(CONFIG_TTY_SIGTSTP) || \
defined(CONFIG_TTY_FORCE_PANIC) || defined(CONFIG_TTY_LAUNCH)
static int uart_check_signo(int pid, const char *buf, size_t size)
{
size_t i;
for (i = 0; i < size; i++)
{
#ifdef CONFIG_TTY_FORCE_PANIC
if (buf[i] == CONFIG_TTY_FORCE_PANIC_CHAR)
{
PANIC();
return 0;
}
#endif
#ifdef CONFIG_TTY_LAUNCH
if (buf[i] == CONFIG_TTY_LAUNCH_CHAR)
{
uart_launch();
return 0;
}
#endif
#ifdef CONFIG_TTY_SIGINT
if (pid > 0 && buf[i] == CONFIG_TTY_SIGINT_CHAR)
{
return SIGINT;
}
#endif
#ifdef CONFIG_TTY_SIGTSTP
if (pid > 0 && buf[i] == CONFIG_TTY_SIGTSTP_CHAR)
{
return SIGTSTP;
}
#endif
}
return 0;
}
#endif
/****************************************************************************
* Name: uart_recvchars_signo
* Name: uart_recvchars_check_special
*
* Description:
* Check if the SIGINT character is anywhere in the newly received DMA
@@ -114,7 +53,7 @@ static int uart_check_signo(int pid, const char *buf, size_t size)
#if defined(CONFIG_SERIAL_RXDMA) && \
(defined(CONFIG_TTY_SIGINT) || defined(CONFIG_TTY_SIGTSTP) || \
defined(CONFIG_TTY_FORCE_PANIC) || defined(CONFIG_TTY_LAUNCH))
static int uart_recvchars_signo(FAR uart_dev_t *dev)
static int uart_recvchars_check_special(FAR uart_dev_t *dev)
{
FAR struct uart_dmaxfer_s *xfer = &dev->dmarx;
int signo;
@@ -123,20 +62,20 @@ static int uart_recvchars_signo(FAR uart_dev_t *dev)
if (xfer->nbytes <= xfer->length)
{
return uart_check_signo(dev->pid, xfer->buffer, xfer->nbytes);
return uart_check_special(dev, xfer->buffer, xfer->nbytes);
}
else
{
/* REVISIT: Additional signals could be in the second region. */
signo = uart_check_signo(dev->pid, xfer->buffer, xfer->length);
signo = uart_check_special(dev, xfer->buffer, xfer->length);
if (signo != 0)
{
return signo;
}
return uart_check_signo(dev->pid, xfer->nbuffer,
xfer->nbytes - xfer->length);
return uart_check_special(dev, xfer->nbuffer,
xfer->nbytes - xfer->length);
}
}
#endif
@@ -384,10 +323,7 @@ void uart_recvchars_done(FAR uart_dev_t *dev)
* buffer.
*/
if ((dev->tc_lflag & ISIG))
{
signo = uart_recvchars_signo(dev);
}
signo = uart_recvchars_check_special(dev);
#endif
/* Move head for nbytes. */
@@ -405,7 +341,8 @@ void uart_recvchars_done(FAR uart_dev_t *dev)
uart_datareceived(dev);
}
#if defined(CONFIG_TTY_SIGINT) || defined(CONFIG_TTY_SIGTSTP)
#if defined(CONFIG_TTY_SIGINT) || defined(CONFIG_TTY_SIGTSTP) || \
defined(CONFIG_TTY_FORCE_PANIC) || defined(CONFIG_TTY_LAUNCH)
/* Send the signal if necessary */
if (signo != 0)