BSD 4_3_Net_2 release

[unix-history] / usr / src / sys / hp300 / stand / sd.c

diff --git a/usr/src/sys/hp300/stand/sd.c b/usr/src/sys/hp300/stand/sd.c
index 1f41d4a..084fa63 100644 (file)
--- a/usr/src/sys/hp300/stand/sd.c
+++ b/usr/src/sys/hp300/stand/sd.c
@@ -7,17 +7,44 @@
  * Van Jacobson of Lawrence Berkeley Laboratory and the Systems
  * Programming Group of the University of Utah Computer Science Department.
  *
  * Van Jacobson of Lawrence Berkeley Laboratory and the Systems
  * Programming Group of the University of Utah Computer Science Department.
  *

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

  *
  * from: Utah $Hdr: sd.c 1.2 90/01/23$
  *
  *
  * from: Utah $Hdr: sd.c 1.2 90/01/23$
  *

- *     @(#)sd.c        7.3 (Berkeley) %G%
+ *     @(#)sd.c        7.4 (Berkeley) 5/5/91

  */
 
 /*
  * SCSI CCS disk driver
  */
 
  */
 
 /*
  * SCSI CCS disk driver
  */
 

+#include <sys/param.h>

 #include "saio.h"
 #include "samachdep.h"
 
 #include "saio.h"
 #include "samachdep.h"
 


@@ -107,7 +134,7 @@ sdstrategy(io, func)
 
        ss->sc_retry = 0;
 retry:
 
        ss->sc_retry = 0;
 retry:

-       if (func == READ)
+       if (func == F_READ)

                stat = scsi_tt_read(unit, io->i_ma, io->i_cc, blk, nblk);
        else
                stat = scsi_tt_write(unit, io->i_ma, io->i_cc, blk, nblk);
                stat = scsi_tt_read(unit, io->i_ma, io->i_cc, blk, nblk);
        else
                stat = scsi_tt_write(unit, io->i_ma, io->i_cc, blk, nblk);