summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2000-03-28 14:07:44 +0000
committerMarc Espie <espie@cvs.openbsd.org>2000-03-28 14:07:44 +0000
commit4f46f6f3916ddaa62b6b0f76011a4c4f16118f5f (patch)
tree03e29993fcd175b14def7d2e626c466ce696ad87
parent75367cc195aea852551fa9e0b4447f0bf9fcd536 (diff)
Allow wss to configure @irq 5, which is the default irq for quite a few
laptops.
-rw-r--r--sys/dev/isa/wss_isa.c4
-rw-r--r--sys/dev/isa/wssreg.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/isa/wss_isa.c b/sys/dev/isa/wss_isa.c
index c3372a7e33d..41cf817f120 100644
--- a/sys/dev/isa/wss_isa.c
+++ b/sys/dev/isa/wss_isa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wss_isa.c,v 1.2 1999/01/24 15:58:54 mickey Exp $ */
+/* $OpenBSD: wss_isa.c,v 1.3 2000/03/28 14:07:42 espie Exp $ */
/* $NetBSD: wss_isa.c,v 1.1 1998/01/19 22:18:24 augustss Exp $ */
/*
@@ -128,7 +128,7 @@ wssfind(parent, sc, ia)
struct isa_attach_args *ia;
{
static u_char interrupt_bits[12] = {
- -1, -1, -1, -1, -1, -1, -1, 0x08, -1, 0x10, 0x18, 0x20
+ -1, -1, -1, -1, -1, 0x0, -1, 0x08, -1, 0x10, 0x18, 0x20
};
static u_char dma_bits[4] = {1, 2, 0, 3};
diff --git a/sys/dev/isa/wssreg.h b/sys/dev/isa/wssreg.h
index d4c37b46c1c..f3678dca1d7 100644
--- a/sys/dev/isa/wssreg.h
+++ b/sys/dev/isa/wssreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wssreg.h,v 1.3 1997/11/07 08:07:12 niklas Exp $ */
+/* $OpenBSD: wssreg.h,v 1.4 2000/03/28 14:07:43 espie Exp $ */
/* $NetBSD: wssreg.h,v 1.3 1995/07/07 02:15:15 brezak Exp $ */
/*
@@ -41,7 +41,7 @@
/*
* Macros to detect valid hardware configuration data.
*/
-#define WSS_IRQ_VALID(irq) ((irq) == 7 || (irq) == 9 || \
+#define WSS_IRQ_VALID(irq) ((irq) == 5 || (irq) == 7 || (irq) == 9 || \
(irq) == 10 || (irq) == 11)
#define WSS_DRQ_VALID(chan) ((chan) == 0 || (chan) == 1 || (chan) == 3)
#define WSS_BASE_VALID(base) ((base) == 0x0530 || \