Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-08-17 10:23:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

libc:getline support backspace

Browse source 
Signed-off-by: zhangwenjian <zhangwenjian@xiaomi.com>
This commit is contained in:
zhangwenjian 2024-05-23 13:13:48 +08:00 • committed by Xiang Xiao
parent e4e355d164
commit df5c876932
2 changed files with 51 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/serial/pty.c
View file

@ -1074,7 +1074,7 @@ int pty_register2(int minor, bool susv1)
devpair->pp_master.pd_oflag = OPOST | OCRNL;
devpair->pp_slave.pd_devpair = devpair;
devpair->pp_slave.pd_oflag = OPOST | ONLCR;
devpair->pp_slave.pd_lflag = ECHO;
devpair->pp_slave.pd_lflag = ECHO | ICANON;
#if defined(CONFIG_TTY_SIGINT) || defined(CONFIG_TTY_SIGTSTP)
/* Initialize of the task that will receive SIGINT signals. */

63
drivers/serial/serial.c
View file

@ -909,6 +909,25 @@ static ssize_t uart_read(FAR struct file *filep,
}
}
if ((dev->tc_lflag & ICANON) &&
(ch == ASCII_BS || ch == ASCII_DEL))
{
if (recvd > 0)
{
*buffer-- = '\0';
recvd--;
if (dev->tc_lflag & ECHO)
{
uart_putxmitchar(dev, '\b', true);
uart_putxmitchar(dev, ' ', true);
uart_putxmitchar(dev, '\b', true);
echoed = true;
}
}
continue;
}
/* Specifically not handled:
*
* All of the local modes; echo, line editing, etc.
@ -967,6 +986,11 @@ static ssize_t uart_read(FAR struct file *filep,
echoed = true;
}
}
if ((dev->tc_lflag & ICANON) && ch == '\n')
{
break;
}
}
#ifdef CONFIG_DEV_SERIAL_FULLBLOCKS
@ -993,7 +1017,7 @@ static ssize_t uart_read(FAR struct file *filep,
* to the caller?
*/
else if (recvd > 0)
else if (recvd > 0 && !(dev->tc_lflag & ICANON))
{
/* Yes.. break out of the loop and return the number of bytes
* received up to the wait condition.
@ -1095,26 +1119,39 @@ static ssize_t uart_read(FAR struct file *filep,
* thread goes to sleep.
*/
if (dev->tc_lflag & ICANON)
{
#ifdef CONFIG_SERIAL_TERMIOS
dev->minrecv = MIN(buflen - recvd, dev->minread - recvd);
if (dev->timeout)
{
nxmutex_unlock(&dev->recv.lock);
ret = nxsem_tickwait(&dev->recvsem,
DSEC2TICK(dev->timeout));
}
else
dev->minrecv = 0;
#endif
{
nxmutex_unlock(&dev->recv.lock);
ret = nxsem_wait(&dev->recvsem);
nxmutex_lock(&dev->recv.lock);
}
else
{
#ifdef CONFIG_SERIAL_TERMIOS
dev->minrecv = MIN(buflen - recvd,
dev->minread - recvd);
if (dev->timeout)
{
nxmutex_unlock(&dev->recv.lock);
ret = nxsem_tickwait(&dev->recvsem,
DSEC2TICK(dev->timeout));
}
else
#endif
{
nxmutex_unlock(&dev->recv.lock);
ret = nxsem_wait(&dev->recvsem);
}
nxmutex_lock(&dev->recv.lock);
nxmutex_lock(&dev->recv.lock);
#ifdef CONFIG_SERIAL_TERMIOS
dev->minrecv = dev->minread;
dev->minrecv = dev->minread;
#endif
}
}
leave_critical_section(flags);
@ -1924,7 +1961,7 @@ int uart_register(FAR const char *path, FAR uart_dev_t *dev)
{
/* Enable signals and echo by default */
dev->tc_lflag |= ISIG | ECHO;
dev->tc_lflag |= ISIG | ECHO | ICANON;
/* Enable \n -> \r\n translation for the console */