BSD 4_4_Lite1 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 273b9ab..ab3d08c 100644 (file)
--- a/usr/src/sys/hp300/stand/ct.c
+++ b/usr/src/sys/hp300/stand/ct.c
@@ -1,20 +1,47 @@
 /*
 /*

- * Copyright (c) 1982, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1982, 1990, 1993
+ *     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.5 (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        8.1 (Berkeley) 7/15/93

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

-#include "sys/param.h"
-#include "../dev/ctreg.h"
+#include <sys/param.h>
+
+#include <hp300/dev/ctreg.h>

 
 

-#include "saio.h"
-#include "samachdep.h"
+#include <stand.att/saio.h>
+#include <hp300/stand/samachdep.h>

 
 struct ct_iocmd ct_ioc;
 struct ct_rscmd ct_rsc;
 
 struct ct_iocmd ct_ioc;
 struct ct_rscmd ct_rsc;


@@ -132,6 +159,7 @@ ctopen(io)
        unit = io->i_ctlr;
        if (unit >= NCT)
                return(ECTLR);
        unit = io->i_ctlr;
        if (unit >= NCT)
                return(ECTLR);

+       rs = &ct_softc[ctlr][unit];

        if (rs->sc_alive == 0)
                if (ctinit(ctlr, unit) == 0)
                        return(ENXIO);
        if (rs->sc_alive == 0)
                if (ctinit(ctlr, unit) == 0)
                        return(ENXIO);