BSD 4_4 release

[unix-history] / usr / src / sys / tahoe / vba / hd.c

diff --git a/usr/src/sys/tahoe/vba/hd.c b/usr/src/sys/tahoe/vba/hd.c
index 0a18404..30afaa9 100644 (file)
--- a/usr/src/sys/tahoe/vba/hd.c
+++ b/usr/src/sys/tahoe/vba/hd.c
@@ -5,36 +5,62 @@
  * This code is derived from software contributed to Berkeley by
  * Harris Corp.
  *
  * This code is derived from software contributed to Berkeley by
  * Harris Corp.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)hd.c        7.11 (Berkeley) %G%
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)hd.c        7.12 (Berkeley) 12/16/90

  */
 
 #include "hd.h"
 
 #if NHD > 0
  */
 
 #include "hd.h"
 
 #if NHD > 0

-#include "param.h"
-#include "buf.h"
-#include "conf.h"
-#include "dkstat.h"
-#include "disklabel.h"
-#include "file.h"
-#include "systm.h"
-#include "vmmac.h"
-#include "time.h"
-#include "proc.h"
-#include "uio.h"
-#include "syslog.h"
-#include "kernel.h"
-#include "ioctl.h"
-#include "stat.h"
-#include "errno.h"
-
-#include "../tahoe/cpu.h"
-#include "../tahoe/mtpr.h"
-
-#include "../tahoevba/vbavar.h"
-#include "../tahoevba/hdreg.h"
+#include "sys/param.h"
+#include "sys/buf.h"
+#include "sys/conf.h"
+#include "sys/dkstat.h"
+#include "sys/disklabel.h"
+#include "sys/file.h"
+#include "sys/systm.h"
+#include "sys/vmmac.h"
+#include "sys/time.h"
+#include "sys/proc.h"
+#include "sys/uio.h"
+#include "sys/syslog.h"
+#include "sys/kernel.h"
+#include "sys/ioctl.h"
+#include "sys/stat.h"
+#include "sys/errno.h"
+
+#include "../include/cpu.h"
+#include "../include/mtpr.h"
+
+#include "../vba/vbavar.h"
+#include "../vba/hdreg.h"

 
 #define        b_cylin b_resid
 
 
 #define        b_cylin b_resid