From aa15f97f60ed33e436714de58a57f27008c4ee0a Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Sat, 25 Jan 2003 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 2003-01-25 --- ip/tcp.c | 2 +- port/devuart.c | 27 ++++++++++++++++++--------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/ip/tcp.c b/ip/tcp.c index 2343d42537926c5fabf9fcba94cb34bdd0ec30a7..f8524b7603b719368b249b2eb5c40450459de448 100644 --- a/ip/tcp.c +++ b/ip/tcp.c @@ -1353,7 +1353,7 @@ limbo(Conv *s, uchar *source, uchar *dest, Tcp *seg, int version) if(ipcmp(lp->laddr, dest) != 0) continue; - /* each new SYN restarts the retramsmits */ + /* each new SYN restarts the retransmits */ lp->irs = seg->seq; break; } diff --git a/port/devuart.c b/port/devuart.c index 9cd99bba1a47e8a4b1e8250ac853aa410ffb6d30..09328727e99f551fc7ca0476389b205d283de1dc 100644 --- a/port/devuart.c +++ b/port/devuart.c @@ -350,7 +350,8 @@ uartctl(Uart *p, char *cmd) switch(*f[i]){ case 'B': case 'b': - sleep(&p->r, uartdrained, p); + if(p->enabled) + sleep(&p->r, uartdrained, p); if((*p->phys->baud)(p, n) < 0) return -1; break; @@ -360,7 +361,8 @@ uartctl(Uart *p, char *cmd) break; case 'D': case 'd': - sleep(&p->r, uartdrained, p); + if(p->enabled) + sleep(&p->r, uartdrained, p); (*p->phys->dtr)(p, n); break; case 'E': @@ -381,23 +383,27 @@ uartctl(Uart *p, char *cmd) break; case 'i': case 'I': - sleep(&p->r, uartdrained, p); + if(p->enabled) + sleep(&p->r, uartdrained, p); (*p->phys->fifo)(p, n); break; case 'K': case 'k': - sleep(&p->r, uartdrained, p); + if(p->enabled) + sleep(&p->r, uartdrained, p); (*p->phys->dobreak)(p, n); break; case 'L': case 'l': - sleep(&p->r, uartdrained, p); + if(p->enabled) + sleep(&p->r, uartdrained, p); if((*p->phys->bits)(p, n) < 0) return -1; break; case 'm': case 'M': - sleep(&p->r, uartdrained, p); + if(p->enabled) + sleep(&p->r, uartdrained, p); (*p->phys->modemctl)(p, n); break; case 'n': @@ -407,7 +413,8 @@ uartctl(Uart *p, char *cmd) break; case 'P': case 'p': - sleep(&p->r, uartdrained, p); + if(p->enabled) + sleep(&p->r, uartdrained, p); if((*p->phys->parity)(p, *(f[i]+1)) < 0) return -1; break; @@ -420,12 +427,14 @@ uartctl(Uart *p, char *cmd) break; case 'R': case 'r': - sleep(&p->r, uartdrained, p); + if(p->enabled) + sleep(&p->r, uartdrained, p); (*p->phys->rts)(p, n); break; case 'S': case 's': - sleep(&p->r, uartdrained, p); + if(p->enabled) + sleep(&p->r, uartdrained, p); if((*p->phys->stop)(p, n) < 0) return -1; break;