Sync with sys/i386/isa/sio.c revision 1.229.

This commit is contained in:
KATO Takenori 1999-03-04 10:37:30 +00:00
parent 88a368fa84
commit bd87150cd2
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=44460
2 changed files with 14 additions and 6 deletions

View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* $Id: sio.c,v 1.80 1999/02/02 17:26:03 kato Exp $
* $Id: sio.c,v 1.81 1999/02/05 11:37:40 kato Exp $
*/
#include "opt_comconsole.h"
@ -1472,6 +1472,9 @@ sioattach(isdp)
dev_t dev;
#ifdef COM_ESP
Port_t *espp;
#endif
#ifdef COM_MULTIPORT
struct isa_device *idev;
#endif
Port_t iobase;
int s;
@ -1762,8 +1765,9 @@ determined_type: ;
if (unit == COM_MPMASTER(isdp))
printf(" master");
printf(")");
com->no_irq = find_isadev(isa_devtab_tty, &siodriver,
COM_MPMASTER(isdp))->id_irq == 0;
idev = find_isadev(isa_devtab_tty, &siodriver,
COM_MPMASTER(isdp));
com->no_irq = (idev == NULL || idev->id_irq == 0);
}
#endif /* COM_MULTIPORT */
#ifdef PC98

View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* $Id: sio.c,v 1.80 1999/02/02 17:26:03 kato Exp $
* $Id: sio.c,v 1.81 1999/02/05 11:37:40 kato Exp $
*/
#include "opt_comconsole.h"
@ -1472,6 +1472,9 @@ sioattach(isdp)
dev_t dev;
#ifdef COM_ESP
Port_t *espp;
#endif
#ifdef COM_MULTIPORT
struct isa_device *idev;
#endif
Port_t iobase;
int s;
@ -1762,8 +1765,9 @@ determined_type: ;
if (unit == COM_MPMASTER(isdp))
printf(" master");
printf(")");
com->no_irq = find_isadev(isa_devtab_tty, &siodriver,
COM_MPMASTER(isdp))->id_irq == 0;
idev = find_isadev(isa_devtab_tty, &siodriver,
COM_MPMASTER(isdp));
com->no_irq = (idev == NULL || idev->id_irq == 0);
}
#endif /* COM_MULTIPORT */
#ifdef PC98