From 800bc4d3d65c276d6cb49b51f4feb3bf66ef9834 Mon Sep 17 00:00:00 2001
From: Keith Bostic <bostic@ucbvax.Berkeley.EDU>
Date: Sat, 4 May 1991 23:21:06 -0800
Subject: [PATCH] READ, WRITE -> F_READ, F_WRITE

SCCS-vsn: sys/tahoe/stand/hd.c 7.11
SCCS-vsn: sys/tahoe/stand/cy.c 7.12
SCCS-vsn: sys/tahoe/stand/vd.c 7.18
---
 usr/src/sys/tahoe/stand/cy.c | 8 ++++----
 usr/src/sys/tahoe/stand/hd.c | 4 ++--
 usr/src/sys/tahoe/stand/vd.c | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/usr/src/sys/tahoe/stand/cy.c b/usr/src/sys/tahoe/stand/cy.c
index 64f43a4841..2fd0345d44 100644
--- a/usr/src/sys/tahoe/stand/cy.c
+++ b/usr/src/sys/tahoe/stand/cy.c
@@ -1,4 +1,4 @@
-/*	cy.c	7.11	90/12/16	*/
+/*	cy.c	7.12	91/05/04	*/
 
 /*
  * Cypher tape driver. Stand alone version.
@@ -144,7 +144,7 @@ cystrategy(io, func)
 		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;
 
@@ -184,7 +184,7 @@ cycmd(io, 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);
@@ -195,7 +195,7 @@ cycmd(io, func)
 		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);
diff --git a/usr/src/sys/tahoe/stand/hd.c b/usr/src/sys/tahoe/stand/hd.c
index a47f1ccd09..180748b8f1 100644
--- a/usr/src/sys/tahoe/stand/hd.c
+++ b/usr/src/sys/tahoe/stand/hd.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)hd.c	7.10 (Berkeley) %G%
+ *	@(#)hd.c	7.11 (Berkeley) %G%
  */
 
 #include "sys/param.h"
@@ -145,7 +145,7 @@ hdstrategy(io, cmd)
 	}
 	dlp = &dklabel[io->i_unit][io->i_ctlr][io->i_bus];
 	sector = io->i_bn * HDC_SPB;
-	mcb.command = (cmd == READ) ? HCMD_READ : HCMD_WRITE;
+	mcb.command = (cmd == F_READ) ? HCMD_READ : HCMD_WRITE;
 	mcb.drive = io->i_unit;
 	mcb.cyl = sector / dlp->d_secpercyl;
 	mcb.head = (sector / dlp->d_nsectors) % dlp->d_ntracks;
diff --git a/usr/src/sys/tahoe/stand/vd.c b/usr/src/sys/tahoe/stand/vd.c
index 59c9cf962a..28ddbebb72 100644
--- a/usr/src/sys/tahoe/stand/vd.c
+++ b/usr/src/sys/tahoe/stand/vd.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)vd.c	7.17 (Berkeley) %G%
+ *	@(#)vd.c	7.18 (Berkeley) %G%
  */
 
 /*
@@ -75,7 +75,7 @@ vdopen(io)
 		tio.i_ma = lbuf;
 		tio.i_cc = DEV_BSIZE;
 		tio.i_flgs |= F_RDDATA;
-		if (vdstrategy(&tio, READ) != DEV_BSIZE)
+		if (vdstrategy(&tio, F_READ) != DEV_BSIZE)
 			return (ERDLAB);
 		dlp = (struct disklabel *)(lbuf + LABELOFFSET);
 		if (dlp->d_magic != DISKMAGIC || dlp->d_magic2 != DISKMAGIC)
@@ -259,7 +259,7 @@ vdstrategy(io, cmd)
 	sn = sn % lp->d_nsectors;
 
 top:
-	dcb.opcode = (cmd == READ ? VDOP_RD : VDOP_WD);
+	dcb.opcode = (cmd == F_READ ? VDOP_RD : VDOP_WD);
 	dcb.intflg = DCBINT_NONE;
 	dcb.nxtdcb = (struct dcb *)0;	/* end of chain */
 	dcb.operrsta  = 0;
@@ -282,7 +282,7 @@ top:
 		if (retries++ == 0 && vdreset_ctlr(ctlr, io->i_unit) == 0 &&
 		    vdreset_drive(io))
 			goto top;
-		vderror(io->i_unit, cmd == READ ? "read" : "write", &dcb);
+		vderror(io->i_unit, cmd == F_READ ? "read" : "write", &dcb);
 		io->i_error = EIO;
 		return (-1);
 	}
-- 
2.20.1