diff options
| author | kato <kato@FreeBSD.org> | 1998-06-17 09:27:15 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1998-06-17 09:27:15 +0000 |
| commit | f8ad884633bac177045ffe0d6ba0843a395821bf (patch) | |
| tree | 2f4821872353da1d2575c4cb72217699bf153859 /sys | |
| parent | 3dd20fc6df5e3ad4412950410804d2bc36a12b55 (diff) | |
| download | FreeBSD-src-f8ad884633bac177045ffe0d6ba0843a395821bf.zip FreeBSD-src-f8ad884633bac177045ffe0d6ba0843a395821bf.tar.gz | |
Sync with sys/i386/isa/sio.c revision 1.207.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/pc98/cbus/sio.c | 15 | ||||
| -rw-r--r-- | sys/pc98/pc98/sio.c | 15 |
2 files changed, 8 insertions, 22 deletions
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c index 1fbaea0..f2d1e14 100644 --- a/sys/pc98/cbus/sio.c +++ b/sys/pc98/cbus/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.59 1998/06/05 08:31:01 kato Exp $ + * $Id: sio.c,v 1.60 1998/06/08 08:55:45 kato Exp $ */ #include "opt_comconsole.h" @@ -2457,14 +2457,11 @@ repeat: com = com_addr(unit); if (com == NULL) continue; - if (com->gone) - continue; tp = com->tp; - if (tp == NULL) { + if (tp == NULL || com->gone) { /* - * XXX forget any events related to closed devices - * (actually never opened devices) so that we don't - * loop. + * Discard any events related to never-opened or + * going-away devices. */ disable_intr(); incc = com->iptr - com->ibuf; @@ -2475,10 +2472,6 @@ repeat: } com_events -= incc; enable_intr(); - if (incc != 0) - log(LOG_DEBUG, - "sio%d: %d events for device with no tp\n", - unit, incc); continue; } diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c index 1fbaea0..f2d1e14 100644 --- a/sys/pc98/pc98/sio.c +++ b/sys/pc98/pc98/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.59 1998/06/05 08:31:01 kato Exp $ + * $Id: sio.c,v 1.60 1998/06/08 08:55:45 kato Exp $ */ #include "opt_comconsole.h" @@ -2457,14 +2457,11 @@ repeat: com = com_addr(unit); if (com == NULL) continue; - if (com->gone) - continue; tp = com->tp; - if (tp == NULL) { + if (tp == NULL || com->gone) { /* - * XXX forget any events related to closed devices - * (actually never opened devices) so that we don't - * loop. + * Discard any events related to never-opened or + * going-away devices. */ disable_intr(); incc = com->iptr - com->ibuf; @@ -2475,10 +2472,6 @@ repeat: } com_events -= incc; enable_intr(); - if (incc != 0) - log(LOG_DEBUG, - "sio%d: %d events for device with no tp\n", - unit, incc); continue; } |
