uzix/picocom
1
0
Fork 0
mirror of https://github.com/UzixLS/picocom.git synced 2025-07-19 07:21:18 +03:00
Code Issues Projects Releases Wiki Activity

Make term_fake_flush() a term_ops

Browse Source 
No all types of devices need implement it.
This commit is contained in:
Nick Patavalis
2018-03-01 06:07:58 +02:00
parent ae1a8e291c
commit 048863b362
2 changed files with 54 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
term.c
View File

@ -165,6 +165,52 @@ local_flush(struct term_s *t, int selector)
return tcflush(t->fd, selector);
}
static int
local_fake_flush(struct term_s *t)
{
struct termios tio, tio_orig;
int r, rval = 0;
do { /* dummy */
/* Get current termios */
r = t->ops->tcgetattr(t, &tio);
if ( r < 0 ) {
term_errno = TERM_EGETATTR;
rval = -1;
break;
}
tio_orig = tio;
/* Set flow-control to none */
tio.c_cflag &= ~(CRTSCTS);
tio.c_iflag &= ~(IXON | IXOFF | IXANY);
/* Apply termios */
r = t->ops->tcsetattr(t, TCSANOW, &tio);
if ( r < 0 ) {
term_errno = TERM_ESETATTR;
rval = -1;
break;
}
/* Wait for output to drain. Without flow-control this should
complete in finite time. */
r = t->ops->drain(t);
if ( r < 0 ) {
term_errno = TERM_EDRAIN;
rval = -1;
/* continue */
}
/* Reset flow-control to original setting. */
r = t->ops->tcsetattr(t, TCSANOW, &tio_orig);
if ( rval >=0 && r < 0 ) {
term_errno = TERM_ESETATTR;
rval = -1;
/* continue */
}
} while(0);
return rval;
}
static int
local_drain(struct term_s *t)
{
@ -218,6 +264,7 @@ static const struct term_ops local_term_ops = {
#endif
.send_break = local_send_break,
.flush = local_flush,
.fake_flush = local_fake_flush,
.drain = local_drain,
.read = local_read,
.write = local_write,
@ -1785,57 +1832,15 @@ term_drain(int fd)
int
term_fake_flush(int fd)
{
struct termios tio;
int rval, r;
struct term_s *t;
rval = 0;
t = term_find(fd);
if ( ! t )
return -1;
do { /* dummy */
t = term_find(fd);
if ( ! t ) {
rval = -1;
break;
}
/* Get current termios */
r = t->ops->tcgetattr(t, &tio);
if ( r < 0 ) {
term_errno = TERM_EGETATTR;
rval = -1;
break;
}
t->currtermios = tio;
/* Set flow-control to none */
tio.c_cflag &= ~(CRTSCTS);
tio.c_iflag &= ~(IXON | IXOFF | IXANY);
/* Apply termios */
r = t->ops->tcsetattr(t, TCSANOW, &tio);
if ( r < 0 ) {
term_errno = TERM_ESETATTR;
rval = -1;
break;
}
/* Wait for output to drain. Without flow-control this should
complete in finite time. */
r = t->ops->drain(t);
if ( r < 0 ) {
term_errno = TERM_EDRAIN;
rval = -1;
break;
}
/* Reset flow-control to original setting. */
r = t->ops->tcsetattr(t, TCSANOW, &t->currtermios);
if ( r < 0 ) {
term_errno = TERM_ESETATTR;
rval = -1;
break;
}
} while (0);
return rval;
if ( t->ops->fake_flush )
return t->ops->fake_flush(t);
return 0;
}
int

1
termint.h
View File

@ -51,6 +51,7 @@ struct term_ops {
int (*modem_bic)(struct term_s *t, const int *modem);
int (*send_break)(struct term_s *t);
int (*flush)(struct term_s *t, int selector);
int (*fake_flush)(struct term_s *t);
int (*drain)(struct term_s *t);
int (*read)(struct term_s *t, void *buf, unsigned bufsz);
int (*write)(struct term_s *t, const void *buf, unsigned bufsz);