[src/trunk]: src/sys/arch/i386/isa Don't panic if we detect an IRQ combinatio...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4878537b4c71
branches:  trunk
changeset: 501978:4878537b4c71
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Jan 10 01:15:32 2001 +0000

description:
Don't panic if we detect an IRQ combination that can't be shared,
just return NULL.

diffstat:

 sys/arch/i386/isa/isa_machdep.c |  19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diffs (33 lines):

diff -r 9dc8c303c7d3 -r 4878537b4c71 sys/arch/i386/isa/isa_machdep.c
--- a/sys/arch/i386/isa/isa_machdep.c   Wed Jan 10 01:13:54 2001 +0000
+++ b/sys/arch/i386/isa/isa_machdep.c   Wed Jan 10 01:15:32 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isa_machdep.c,v 1.50 2000/11/14 22:55:51 thorpej Exp $ */
+/*     $NetBSD: isa_machdep.c,v 1.51 2001/01/10 01:15:32 thorpej Exp $ */
 
 #define ISA_DMA_STATS
 
@@ -531,11 +531,18 @@
                if (type == intrtype[irq])
                        break;
        case IST_PULSE:
-               if (type != IST_NONE)
-                       panic("intr_establish: irq %d can't share %s with %s",
-                             irq,
-                             isa_intr_typename(intrtype[irq]),
-                             isa_intr_typename(type));
+               if (type != IST_NONE) {
+                       /*
+                        * We can't share interrupts in this case.
+                        */
+#ifdef DEBUG
+                       printf("intr_establish: irq %d can't share %s "
+                           "with %s\n", irq,
+                           isa_intr_typename(intrtype[irq]),
+                           isa_intr_typename(type));
+#endif
+                       return (NULL);
+               }
                break;
        }