matt/ttynvt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reorder MCR debug printouts

Browse Source 
More logical, IMO...
This commit is contained in:
Kim Woelders
2018-10-25 09:20:12 +02:00
parent de0845a9ce
commit 89f8ec8018
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ttynvt.c
+7 -8
View File
@@ -429,19 +429,18 @@ static void _modem_status_cb(void *cctx, int status)
ttynvt_t *tty = cctx; ttynvt_t *tty = cctx;
int mcr = 0; int mcr = 0;
DBG("MCR: DSR=%c CTS=%c RI=%c DCD=%c\n", DBG("MCR: CTS=%c DSR=%c RI=%c DCD=%c\n",
status & TNS_STATE_DSR ? '1' : '0', status & TNS_STATE_CTS ? '1' : '0', status & TNS_STATE_DSR ? '1' : '0',
status & TNS_STATE_CTS ? '1' : '0',
status & TNS_STATE_RI ? '1' : '0', status & TNS_STATE_DCD ? '1' : '0'); status & TNS_STATE_RI ? '1' : '0', status & TNS_STATE_DCD ? '1' : '0');
if (status & TNS_STATE_DCD) if (status & TNS_STATE_DCD)
mcr |= TIOCM_CD; mcr |= TIOCM_CD;
if (status & TNS_STATE_RI) if (status & TNS_STATE_RI)
mcr |= TIOCM_RI; mcr |= TIOCM_RI;
if (status & TNS_STATE_CTS)
mcr |= TIOCM_CTS;
if (status & TNS_STATE_DSR) if (status & TNS_STATE_DSR)
mcr |= TIOCM_DSR; mcr |= TIOCM_DSR;
if (status & TNS_STATE_CTS)
mcr |= TIOCM_CTS;
pthread_mutex_lock(&tty->tty_lock); pthread_mutex_lock(&tty->tty_lock);
tty->smcr_last = tty->smcr; tty->smcr_last = tty->smcr;
@@ -933,9 +932,9 @@ ttynvt_ioctl(fuse_req_t req, int cmd, void *arg,
TNS_CTL_RTS_ON : TNS_CTL_RTS_OFF); TNS_CTL_RTS_ON : TNS_CTL_RTS_OFF);
goto show_mctl; goto show_mctl;
show_mctl: show_mctl:
DBG("MCR: DTR=%c RTS=%c\n", DBG("MCR: RTS=%c DTR=%c\n",
tty->cmcr & TIOCM_DTR ? '1' : '0', tty->cmcr & TIOCM_RTS ? '1' : '0',
tty->cmcr & TIOCM_RTS ? '1' : '0'); tty->cmcr & TIOCM_DTR ? '1' : '0');
break; break;
case TCSBRK: case TCSBRK:
fuse_reply_ioctl(req, 0, 0, 0); fuse_reply_ioctl(req, 0, 0, 0);