mirror of
https://github.com/freebsd/freebsd-src.git
synced 2024-12-04 12:28:58 +00:00
Sync with sys/i386/isa/sio.c revision 1.207.
This commit is contained in:
parent
14f155eeb0
commit
0495b7f964
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=37025
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user