[src/trunk]: src/sys/dev/isa Make irq probing controled by patchable variable...

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

details:   https://anonhg.NetBSD.org/src/rev/b1295dfb423a
branches:  trunk
changeset: 481604:b1295dfb423a
user:      enami <enami%NetBSD.org@localhost>
date:      Wed Feb 02 14:44:09 2000 +0000

description:
Make irq probing controled by patchable variable and disable on hpcmips
by default.  It doesn't work on hpcmips.

diffstat:

 sys/dev/isa/i82365_isasubr.c |  19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diffs (57 lines):

diff -r 20fc6fc9f100 -r b1295dfb423a sys/dev/isa/i82365_isasubr.c
--- a/sys/dev/isa/i82365_isasubr.c      Wed Feb 02 14:42:53 2000 +0000
+++ b/sys/dev/isa/i82365_isasubr.c      Wed Feb 02 14:44:09 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i82365_isasubr.c,v 1.6 2000/02/01 22:56:17 chopps Exp $        */
+/*     $NetBSD: i82365_isasubr.c,v 1.7 2000/02/02 14:44:09 enami Exp $ */
 
 #define        PCICISADEBUG
 
@@ -100,6 +100,16 @@
 
 int    pcic_isa_intr_alloc_mask = PCIC_ISA_INTR_ALLOC_MASK;
 
+#ifndef        PCIC_NO_IRQ_PROBE
+#ifdef __hpcmips__
+#define        PCIC_NO_IRQ_PROBE       0
+#else
+#define        PCIC_NO_IRQ_PROBE       1
+#endif
+#endif
+
+int    pcic_no_irq_probe = PCIC_NO_IRQ_PROBE;
+
 /*****************************************************************************
  * End of configurable parameters.
  *****************************************************************************/
@@ -111,7 +121,6 @@
 #define        DPRINTF(arg)
 #endif
 
-#ifndef        PCIC_NO_IRQ_PROBE
 /*
  * count the interrupt if we have a status set
  * just use socket 0
@@ -237,7 +246,6 @@
        /* clear any current interrupt */
        pcic_read(h, PCIC_CSC);
 }
-#endif /* PCIC_NO_IRQ_PROBE */
 
 /*
  * called with interrupts enabled, light up the irqs to find out
@@ -268,12 +276,11 @@
                sc->intr_mask[h->chip] =
                    PCIC_INTR_IRQ_VALIDMASK & pcic_isa_intr_alloc_mask;
 
-#ifndef        PCIC_NO_IRQ_PROBE
                /* the cirrus chips lack support for the soft interrupt */
-               if (h->vendor != PCIC_VENDOR_CIRRUS_PD6710 &&
+               if (pcic_no_irq_probe != 0 &&
+                   h->vendor != PCIC_VENDOR_CIRRUS_PD6710 &&
                    h->vendor != PCIC_VENDOR_CIRRUS_PD672X)
                        pcic_isa_probe_interrupts(sc, h);
-#endif
 
                chipmask &= sc->intr_mask[h->chip];
        }