1
0
mirror of https://github.com/UzixLS/picocom.git synced 2025-07-19 07:21:18 +03:00

Don't wait for negotations if run with --noinit

Don't wait for negotiations to finish and for port configuration to be
completed if picocom is run with --noinit (in which case s->set_termios
will not be set).
This commit is contained in:
Nick Patavalis
2018-02-25 17:05:53 +02:00
parent fe89a14892
commit afcbbc746b

View File

@ -1137,9 +1137,9 @@ tn2217_read(struct term_s *t, void *buf, unsigned bufsz)
unsigned char *iac;
int r;
/* FIXME(npat): Maybe don't wait if s->set_termios is not set
(--noinit) */
if ( ! cond_initial_conf_complete(t) ) {
/* If s->set_termios is not set (i.e. --noinit was given), the
port will not be configured and we don't have to wait. */
if ( s->set_termios && ! cond_initial_conf_complete(t) ) {
/* Port may not have been configured yet. Wait for
negotiations to end, and configuration commands to get
transmitted *and* replies received. */
@ -1246,9 +1246,9 @@ tn2217_write(struct term_s *t, const void *buf, unsigned bufsz)
{
int r;
/* FIXME(npat): Maybe don't wait if s->set_termios is not set
(--noinit) */
if ( ! cond_comport_start(t) ) {
/* If s->set_termios is not set (i.e. --noinit was given), the
port will not be configured and we don't have to wait. */
if ( STATE(t)->set_termios && ! cond_comport_start(t) ) {
/* Port may not have been configured yet. Wait for
negotiations to end, and configuration commands to get
transmitted. It is not necessary to wait for them to get