[src/netbsd-1-5]: src/sys/arch/i386/isa Pull up revision 1.2 (requested by th...

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

details:   https://anonhg.NetBSD.org/src/rev/33ade6f3746b
branches:  netbsd-1-5
changeset: 490572:33ade6f3746b
user:      he <he%NetBSD.org@localhost>
date:      Sat Feb 03 17:45:12 2001 +0000

description:
Pull up revision 1.2 (requested by thorpej):
  Avoid doing Very Bad Things by passing a horrible IRQ value to
  npxprobe1().  Fixes a problem on IBM Thinkpads.

diffstat:

 sys/arch/i386/isa/npx_isa.c |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (31 lines):

diff -r ff79bc456674 -r 33ade6f3746b sys/arch/i386/isa/npx_isa.c
--- a/sys/arch/i386/isa/npx_isa.c       Sat Feb 03 17:42:23 2001 +0000
+++ b/sys/arch/i386/isa/npx_isa.c       Sat Feb 03 17:45:12 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: npx_isa.c,v 1.1 2000/06/16 03:47:24 thorpej Exp $      */
+/*     $NetBSD: npx_isa.c,v 1.1.2.1 2001/02/03 17:45:12 he Exp $       */
 
 /*-
  * Copyright (c) 1994, 1995, 1998 Charles M. Hannum.  All rights reserved.
@@ -77,6 +77,12 @@
 
        bus_space_unmap(ia->ia_iot, ioh, ia->ia_iosize);
 
+       /*
+        * Remember our result -- we don't want to have to npxprobe1()
+        * again (especially if we've zapped the IRQ).
+        */
+       ia->ia_aux = (void *)(u_long)result;
+
        return (result != NPX_NONE);
 }
 
@@ -93,7 +99,7 @@
                panic("npxattach: unable to map I/O space");
        }
 
-       sc->sc_type = npxprobe1(sc->sc_iot, sc->sc_ioh, ia->ia_irq);
+       sc->sc_type = (u_long) ia->ia_aux;
 
        switch (sc->sc_type) {
        case NPX_INTERRUPT: