sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drivers/pty: Echo input by default

Browse Source 
Align the pty behavior to linux/bsd,

Also fix the ECHO issue with microadb after https://github.com/apache/nuttx/pull/8691.

adb shell will echo normally with this patch.

Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
This commit is contained in:
Huang Qi 2023-03-20 10:54:12 +08:00 committed by Masayuki Ishikawa
parent d4e6d9ab77
commit fab77cd322
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/serial/pty.c
View File

@ -74,6 +74,7 @@ struct pty_dev_s
struct file pd_sink; /* Accepts data from write() method (pipe input) */ struct file pd_sink; /* Accepts data from write() method (pipe input) */
bool pd_master; /* True: this is the master */ bool pd_master; /* True: this is the master */
tcflag_t pd_iflag; /* Terminal input modes */ tcflag_t pd_iflag; /* Terminal input modes */
tcflag_t pd_lflag; /* Terminal local modes */
tcflag_t pd_oflag; /* Terminal output modes */ tcflag_t pd_oflag; /* Terminal output modes */
struct pty_poll_s pd_poll[CONFIG_DEV_PTY_NPOLLWAITERS]; struct pty_poll_s pd_poll[CONFIG_DEV_PTY_NPOLLWAITERS];
}; };
@ -470,6 +471,11 @@ static ssize_t pty_read(FAR struct file *filep, FAR char *buffer, size_t len)
ntotal = file_read(&dev->pd_src, buffer, len); ntotal = file_read(&dev->pd_src, buffer, len);
} }
if (dev->pd_lflag & ECHO)
{
pty_write(filep, buffer, ntotal);
}
return ntotal; return ntotal;
} }
@ -949,7 +955,7 @@ int pty_register2(int minor, bool susv1)
/* Map CR -> NL from terminal input (master) /* Map CR -> NL from terminal input (master)
* For some usage like adb shell: * For some usage like adb shell:
* adb shell write \r -> nsh read \n * adb shell write \r -> nsh read \n and echo input
* nsh write \n -> adb shell read \r\n * nsh write \n -> adb shell read \r\n
*/ */
@ -961,6 +967,7 @@ int pty_register2(int minor, bool susv1)
devpair->pp_master.pd_oflag = OPOST | OCRNL; devpair->pp_master.pd_oflag = OPOST | OCRNL;
devpair->pp_slave.pd_devpair = devpair; devpair->pp_slave.pd_devpair = devpair;
devpair->pp_slave.pd_oflag = OPOST | ONLCR; devpair->pp_slave.pd_oflag = OPOST | ONLCR;
devpair->pp_slave.pd_lflag = ECHO;
/* Register the master device /* Register the master device
* *