Add support for microvax 3000.

[unix-history] / usr / src / sys / vax / uba / dn.c

diff --git a/usr/src/sys/vax/uba/dn.c b/usr/src/sys/vax/uba/dn.c
index c73129f..268bc59 100644 (file)
--- a/usr/src/sys/vax/uba/dn.c
+++ b/usr/src/sys/vax/uba/dn.c
@@ -1,31 +1,36 @@
-/*     dn.c    4.11    82/10/17        */
+/*
+ * Copyright (c) 1982, 1986 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *     @(#)dn.c        7.1 (Berkeley) %G%
+ */

 
 #include "dn.h"
 #if NDN > 0
 /*
  * DN-11 ACU interface
  */
 
 #include "dn.h"
 #if NDN > 0
 /*
  * DN-11 ACU interface
  */

+#include "../machine/pte.h"

 
 

-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/buf.h"
-#include "../h/map.h"
-#include "../h/pte.h"
-#include "../h/conf.h"
-#include "../h/ioctl.h"
-#include "../h/uio.h"
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "buf.h"
+#include "map.h"
+#include "conf.h"
+#include "uio.h"

 
 

-#include "../vaxuba/ubavar.h"
+#include "ubavar.h"

 
 struct dndevice {
        u_short dn_reg[4];
 };
 
 struct uba_device *dninfo[NDN];
 
 struct dndevice {
        u_short dn_reg[4];
 };
 
 struct uba_device *dninfo[NDN];

-int dnprobe(), dnattach();
-u_short dnstd[] = { 0175200 };
+int dnprobe(), dnattach(), dnintr();
+u_short dnstd[] = { 0175200, 0 };

 struct uba_driver dndriver =
        { dnprobe, 0, dnattach, 0, dnstd, "dn", dninfo };
 
 struct uba_driver dndriver =
        { dnprobe, 0, dnattach, 0, dnstd, "dn", dninfo };
 


@@ -60,6 +65,7 @@ dnprobe(reg)
 
 #ifdef lint
        br = 0; cvec = 0; br = cvec; cvec = br;
 
 #ifdef lint
        br = 0; cvec = 0; br = cvec; cvec = br;

+       dnintr(0);

 #endif
        /*
         * If there's at least one dialer out there it better be
 #endif
        /*
         * If there's at least one dialer out there it better be


@@ -133,7 +139,7 @@ dnwrite(dev, uio)
        if (error)
                return (error);
        while ((*dnreg & (PWI|ACR|DSS)) == 0 && cc >= 0) {
        if (error)
                return (error);
        while ((*dnreg & (PWI|ACR|DSS)) == 0 && cc >= 0) {

-               spl4();
+               (void) spl4();

                if ((*dnreg & PND) == 0 || cc == 0)
                        sleep((caddr_t)dnreg, DNPRI);
                else switch(*cp) {
                if ((*dnreg & PND) == 0 || cc == 0)
                        sleep((caddr_t)dnreg, DNPRI);
                else switch(*cp) {