diff options
| author | peter <peter@FreeBSD.org> | 1999-05-08 17:52:03 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-05-08 17:52:03 +0000 |
| commit | a6e693e377034b370a49648577f26d8658e51510 (patch) | |
| tree | 23be9105a228cd4493f514b2ccf6189c1de760da /sys/dev/rc | |
| parent | 223f7d4c8b37bb443aa78306d5fcadd445bb66e2 (diff) | |
| download | FreeBSD-src-a6e693e377034b370a49648577f26d8658e51510.zip FreeBSD-src-a6e693e377034b370a49648577f26d8658e51510.tar.gz | |
Add brackets around && within || to quieten egcs. I've checked the code
and I'm reasonably sure it's right, but I don't have one of the beasties.
Diffstat (limited to 'sys/dev/rc')
| -rw-r--r-- | sys/dev/rc/rc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c index aeeb9c5..1671c7d 100644 --- a/sys/dev/rc/rc.c +++ b/sys/dev/rc/rc.c @@ -387,15 +387,15 @@ rcintr(unit) works even if IGN* is set. */ if ( !(iack & (RCSR_PE|RCSR_FE|RCSR_Break)) - || (!(iack & (RCSR_PE|RCSR_FE)) + || ((!(iack & (RCSR_PE|RCSR_FE)) || !(rc->rc_tp->t_iflag & IGNPAR)) && (!(iack & RCSR_Break) - || !(rc->rc_tp->t_iflag & IGNBRK))) { + || !(rc->rc_tp->t_iflag & IGNBRK)))) { if ( (iack & (RCSR_PE|RCSR_FE)) && (t_state & TS_CAN_BYPASS_L_RINT) && ((iack & RCSR_FE) - || (iack & RCSR_PE) - && (rc->rc_tp->t_iflag & INPCK))) + || ((iack & RCSR_PE) + && (rc->rc_tp->t_iflag & INPCK)))) val = 0; else if (val != 0 && val == rc->rc_hotchar) setsofttty(); @@ -851,9 +851,9 @@ register struct rc_chans *rc; /* Disable rx/tx intrs */ rcout(CD180_IER, rc->rc_ier = 0); if ( (tp->t_cflag & HUPCL) - || !(rc->rc_flags & RC_ACTOUT) + || (!(rc->rc_flags & RC_ACTOUT) && !(rc->rc_msvr & MSVR_CD) - && !(tp->t_cflag & CLOCAL) + && !(tp->t_cflag & CLOCAL)) || !(tp->t_state & TS_ISOPEN) ) { CCRCMD(rc->rc_rcb->rcb_unit, rc->rc_chan, CCR_ResetChan); |
