BSD 4_3 release

[unix-history] / usr / src / sys / vaxuba / vp.c

diff --git a/usr/src/sys/vaxuba/vp.c b/usr/src/sys/vaxuba/vp.c
index eb0e4bb..71c576c 100644 (file)
--- a/usr/src/sys/vaxuba/vp.c
+++ b/usr/src/sys/vaxuba/vp.c
@@ -1,4 +1,10 @@
-/*     vp.c    6.3     83/09/25        */
+/*
+ * 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.
+ *
+ *     @(#)vp.c        7.1 (Berkeley) 6/5/86
+ */

 
 #include "vp.h"
 #if NVP > 0
 
 #include "vp.h"
 #if NVP > 0


@@ -14,19 +20,19 @@
  */
 #include "../machine/pte.h"
 
  */
 #include "../machine/pte.h"
 

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

 
 

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

 
 unsigned minvpph();
 
 
 unsigned minvpph();
 


@@ -252,7 +258,6 @@ vpioctl(dev, cmd, data, flag)
        register caddr_t data;
        int flag;
 {
        register caddr_t data;
        int flag;
 {

-       register int m;

        register struct vp_softc *sc = &vp_softc[VPUNIT(dev)];
        register struct vpdevice *vpaddr =
            (struct vpdevice *)vpdinfo[VPUNIT(dev)]->ui_addr;
        register struct vp_softc *sc = &vp_softc[VPUNIT(dev)];
        register struct vpdevice *vpaddr =
            (struct vpdevice *)vpdinfo[VPUNIT(dev)]->ui_addr;


@@ -261,7 +266,7 @@ vpioctl(dev, cmd, data, flag)
 
        case VGETSTATE:
                *(int *)data = sc->sc_state;
 
        case VGETSTATE:
                *(int *)data = sc->sc_state;

-               break;
+               return (0);

 
        case VSETSTATE:
                sc->sc_state =
 
        case VSETSTATE:
                sc->sc_state =