date and time created 91/05/12 22:30:02 by william

[unix-history] / usr / src / sys / tahoe / stand / cy.c

diff --git a/usr/src/sys/tahoe/stand/cy.c b/usr/src/sys/tahoe/stand/cy.c
index 867c95c..85c00d6 100644 (file)
--- a/usr/src/sys/tahoe/stand/cy.c
+++ b/usr/src/sys/tahoe/stand/cy.c
@@ -1,20 +1,29 @@
-/*     cy.c    7.8     89/04/25        */
+/*-
+ * Copyright (c) 1991 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Computer Consoles Inc.
+ *
+ * %sccs.include.proprietary.c%
+ *
+ *     @(#)cy.c        7.13 (Berkeley) %G%
+ */

 
 /*
  * Cypher tape driver. Stand alone version.
  */
 
 /*
  * Cypher tape driver. Stand alone version.
  */

-#include "machine/pte.h"
-#include "machine/mtpr.h"
+#include "../include/pte.h"
+#include "../include/mtpr.h"

 
 

-#include "param.h"
-#include "inode.h"
-#include "fs.h"
+#include "sys/param.h"
+#include "sys/time.h"

 
 

-#include "saio.h"
+#include "stand/saio.h"

 
 #define CYERROR
 
 #define CYERROR

-#include "../tahoevba/cyreg.h"
-#include "../tahoevba/vbaparam.h"
+#include "../vba/cyreg.h"
+#include "../vba/vbaparam.h"

 
 /*
  * NB: this driver assumes unit 0 throughout.
 
 /*
  * NB: this driver assumes unit 0 throughout.


@@ -145,7 +154,7 @@ cystrategy(io, func)
                cycmd(io, CY_SFORW);
                tpb.tprec = 0;
        }
                cycmd(io, CY_SFORW);
                tpb.tprec = 0;
        }

-       if (func == READ || func == WRITE) {
+       if (func == F_READ || func == F_WRITE) {

                struct iob liob;
                register struct iob *lio = &liob;
 
                struct iob liob;
                register struct iob *lio = &liob;
 


@@ -185,7 +194,7 @@ cycmd(io, func)
        cyldmba(ccb.cbtpb, (caddr_t)&tpb);
        tpb.tpcmd = func;
        switch (func) {
        cyldmba(ccb.cbtpb, (caddr_t)&tpb);
        tpb.tpcmd = func;
        switch (func) {

-       case READ:
+       case F_READ:

 #ifdef notdef
                if (io->i_cc > cyblocksize)
                        tpb.tpsize = htoms(cyblocksize);
 #ifdef notdef
                if (io->i_cc > cyblocksize)
                        tpb.tpsize = htoms(cyblocksize);


@@ -196,7 +205,7 @@ cycmd(io, func)
                tpb.tpcmd = CY_RCOM;
                cyblock++;
                break;
                tpb.tpcmd = CY_RCOM;
                cyblock++;
                break;

-       case WRITE:
+       case F_WRITE:

                tpb.tpcmd = CY_WCOM;
                tpb.tpsize = htoms(io->i_cc);
                cyldmba(tpb.tpdata, io->i_ma);
                tpb.tpcmd = CY_WCOM;
                tpb.tpsize = htoms(io->i_cc);
                cyldmba(tpb.tpdata, io->i_ma);