BSD 4_4 release

[unix-history] / usr / src / sys / hp300 / dev / scsi.c

diff --git a/usr/src/sys/hp300/dev/scsi.c b/usr/src/sys/hp300/dev/scsi.c
index 74110c0..883d2ef 100644 (file)
--- a/usr/src/sys/hp300/dev/scsi.c
+++ b/usr/src/sys/hp300/dev/scsi.c
@@ -1,18 +1,44 @@
-#ifndef DEBUG
-#define DEBUG
-#endif

 /*
 /*

- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * This code is derived from software contributed to Berkeley by
  * Van Jacobson of Lawrence Berkeley Laboratory.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * Van Jacobson of Lawrence Berkeley Laboratory.
  *

- * %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.
+ *
+ * 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.

  *
  *

- *     @(#)scsi.c      7.7 (Berkeley) %G%
+ *     @(#)scsi.c      8.1 (Berkeley) 6/10/93

  */
 
  */
 

+#ifndef DEBUG
+#define DEBUG
+#endif

 /*
  * HP9000/3xx 98658 SCSI host adaptor driver.
  */
 /*
  * HP9000/3xx 98658 SCSI host adaptor driver.
  */


@@ -23,17 +49,18 @@
 static char rcsid[] = "$Header: /usr/src/sys/hp300/dev/RCS/scsi.c,v 1.2 92/04/10 20:48:29 mike Exp $";
 #endif
 
 static char rcsid[] = "$Header: /usr/src/sys/hp300/dev/RCS/scsi.c,v 1.2 92/04/10 20:48:29 mike Exp $";
 #endif
 

-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/buf.h"
-#include "hp/dev/device.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
+
+#include <hp/dev/device.h>

 
 

-#include "scsivar.h"
-#include "scsireg.h"
-#include "dmavar.h"
+#include <hp300/dev/scsivar.h>
+#include <hp300/dev/scsireg.h>
+#include <hp300/dev/dmavar.h>

 
 

-#include "../include/cpu.h"
-#include "../hp300/isr.h"
+#include <machine/cpu.h>
+#include <hp300/hp300/isr.h>

 
 /*
  * SCSI delays
 
 /*
  * SCSI delays