From 89f8ec801800c314b8ba4f3f96295f8b0a38bdb2 Mon Sep 17 00:00:00 2001 From: Kim Woelders Date: Thu, 25 Oct 2018 09:20:12 +0200 Subject: [PATCH] Reorder MCR debug printouts More logical, IMO... --- ttynvt.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/ttynvt.c b/ttynvt.c index 2bd1738..77c71b4 100644 --- a/ttynvt.c +++ b/ttynvt.c @@ -429,19 +429,18 @@ static void _modem_status_cb(void *cctx, int status) ttynvt_t *tty = cctx; int mcr = 0; - DBG("MCR: DSR=%c CTS=%c RI=%c DCD=%c\n", - status & TNS_STATE_DSR ? '1' : '0', - status & TNS_STATE_CTS ? '1' : '0', + DBG("MCR: CTS=%c DSR=%c RI=%c DCD=%c\n", + status & TNS_STATE_CTS ? '1' : '0', status & TNS_STATE_DSR ? '1' : '0', status & TNS_STATE_RI ? '1' : '0', status & TNS_STATE_DCD ? '1' : '0'); if (status & TNS_STATE_DCD) mcr |= TIOCM_CD; if (status & TNS_STATE_RI) mcr |= TIOCM_RI; - if (status & TNS_STATE_CTS) - mcr |= TIOCM_CTS; if (status & TNS_STATE_DSR) mcr |= TIOCM_DSR; + if (status & TNS_STATE_CTS) + mcr |= TIOCM_CTS; pthread_mutex_lock(&tty->tty_lock); 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); goto show_mctl; show_mctl: - DBG("MCR: DTR=%c RTS=%c\n", - tty->cmcr & TIOCM_DTR ? '1' : '0', - tty->cmcr & TIOCM_RTS ? '1' : '0'); + DBG("MCR: RTS=%c DTR=%c\n", + tty->cmcr & TIOCM_RTS ? '1' : '0', + tty->cmcr & TIOCM_DTR ? '1' : '0'); break; case TCSBRK: fuse_reply_ioctl(req, 0, 0, 0);