BSD 4_3_Net_2 release

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

diff --git a/usr/src/sys/hp300/stand/ct.c b/usr/src/sys/hp300/stand/ct.c
index 79dfd25..d34d05d 100644 (file)
--- a/usr/src/sys/hp300/stand/ct.c
+++ b/usr/src/sys/hp300/stand/ct.c
@@ -2,15 +2,41 @@
  * Copyright (c) 1982, 1990 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1982, 1990 The Regents of the University of California.
  * All rights reserved.
  *

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

  *
  *

- *     @(#)ct.c        7.2 (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.
+ *
+ *     @(#)ct.c        7.3 (Berkeley) 5/5/91

  */
 
 /*
  * CS80 tape driver
  */
  */
 
 /*
  * CS80 tape driver
  */

-#include "sys/types.h"
+#include <sys/param.h>

 #include "../dev/ctreg.h"
 
 #include "saio.h"
 #include "../dev/ctreg.h"
 
 #include "saio.h"


@@ -156,12 +182,12 @@ ctstrategy(io, func)
        ct_ioc.slen = C_SLEN;
        ct_ioc.nop3 = C_NOP;
 top:
        ct_ioc.slen = C_SLEN;
        ct_ioc.nop3 = C_NOP;
 top:

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

                ct_ioc.cmd = C_READ;
                ct_ioc.addr = rs->sc_blkno;
                ct_ioc.len = io->i_cc;
        }
                ct_ioc.cmd = C_READ;
                ct_ioc.addr = rs->sc_blkno;
                ct_ioc.len = io->i_cc;
        }

-       else if (func == WRITE) {
+       else if (func == F_WRITE) {

                ct_ioc.cmd = C_WRITE;
                ct_ioc.addr = rs->sc_blkno;
                ct_ioc.len = io->i_cc;
                ct_ioc.cmd = C_WRITE;
                ct_ioc.addr = rs->sc_blkno;
                ct_ioc.len = io->i_cc;


@@ -184,7 +210,7 @@ retry:
        if (func != MTREW) {
                hpibswait(unit);
                hpibgo(unit, C_EXEC, io->i_ma, io->i_cc,
        if (func != MTREW) {
                hpibswait(unit);
                hpibgo(unit, C_EXEC, io->i_ma, io->i_cc,

-                       func != WRITE ? READ : WRITE);
+                       func != F_WRITE ? F_READ : F_WRITE);

                hpibswait(unit);
        }
        else {
                hpibswait(unit);
        }
        else {