fixes for GENERIC kernel to find uda's

SCCS-vsn: sys/vax/uba/uda.c 7.30

diff --git a/usr/src/sys/vax/uba/uda.c b/usr/src/sys/vax/uba/uda.c
index 0356958..226e430 100644 (file)
--- a/usr/src/sys/vax/uba/uda.c
+++ b/usr/src/sys/vax/uba/uda.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)uda.c       7.29 (Berkeley) %G%
+ *     @(#)uda.c       7.30 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -309,7 +309,7 @@ udaprobe(reg, ctlr, um)
         * initialise within ten seconds.  Or so I hear; I have not seen
         * this manual myself.
         */
         * initialise within ten seconds.  Or so I hear; I have not seen
         * this manual myself.
         */

-#ifdef QBA
+#if defined(QBA) && !defined(GENERIC)

        s = spl6();
 #endif
        tries = 0;
        s = spl6();
 #endif
        tries = 0;


@@ -327,13 +327,17 @@ again:
 
        /* should have interrupted by now */
 #ifdef QBA
 
        /* should have interrupted by now */
 #ifdef QBA

+#ifndef GENERIC

        sc->sc_ipl = br = qbgetpri();
        sc->sc_ipl = br = qbgetpri();

+#else
+       sc->sc_ipl = br = 0x15;
+#endif

 #endif
        return (sizeof (struct udadevice));
 bad:
        if (++tries < 2)
                goto again;
 #endif
        return (sizeof (struct udadevice));
 bad:
        if (++tries < 2)
                goto again;

-#ifdef QBA
+#if defined(QBA) && !defined(GENERIC)

        splx(s);
 #endif
        return (0);
        splx(s);
 #endif
        return (0);