diff options
| author | kato <kato@FreeBSD.org> | 1997-08-21 08:25:13 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1997-08-21 08:25:13 +0000 |
| commit | 708883667e044987c9eb340e37f6e0eb50bb393c (patch) | |
| tree | 174d1840ee5f2a12bc680b7f7eea63a07d591231 /sys/pc98 | |
| parent | f0e46d1c6db9f94a38838f578c1d5d5ffb8d8317 (diff) | |
| download | FreeBSD-src-708883667e044987c9eb340e37f6e0eb50bb393c.zip FreeBSD-src-708883667e044987c9eb340e37f6e0eb50bb393c.tar.gz | |
Synchronize with sys/i386/isa/sio.c revision up to 1.177.
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/cbus/sio.c | 17 | ||||
| -rw-r--r-- | sys/pc98/pc98/sio.c | 17 |
2 files changed, 8 insertions, 26 deletions
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c index 2d26234..3b1b25c 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.32 1997/08/06 09:42:57 kato Exp $ + * $Id: sio.c,v 1.33 1997/08/20 10:25:21 kato Exp $ */ #include "opt_comconsole.h" @@ -147,6 +147,7 @@ #include <i386/isa/isa_device.h> #include <i386/isa/sioreg.h> #endif +#include <i386/isa/intr_machdep.h> #ifdef COM_ESP #include <i386/isa/ic/esp.h> @@ -160,23 +161,13 @@ #include <pccard/slot.h> #endif -#ifdef SMP -#include <machine/smp.h> -#define COM_LOCK() s_lock(&com_lock) -#define COM_UNLOCK() s_unlock(&com_lock) -#else -#define COM_LOCK() -#define COM_UNLOCK() -#endif /* SMP */ - #ifdef APIC_IO /* * INTs are masked in the (global) IO APIC, * but the IRR register is in each LOCAL APIC, - * so we HAVE to unmask the INT to be able to "see INT pending" - * BUT how do we clear them??? + * so we would have to unmask the INT to be able to "see INT pending". + * So instead we just look in the 8259 ICU. */ -#include <i386/isa/intr_machdep.h> #define isa_irq_pending icu_irq_pending #endif /* APIC_IO */ diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c index 2d26234..3b1b25c 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.32 1997/08/06 09:42:57 kato Exp $ + * $Id: sio.c,v 1.33 1997/08/20 10:25:21 kato Exp $ */ #include "opt_comconsole.h" @@ -147,6 +147,7 @@ #include <i386/isa/isa_device.h> #include <i386/isa/sioreg.h> #endif +#include <i386/isa/intr_machdep.h> #ifdef COM_ESP #include <i386/isa/ic/esp.h> @@ -160,23 +161,13 @@ #include <pccard/slot.h> #endif -#ifdef SMP -#include <machine/smp.h> -#define COM_LOCK() s_lock(&com_lock) -#define COM_UNLOCK() s_unlock(&com_lock) -#else -#define COM_LOCK() -#define COM_UNLOCK() -#endif /* SMP */ - #ifdef APIC_IO /* * INTs are masked in the (global) IO APIC, * but the IRR register is in each LOCAL APIC, - * so we HAVE to unmask the INT to be able to "see INT pending" - * BUT how do we clear them??? + * so we would have to unmask the INT to be able to "see INT pending". + * So instead we just look in the 8259 ICU. */ -#include <i386/isa/intr_machdep.h> #define isa_irq_pending icu_irq_pending #endif /* APIC_IO */ |
