diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 8a89fab908e4..424842112481 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.89 1994/02/25 22:30:34 mycroft Exp $
+ *	$Id: machdep.c,v 1.90 1994/03/06 17:20:08 mycroft Exp $
  */
 
 #include <stddef.h>
@@ -617,7 +617,7 @@ boot(arghowto)
 			if (nbusy == 0)
 				break;
 			printf("%d ", nbusy);
-			DELAY(40000 * iter);
+			delay(40000 * iter);
 		}
 		if (nbusy)
 			printf("giving up\n");
@@ -629,7 +629,7 @@ boot(arghowto)
 		 */
 		resettodr();
 
-		DELAY(10000);			/* wait for printf to finish */
+		delay(10000);			/* wait for printf to finish */
 	}
 	splhigh();
 	devtype = major(rootdev);
@@ -700,7 +700,7 @@ dumpsys()
 		break;
 	}
 	printf("\n\n");
-	DELAY(1000);
+	delay(1000);
 }
 
 #ifdef HZ
diff --git a/sys/arch/i386/isa/aha1542.c b/sys/arch/i386/isa/aha1542.c
index 736e4e7d7621..7954c8b5aed6 100644
--- a/sys/arch/i386/isa/aha1542.c
+++ b/sys/arch/i386/isa/aha1542.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- *	$Id: aha1542.c,v 1.17 1994/01/03 23:53:29 mycroft Exp $
+ *	$Id: aha1542.c,v 1.18 1994/03/06 17:18:43 mycroft Exp $
  */
 
 /*
@@ -497,7 +497,7 @@ ahaattach(struct isa_device *dev)
 		}
 	}
 	if(!(speedprint & (1<<masunit))) {
-		DELAY(1000000);
+		delay(1000000);
 		speedprint |= (1<<masunit);
 		printf("aha%d: bus speed %dns\n", masunit, speed[masunit]);
 	}
@@ -755,7 +755,7 @@ aha_init(int unit)
 	 * Assume we have a board at this stage
 	 * setup dma channel from jumpers and save int level
 	 */
-	DELAY(1000);
+	delay(1000);
 	aha_cmd(unit, 0, sizeof(conf), 0, (u_char *)&conf, AHA_CONF_GET);
 	switch(conf.chan) {
 	case CHAN0:
diff --git a/sys/arch/i386/isa/bt742a.c b/sys/arch/i386/isa/bt742a.c
index be40b7e79401..882b683d1b2c 100644
--- a/sys/arch/i386/isa/bt742a.c
+++ b/sys/arch/i386/isa/bt742a.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- *	$Id: bt742a.c,v 1.14 1994/03/01 12:42:36 deraadt Exp $
+ *	$Id: bt742a.c,v 1.15 1994/03/06 17:18:46 mycroft Exp $
  */
 
 /*
@@ -840,7 +840,7 @@ bt_init(unit)
 	 * setup dma channel from jumpers and save int
 	 * level
 	 */
-	DELAY(200);
+	delay(200);
 
 	bt_cmd(unit, 0, sizeof(conf), 0, &conf, BT_CONF_GET);
 	switch (conf.chan) {
diff --git a/sys/arch/i386/isa/clock.c b/sys/arch/i386/isa/clock.c
index f64c9d9d1e0f..1ac8507f2eb2 100644
--- a/sys/arch/i386/isa/clock.c
+++ b/sys/arch/i386/isa/clock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.17 1994/02/08 05:10:48 mycroft Exp $
+ *	$Id: clock.c,v 1.18 1994/03/06 17:18:48 mycroft Exp $
  */
 /* 
  * Mach Operating System
@@ -171,7 +171,7 @@ enablertclock(void) {
 void
 spinwait(int millisecs)
 {
-	DELAY(1000 * millisecs);
+	delay(1000 * millisecs);
 }
 
 static int first_rtcopen_ever = 1;
diff --git a/sys/arch/i386/isa/com.c b/sys/arch/i386/isa/com.c
index e597e24facb3..1d64cafbc43d 100644
--- a/sys/arch/i386/isa/com.c
+++ b/sys/arch/i386/isa/com.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: com.c,v 1.19 1994/02/09 21:13:41 mycroft Exp $
+ *	$Id: com.c,v 1.20 1994/03/06 17:18:50 mycroft Exp $
  */
 
 #include "com.h"
@@ -122,7 +122,7 @@ struct isa_device *dev;
 	/* force access to id reg */
 	outb(dev->id_iobase+com_cfcr, 0);
 	outb(dev->id_iobase+com_iir, 0);
-	DELAY(100);
+	delay(100);
 	if ((inb(dev->id_iobase+com_iir) & 0x38) == 0)
 		return(8);
 	return(0);
@@ -139,14 +139,14 @@ struct isa_device *isdp;
 
 	unit = isdp->id_unit;
 	if (unit == comconsole)
-		DELAY(1000);
+		delay(1000);
 	com_addr[unit] = port;
 	com_active |= 1 << unit;
 	comsoftCAR |= 1 << unit;	/* XXX */
 
 	/* look for a NS 16550AF UART with FIFOs */
 	outb(port+com_fifo, FIFO_ENABLE|FIFO_RCV_RST|FIFO_XMT_RST|FIFO_TRIGGER_4);
-	DELAY(100);
+	delay(100);
 	if ((inb(port+com_iir) & IIR_FIFO_MASK) == IIR_FIFO_MASK) {
 		com_hasfifo |= 1 << unit;
 		printf("com%d: fifo\n", isdp->id_unit);
diff --git a/sys/arch/i386/isa/cy.c b/sys/arch/i386/isa/cy.c
index e81de5f72ae5..9f3753cacbc2 100644
--- a/sys/arch/i386/isa/cy.c
+++ b/sys/arch/i386/isa/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.4 1994/02/09 21:13:43 mycroft Exp $
+ *	$Id: cy.c,v 1.5 1994/03/06 17:18:51 mycroft Exp $
  */
 
 /*
@@ -146,7 +146,7 @@ int		cyspeed(int speed, int *prescaler_io);
 static void	cy_channel_init(dev_t dev, int reset);
 static void	cd1400_channel_cmd(cy_addr base, u_char cmd);
 
-void		DELAY(int delay);
+void		delay(int delay);
 
 extern unsigned int	delaycount;	/* calibrated 1 ms cpu-spin delay */
 
@@ -239,14 +239,14 @@ cyprobe(struct isa_device *dev)
     /* Cyclom-16Y hardware reset (Cyclom-8Ys don't care) */
     i = *(cy_addr)(dev->id_maddr + CYCLOM_RESET_16);
 
-    DELAY(500);	/* wait for the board to get its act together (500 us) */
+    delay(500);	/* wait for the board to get its act together (500 us) */
 
     for (i = 0; i < CD1400s_PER_CYCLOM; i++) {
 	cy_addr	base = dev->id_maddr + i * CD1400_MEMSIZE;
 
 	/* wait for chip to become ready for new command */
 	for (j = 0; j < 100; j += 50) {
-	    DELAY(50);	/* wait 50 us */
+	    delay(50);	/* wait 50 us */
 
 	    if (!*(base + CD1400_CCR))
 	    	break;
@@ -260,7 +260,7 @@ cyprobe(struct isa_device *dev)
 
 	/* wait for the CD1400 to initialise itself */
 	for (j = 0; j < 1000; j += 50) {
-	    DELAY(50);	/* wait 50 us */
+	    delay(50);	/* wait 50 us */
 
 	    /* retrieve firmware version */
 	    version = *(base + CD1400_GFRCR);
diff --git a/sys/arch/i386/isa/fd.c b/sys/arch/i386/isa/fd.c
index 020c8562a683..4330d816b818 100644
--- a/sys/arch/i386/isa/fd.c
+++ b/sys/arch/i386/isa/fd.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.24 1994/02/06 10:04:40 mycroft Exp $
+ *	$Id: fd.c,v 1.25 1994/03/06 17:18:54 mycroft Exp $
  *
  * Largely rewritten to handle multiple controllers and drives
  * By Julian Elischer, Sun Apr  4 16:34:33 WST 1993
@@ -206,7 +206,7 @@ struct isa_device *dev;
 
 	/* Try a reset, don't change motor on */
 	set_motor(fdcu,0,1);
-	DELAY(100);
+	delay(100);
 	set_motor(fdcu,0,0);
 	/* see if it can handle a command */
 	if (out_fdc(fdcu,NE7CMD_SPECIFY) < 0)
@@ -769,7 +769,7 @@ int fdstate(fdcu_t fdcu, fdc_p fdc)
 	case RESETCTLR:
 		/* Try a reset, keep motor on */
 		set_motor(fdcu,fd->fdsu,1);
-		DELAY(100);
+		delay(100);
 		set_motor(fdcu,fd->fdsu,0);
 		outb(fdc->baseport+fdctl,fd->ft->trans);
 		TRACE1("[0x%x->fdctl]",fd->ft->trans);
diff --git a/sys/arch/i386/isa/if_ed.c b/sys/arch/i386/isa/if_ed.c
index e4493042a758..9a2e2582ebe1 100644
--- a/sys/arch/i386/isa/if_ed.c
+++ b/sys/arch/i386/isa/if_ed.c
@@ -13,7 +13,7 @@
  * Currently supports the Western Digital/SMC 8003 and 8013 series, the 3Com
  * 3c503, the NE1000 and NE2000, and a variety of similar clones.
  *
- *	$Id: if_ed.c,v 1.35 1994/03/02 22:47:36 mycroft Exp $
+ *	$Id: if_ed.c,v 1.36 1994/03/06 17:18:57 mycroft Exp $
  */
 
 #include "ed.h"
@@ -244,7 +244,7 @@ ed_probe_WD80x3(isa_dev)
 
 #ifdef TOSH_ETHER
 	outb(sc->asic_addr + ED_WD_MSR, ED_WD_MSR_POW);
-	DELAY(10000);
+	delay(10000);
 #endif
 
 	/*
@@ -273,11 +273,11 @@ ed_probe_WD80x3(isa_dev)
 #else
 	outb(sc->asic_addr + ED_WD_MSR, ED_WD_MSR_RST);
 #endif
-	DELAY(100);
+	delay(100);
 	outb(sc->asic_addr + ED_WD_MSR,
 	    inb(sc->asic_addr + ED_WD_MSR) & ~ED_WD_MSR_RST);
 	/* Wait in the case this card is reading it's EEROM. */
-	DELAY(5000);
+	delay(5000);
 
 	sc->vendor = ED_VENDOR_WD_SMC;
 	sc->type = inb(sc->asic_addr + ED_WD_CARD_ID);
@@ -668,7 +668,7 @@ ed_probe_3Com(isa_dev)
 	outb(sc->asic_addr + ED_3COM_CR, ED_3COM_CR_RST | ED_3COM_CR_XSEL);
 
 	/* Wait for a while, then un-reset it. */
-	DELAY(50);
+	delay(50);
 	/*
 	 * The 3Com ASIC defaults to rather strange settings for the CR after a
 	 * reset - it's important to set it again after the following outb
@@ -677,7 +677,7 @@ ed_probe_3Com(isa_dev)
 	outb(sc->asic_addr + ED_3COM_CR, ED_3COM_CR_XSEL);
 
 	/* Wait a bit for the NIC to recover from the reset. */
-	DELAY(5000);
+	delay(5000);
 
 	sc->vendor = ED_VENDOR_3COM;
 	sc->type_str = "3c503";
@@ -866,7 +866,7 @@ ed_probe_Novell(isa_dev)
 	 * the invasive thing for now.  Yuck.]
 	 */
 	outb(sc->asic_addr + ED_NOVELL_RESET, tmp);
-	DELAY(5000);
+	delay(5000);
 
 	/*
 	 * This is needed because some NE clones apparently don't reset the NIC
@@ -876,7 +876,7 @@ ed_probe_Novell(isa_dev)
 	 */
 	outb(sc->nic_addr + ED_P0_CR, ED_CR_RD2 | ED_CR_STP);
 
-	DELAY(5000);
+	delay(5000);
 
 	/* Make sure that we really have an 8390 based board. */
 	if (!ed_probe_generic8390(sc))
diff --git a/sys/arch/i386/isa/if_el.c b/sys/arch/i386/isa/if_el.c
index 7ecc48915167..694fa2d4e575 100644
--- a/sys/arch/i386/isa/if_el.c
+++ b/sys/arch/i386/isa/if_el.c
@@ -9,7 +9,7 @@
 /*
  * 3COM Etherlink 3C501 device driver
  *
- *	$Id: if_el.c,v 1.5 1994/03/03 15:30:27 mycroft Exp $
+ *	$Id: if_el.c,v 1.6 1994/03/06 17:19:00 mycroft Exp $
  */
 
 /*
@@ -143,7 +143,7 @@ el_probe(isa_dev)
 	/* Reset the board. */
 	dprintf(("Resetting board...\n"));
 	outb(iobase+EL_AC, EL_AC_RESET);
-	DELAY(5);
+	delay(5);
 	outb(iobase+EL_AC, 0);
 
 	/* Now read the address. */
@@ -277,7 +277,7 @@ el_hardreset(sc)
 	int i;
 
 	outb(iobase+EL_AC, EL_AC_RESET);
-	DELAY(5);
+	delay(5);
 	outb(iobase+EL_AC, 0);
 
 	for (i = 0; i < ETHER_ADDR_LEN; i++)
diff --git a/sys/arch/i386/isa/if_ep.c b/sys/arch/i386/isa/if_ep.c
index 66745e07f701..db03a3326270 100644
--- a/sys/arch/i386/isa/if_ep.c
+++ b/sys/arch/i386/isa/if_ep.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_ep.c,v 1.19 1994/03/04 01:31:50 hpeyerl Exp $
+ *	$Id: if_ep.c,v 1.20 1994/03/06 17:19:01 mycroft Exp $
  */
 /*
  * TODO:
@@ -172,12 +172,12 @@ isa_epprobe(is)
 	u_short k;
 
 	outw(BASE + EP_COMMAND, GLOBAL_RESET);
-	DELAY(1000);
+	delay(1000);
 	elink_reset();	/* global reset to ELINK_ID_PORT */
-	DELAY(1000);
+	delay(1000);
 	outb(ELINK_ID_PORT, 0x00);
 	elink_idseq(ELINK_509_POLY);
-	DELAY(1000);
+	delay(1000);
 
 	/*
 	 * MFG_ID should have 0x6d50.
@@ -351,11 +351,11 @@ epinit(unit)
 	GO_WINDOW(1);
 	if (!(ifp->if_flags & IFF_LINK0) && (sc->ep_connectors & BNC)) {
 		outw(BASE + EP_COMMAND, START_TRANSCEIVER);
-		DELAY(1000);
+		delay(1000);
 	}
 	if (ifp->if_flags & IFF_LINK0) {
 		outw(BASE + EP_COMMAND, STOP_TRANSCEIVER);
-		DELAY(1000);
+		delay(1000);
 		if((ifp->if_flags & IFF_LINK1) && (sc->ep_connectors & UTP)) {
 			GO_WINDOW(4);
 			outw(BASE + EP_W4_MEDIA_TYPE, ENABLE_UTP);
@@ -883,7 +883,7 @@ epreadeeprom(id_port, offset)
 {
 	int     i, data = 0;
 	outb(id_port, 0x80 + offset);
-	DELAY(1000);
+	delay(1000);
 	for (i = 0; i < 16; i++)
 		data = (data << 1) | (inw(id_port) & 1);
 	return (data);
@@ -899,7 +899,7 @@ epbusyeeprom(is)
 	while (i++ < 100) {
 		j = inw(BASE + EP_W0_EEPROM_COMMAND);
 		if (j & EEPROM_BUSY)
-			DELAY(100);
+			delay(100);
 		else
 			break;
 	}
diff --git a/sys/arch/i386/isa/if_hp.c b/sys/arch/i386/isa/if_hp.c
index 993cf8529736..c4ce24d3a4b2 100644
--- a/sys/arch/i386/isa/if_hp.c
+++ b/sys/arch/i386/isa/if_hp.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_hp.c,v 1.14 1994/02/10 17:18:01 mycroft Exp $
+ *	$Id: if_hp.c,v 1.15 1994/03/06 17:19:03 mycroft Exp $
  */
 
 /*
@@ -192,7 +192,7 @@ hpprobe(dvp)
 #if 0
 	outb(hpc + ds0_isr, 0xff);
 	outb(hpc + ds_cmd, DSCM_NODMA | DSCM_PG0 | DSCM_STOP);
-	DELAY(1000);
+	delay(1000);
 
 	/* Check cmd reg and fail if not right */
 	if ((i = inb(hpc + ds_cmd)) != (DSCM_NODMA | DSCM_PG0 | DSCM_STOP)) {
diff --git a/sys/arch/i386/isa/if_ie.c b/sys/arch/i386/isa/if_ie.c
index 676cfbb14e46..ccfae7d0ef35 100644
--- a/sys/arch/i386/isa/if_ie.c
+++ b/sys/arch/i386/isa/if_ie.c
@@ -40,7 +40,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.5 1994/02/16 20:52:37 mycroft Exp $
+ *	$Id: if_ie.c,v 1.6 1994/03/06 17:19:04 mycroft Exp $
  */
 
 /*
@@ -1354,7 +1354,7 @@ check_ie_present(sc, where, size)
 	(sc->reset_586)(sc);
 	(sc->chan_attn)(sc);
 	
-	DELAY(100);			/* wait a while... */
+	delay(100);			/* wait a while... */
 	
 	if (iscp->ie_busy) {
 		splx(s);
@@ -1377,7 +1377,7 @@ check_ie_present(sc, where, size)
 	(sc->reset_586)(sc);
 	(sc->chan_attn)(sc);
 	
-	DELAY(100);
+	delay(100);
 	
 	if (iscp->ie_busy) {
 		splx(s);
@@ -1424,9 +1424,9 @@ el_reset_586(sc)
 {
 
 	outb(PORT + IE507_CTRL, EL_CTRL_RESET);
-	DELAY(100);
+	delay(100);
 	outb(PORT + IE507_CTRL, EL_CTRL_NORMAL);
-	DELAY(100);
+	delay(100);
 }
 
 void
diff --git a/sys/arch/i386/isa/if_is.c b/sys/arch/i386/isa/if_is.c
index bf2ede25205b..eca334f75796 100644
--- a/sys/arch/i386/isa/if_is.c
+++ b/sys/arch/i386/isa/if_is.c
@@ -11,7 +11,7 @@
  *   of this software, nor does the author assume any responsibility
  *   for damages incurred with its use.
  *
- *	$Id: if_is.c,v 1.23 1994/02/16 20:22:16 mycroft Exp $
+ *	$Id: if_is.c,v 1.24 1994/03/06 17:19:07 mycroft Exp $
  */
 
 /* TODO
@@ -258,7 +258,7 @@ lance_probe(sc)
 
 	/* Stop the LANCE chip and put it in a known state. */
 	iswrcsr(sc, 0, STOP);
-	DELAY(100);
+	delay(100);
 
 	if (isrdcsr(sc, 0) != STOP)
 		return 0;
diff --git a/sys/arch/i386/isa/isa.c b/sys/arch/i386/isa/isa.c
index 5256daa0046e..50f2c48c73f7 100644
--- a/sys/arch/i386/isa/isa.c
+++ b/sys/arch/i386/isa/isa.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa.c,v 1.38 1994/03/01 18:22:52 mycroft Exp $
+ *	$Id: isa.c,v 1.39 1994/03/06 17:19:09 mycroft Exp $
  */
 
 /*
@@ -580,7 +580,7 @@ isa_strayintr(d) {
 extern int hz;                        /* XXX - should be elsewhere */
 
 void
-DELAY(n)
+delay(n)
 	int n;
 {
 	int counter_limit;
@@ -598,11 +598,11 @@ DELAY(n)
 	if (state == 0) {
 		state = 1;
 		for (n1 = 1; n1 <= 10000000; n1 *= 10)
-			DELAY(n1);
+			delay(n1);
 		state = 2;
 	}
 	if (state == 1)
-		printf("DELAY(%d)...", n);
+		printf("delay(%d)...", n);
 #endif
 
 	/*
diff --git a/sys/arch/i386/isa/lms.c b/sys/arch/i386/isa/lms.c
index bf55a0dd6eab..2c8fc9c5794a 100644
--- a/sys/arch/i386/isa/lms.c
+++ b/sys/arch/i386/isa/lms.c
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: lms.c,v 1.8 1994/02/17 03:39:52 mycroft Exp $
+ *	$Id: lms.c,v 1.9 1994/03/06 17:19:10 mycroft Exp $
  */
 
 #include "lms.h"
@@ -83,13 +83,13 @@ lmsprobe(isa_dev)
 
 	/* Configure and check for port present. */
 	outb(iobase + LMS_CONFIG, 0x91);
-	DELAY(10);
+	delay(10);
 	outb(iobase + LMS_SIGN, 0x0c);
-	DELAY(10);
+	delay(10);
 	if (inb(iobase + LMS_SIGN) != 0x0c)
 		return 0;
 	outb(iobase + LMS_SIGN, 0x50);
-	DELAY(10);
+	delay(10);
 	if (inb(iobase + LMS_SIGN) != 0x50)
 		return 0;
 
diff --git a/sys/arch/i386/isa/lpt.c b/sys/arch/i386/isa/lpt.c
index 192dbca2837e..2c0d1cdac607 100644
--- a/sys/arch/i386/isa/lpt.c
+++ b/sys/arch/i386/isa/lpt.c
@@ -46,7 +46,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: lpt.c,v 1.13 1994/02/19 03:36:12 mycroft Exp $
+ *	$Id: lpt.c,v 1.14 1994/03/06 17:19:11 mycroft Exp $
  */
 
 /*
@@ -144,7 +144,7 @@ lpt_port_test(port, data, mask)
 	outb(port, data);
 	timeout = 1000;
 	do {
-		DELAY(10);
+		delay(10);
 		temp = inb(port) & mask;
 	} while (temp != data && --timeout);
 	lprintf("lpt: port=0x%x out=0x%x in=0x%x timeout=%d\n", port, data,
@@ -292,7 +292,7 @@ lptopen(dev, flag)
 	if ((flags & LPT_NOPRIME) == 0) {
 		/* assert INIT for 100 usec to start up printer */
 		outb(iobase + lpt_control, LPC_SELECT);
-		DELAY(100);
+		delay(100);
 	}
 
 	control = LPC_SELECT | LPC_NINIT;
diff --git a/sys/arch/i386/isa/mcd.c b/sys/arch/i386/isa/mcd.c
index b4582d3a0641..b7048c17b224 100644
--- a/sys/arch/i386/isa/mcd.c
+++ b/sys/arch/i386/isa/mcd.c
@@ -35,7 +35,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.6 1994/02/21 15:23:11 mycroft Exp $
+ *	$Id: mcd.c,v 1.7 1994/03/06 17:19:13 mycroft Exp $
  */
 
 /*static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";*/
@@ -550,11 +550,11 @@ mcdprobe(isa_dev)
 
 	/* Send a reset. */
 	outb(iobase + mcd_reset, 0);
-	DELAY(300000);
+	delay(300000);
 	/* Get any pending status and throw away. */
 	for (i = 10; i; i--)
 		inb(iobase + mcd_status);
-	DELAY(1000);
+	delay(1000);
 
 	/* Send get status command. */
 	outb(iobase + mcd_command, MCD_CMDGETSTAT);
@@ -576,7 +576,7 @@ mcdprobe(isa_dev)
  * driven routines mcd_getreply etc. rather than arbitrary delays.
  */
 
-	DELAY (2000);
+	delay (2000);
 	outb(iobase + mcd_command, MCD_CMDCONTINFO);
 	i = mcd_getreply(sc, DELAY_GETREPLY);
 
@@ -628,7 +628,7 @@ mcd_waitrdy(iobase, dly)
 	for (i = dly; i; i--) {
 		if ((inb(iobase + mcd_xfer) & MCD_ST_BUSY) == 0)
 			return 0;
-		DELAY(1);
+		delay(1);
 	}
 	return -1;
 }
@@ -997,7 +997,7 @@ readerr:
 #ifdef notyet
 	printf("%s: unit timeout; resetting\n", sc->sc_dev.dv_xname);
 	outb(mbx->iobase + mcd_reset, MCD_CMDRESET);
-	DELAY(300000);
+	delay(300000);
 	(void)mcd_getstat(sc, 1);
 	(void)mcd_getstat(sc, 1);
 	/*sc->status &= ~MCDDSKCHNG; */
diff --git a/sys/arch/i386/isa/npx.c b/sys/arch/i386/isa/npx.c
index d61f1a053e45..c430cfffb7fe 100644
--- a/sys/arch/i386/isa/npx.c
+++ b/sys/arch/i386/isa/npx.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.13 1994/03/03 22:22:51 mycroft Exp $
+ *	$Id: npx.c,v 1.14 1994/03/06 17:19:15 mycroft Exp $
  */
 #include "npx.h"
 #if NNPX > 0
@@ -219,7 +219,7 @@ npxprobe1(dvp)
 	 * it after a warm boot.
 	 */
 	outb(0xf1, 0);		/* full reset on some systems, NOP on others */
-	DELAY(1000);
+	delay(1000);
 	outb(0xf0, 0);		/* clear BUSY# latch */
 	/*
 	 * Prepare to trap all ESC (i.e., NPX) instructions and all WAIT
@@ -247,7 +247,7 @@ npxprobe1(dvp)
 	 * IRQ13 and cleared the BUSY# latch early to handle them anyway.
 	 */
 	fninit();
-	DELAY(1000);		/* wait for any IRQ13 (fwait might hang) */
+	delay(1000);		/* wait for any IRQ13 (fwait might hang) */
 #ifdef DIAGNOSTIC
 	if (npx_intrs_while_probing != 0)
 		printf("fninit caused %u bogus npx interrupt(s)\n",
diff --git a/sys/arch/i386/isa/sb.c b/sys/arch/i386/isa/sb.c
index 9ccb4ce75b8e..07e69ae5f6c2 100644
--- a/sys/arch/i386/isa/sb.c
+++ b/sys/arch/i386/isa/sb.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sb.c,v 1.4 1994/03/02 16:23:10 hpeyerl Exp $
+ *	$Id: sb.c,v 1.5 1994/03/06 17:19:16 mycroft Exp $
  */
 
 #include "sb.h"
@@ -362,7 +362,7 @@ sbreset(register u_long base)
 	 * Gee, what a brilliant hardware design.
 	 */
 	outb(base + SBP_DSP_RESET, 1);
-	DELAY(3);
+	delay(3);
 	outb(base + SBP_DSP_RESET, 0);
 	if (rdsp(base) != SB_MAGIC)
 		return (-1);
@@ -383,7 +383,7 @@ void
 sb_spkron(struct sb_softc *sc)
 {
 	(void)wdsp(sc->sc_base, SB_DSP_SPKR_ON);
-	DELAY(1000);
+	delay(1000);
 }
 
 /*
diff --git a/sys/arch/i386/isa/wd.c b/sys/arch/i386/isa/wd.c
index 1827cc45ac83..fb81ff91aead 100644
--- a/sys/arch/i386/isa/wd.c
+++ b/sys/arch/i386/isa/wd.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- *	$Id: wd.c,v 1.60 1994/03/05 08:17:06 mycroft Exp $
+ *	$Id: wd.c,v 1.61 1994/03/06 17:19:19 mycroft Exp $
  */
 
 #define	QUIETWORKS	/* define this to make wdopen() set DKFL_QUIET */
@@ -1465,9 +1465,9 @@ wdreset(du, err)
 
 	/* reset the device  */
 	outb(wdc+wd_ctlr, WDCTL_RST | WDCTL_IDS);
-	DELAY(1000);
+	delay(1000);
 	outb(wdc+wd_ctlr, WDCTL_IDS);
-	DELAY(1000);
+	delay(1000);
 	(void) inb(wdc+wd_error);
 	outb(wdc+wd_ctlr, WDCTL_4BIT);
 
@@ -1490,7 +1490,7 @@ wdc_wait(du, mask)
 			break;
 		if (++timeout > WDCNDELAY)
 			return -1;
-		DELAY(WDCDELAY);
+		delay(WDCDELAY);
 	}
 #ifdef WDCNDELAY_DEBUG
 	if (timeout > WDCNDELAY_DEBUG)
diff --git a/sys/arch/i386/isa/wd7000.c b/sys/arch/i386/isa/wd7000.c
index 402d400ac2a8..1939ffd758f7 100644
--- a/sys/arch/i386/isa/wd7000.c
+++ b/sys/arch/i386/isa/wd7000.c
@@ -16,7 +16,7 @@
  * scatter gather is done by the board, then look at one of the Adaptec
  * drivers to finish off the job..
  *
- *	$Id: wd7000.c,v 1.10 1994/01/03 23:53:39 mycroft Exp $
+ *	$Id: wd7000.c,v 1.11 1994/03/06 17:19:21 mycroft Exp $
  */
 #include "wds.h"
 #if NWDS > 0
@@ -359,7 +359,7 @@ wds_scsi_cmd(struct scsi_xfer *sxp)
 		return TRY_AGAIN_LATER;
 	}
 
-	DELAY(10000);
+	delay(10000);
 	/*printf("%08x/%08x mbox: %02x %02x %02x %02x\n", &r->cmd, KVTOPHYS(&r->cmd),
 		wds[unit].ombs[r->ombn].stat, wds[unit].ombs[r->ombn].addr[0],
 		wds[unit].ombs[r->ombn].addr[1], wds[unit].ombs[r->ombn].addr[2]);*/
@@ -369,7 +369,7 @@ repoll:		printf("wds%d: polling.", unit);
 		i = 0;
 		while( (inb(base+WDS_STAT) & WDS_IRQ) == 0) {
 			printf(".");
-			DELAY(10000);
+			delay(10000);
 			if(++i == 10) {
 				printf("failed %02x\n", inb(base+WDS_IRQSTAT));
 				/*r->busy = 0;*/
@@ -411,11 +411,11 @@ wdsintr(int unit)
 	u_char c;
 
 	/*printf("stat=%02x\n", inb(wds[unit].addr + WDS_STAT));*/
-	DELAY(1000);
+	delay(1000);
 	c = inb(wds[unit].addr + WDS_IRQSTAT);
 	printf("wdsintr: %02x\n", c);
 	if( (c&WDSI_MASK) == WDSI_MSVC) {
-		DELAY(1000);
+		delay(1000);
 		c = c & ~WDSI_MASK;
 		flushcache();
 		in = &wds[unit].imbs[c];
@@ -544,7 +544,7 @@ wds_getvers(int unit)
 		return -1;
 	}
 
-	DELAY(10000);
+	delay(10000);
 	/*printf("%08x/%08x mbox: %02x %02x %02x %02x\n", &r->cmd, KVTOPHYS(&r->cmd),
 		wds[unit].ombs[r->ombn].stat, wds[unit].ombs[r->ombn].addr[0],
 		wds[unit].ombs[r->ombn].addr[1], wds[unit].ombs[r->ombn].addr[2]);*/
@@ -554,7 +554,7 @@ wds_getvers(int unit)
 		i = 0;
 		while( (inb(base+WDS_STAT) & WDS_IRQ) == 0) {
 			printf(".");
-			DELAY(10000);
+			delay(10000);
 			if(++i == 10) {
 				printf("failed %02x\n", inb(base+WDS_IRQSTAT));
 				/*r->busy = 0;*/
@@ -624,7 +624,7 @@ wds_init(struct isa_device *dev)
 	for(i=0; i<4; i++)
 		if( (inb(base+WDS_STAT) & WDS_RDY) != 0) {
 			goto ready;
-		DELAY(10);
+		delay(10);
 	}
 	return 1;
 
@@ -637,9 +637,9 @@ ready:
 	 * the controller exists. reset and init.
 	 */
 	outb(base+WDS_HCR, WDSH_SCSIRESET|WDSH_ASCRESET);
-	DELAY(3);
+	delay(3);
 	outb(base+WDS_HCR, WDSH_DRQEN);
-	DELAY(20000);
+	delay(20000);
 
 #if 1
 	outb(0xd6, 0xc3);
@@ -654,7 +654,7 @@ ready:
 			if( (inb(base+WDS_STAT) & (WDS_RDY)) == WDS_RDY)
 				break;
 			printf(".");
-			DELAY(10000);
+			delay(10000);
 		}
 		if( (inb(base+WDS_STAT) & (WDS_RDY)) != WDS_RDY) {
 			printf("failed\n");
diff --git a/sys/arch/i386/isa/wt.c b/sys/arch/i386/isa/wt.c
index 526029539ce2..adc3fcc798a0 100644
--- a/sys/arch/i386/isa/wt.c
+++ b/sys/arch/i386/isa/wt.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wt.c	7.1 (Berkeley) 5/9/91
- *	$Id: wt.c,v 1.7 1994/02/09 21:13:58 mycroft Exp $
+ *	$Id: wt.c,v 1.8 1994/03/06 17:19:22 mycroft Exp $
  */
 
 /*
@@ -526,7 +526,7 @@ int	dev, flag;
 #ifdef DEBUG
 		debug("Waiting for rew to finish\n");
 #endif
-		DELAY(1000000);	/* delay one second */
+		delay(1000000);	/* delay one second */
 	}
 	/* Only do reset and select when tape light is off, and tape is rewound.
 	 * This allows multiple volumes. */
@@ -786,7 +786,7 @@ rdyexc(ticks)
 		if (!(s & READY))	/* check if controller is ready */
 			break;
 		s = splbio();
-		DELAY((ticks/HZ)*1000000); /* */
+		delay((ticks/HZ)*1000000); /* */
 		splx(s);
 	}
 #ifdef DEBUG
@@ -996,7 +996,7 @@ t_reset()
 	register i;
 	mbits |= RESET;
 	outb(CTLPORT, mbits);		/* send reset */
-	DELAY(20);
+	delay(20);
 	mbits &= ~RESET;
 	outb(CTLPORT, mbits);		/* turn off reset */
 	if ((inb(STATPORT) & RESETMASK) == RESETVAL)
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index 1827cc45ac83..fb81ff91aead 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- *	$Id: wd.c,v 1.60 1994/03/05 08:17:06 mycroft Exp $
+ *	$Id: wd.c,v 1.61 1994/03/06 17:19:19 mycroft Exp $
  */
 
 #define	QUIETWORKS	/* define this to make wdopen() set DKFL_QUIET */
@@ -1465,9 +1465,9 @@ wdreset(du, err)
 
 	/* reset the device  */
 	outb(wdc+wd_ctlr, WDCTL_RST | WDCTL_IDS);
-	DELAY(1000);
+	delay(1000);
 	outb(wdc+wd_ctlr, WDCTL_IDS);
-	DELAY(1000);
+	delay(1000);
 	(void) inb(wdc+wd_error);
 	outb(wdc+wd_ctlr, WDCTL_4BIT);
 
@@ -1490,7 +1490,7 @@ wdc_wait(du, mask)
 			break;
 		if (++timeout > WDCNDELAY)
 			return -1;
-		DELAY(WDCDELAY);
+		delay(WDCDELAY);
 	}
 #ifdef WDCNDELAY_DEBUG
 	if (timeout > WDCNDELAY_DEBUG)
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index e597e24facb3..1d64cafbc43d 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: com.c,v 1.19 1994/02/09 21:13:41 mycroft Exp $
+ *	$Id: com.c,v 1.20 1994/03/06 17:18:50 mycroft Exp $
  */
 
 #include "com.h"
@@ -122,7 +122,7 @@ struct isa_device *dev;
 	/* force access to id reg */
 	outb(dev->id_iobase+com_cfcr, 0);
 	outb(dev->id_iobase+com_iir, 0);
-	DELAY(100);
+	delay(100);
 	if ((inb(dev->id_iobase+com_iir) & 0x38) == 0)
 		return(8);
 	return(0);
@@ -139,14 +139,14 @@ struct isa_device *isdp;
 
 	unit = isdp->id_unit;
 	if (unit == comconsole)
-		DELAY(1000);
+		delay(1000);
 	com_addr[unit] = port;
 	com_active |= 1 << unit;
 	comsoftCAR |= 1 << unit;	/* XXX */
 
 	/* look for a NS 16550AF UART with FIFOs */
 	outb(port+com_fifo, FIFO_ENABLE|FIFO_RCV_RST|FIFO_XMT_RST|FIFO_TRIGGER_4);
-	DELAY(100);
+	delay(100);
 	if ((inb(port+com_iir) & IIR_FIFO_MASK) == IIR_FIFO_MASK) {
 		com_hasfifo |= 1 << unit;
 		printf("com%d: fifo\n", isdp->id_unit);
diff --git a/sys/dev/ic/lpt.c b/sys/dev/ic/lpt.c
index 192dbca2837e..2c0d1cdac607 100644
--- a/sys/dev/ic/lpt.c
+++ b/sys/dev/ic/lpt.c
@@ -46,7 +46,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: lpt.c,v 1.13 1994/02/19 03:36:12 mycroft Exp $
+ *	$Id: lpt.c,v 1.14 1994/03/06 17:19:11 mycroft Exp $
  */
 
 /*
@@ -144,7 +144,7 @@ lpt_port_test(port, data, mask)
 	outb(port, data);
 	timeout = 1000;
 	do {
-		DELAY(10);
+		delay(10);
 		temp = inb(port) & mask;
 	} while (temp != data && --timeout);
 	lprintf("lpt: port=0x%x out=0x%x in=0x%x timeout=%d\n", port, data,
@@ -292,7 +292,7 @@ lptopen(dev, flag)
 	if ((flags & LPT_NOPRIME) == 0) {
 		/* assert INIT for 100 usec to start up printer */
 		outb(iobase + lpt_control, LPC_SELECT);
-		DELAY(100);
+		delay(100);
 	}
 
 	control = LPC_SELECT | LPC_NINIT;
diff --git a/sys/dev/ic/lptvar.h b/sys/dev/ic/lptvar.h
index 4637c4b1058e..c279840456d0 100644
--- a/sys/dev/ic/lptvar.h
+++ b/sys/dev/ic/lptvar.h
@@ -46,7 +46,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: lptvar.h,v 1.13 1994/02/19 03:36:12 mycroft Exp $
+ *	$Id: lptvar.h,v 1.14 1994/03/06 17:19:11 mycroft Exp $
  */
 
 /*
@@ -144,7 +144,7 @@ lpt_port_test(port, data, mask)
 	outb(port, data);
 	timeout = 1000;
 	do {
-		DELAY(10);
+		delay(10);
 		temp = inb(port) & mask;
 	} while (temp != data && --timeout);
 	lprintf("lpt: port=0x%x out=0x%x in=0x%x timeout=%d\n", port, data,
@@ -292,7 +292,7 @@ lptopen(dev, flag)
 	if ((flags & LPT_NOPRIME) == 0) {
 		/* assert INIT for 100 usec to start up printer */
 		outb(iobase + lpt_control, LPC_SELECT);
-		DELAY(100);
+		delay(100);
 	}
 
 	control = LPC_SELECT | LPC_NINIT;
diff --git a/sys/dev/isa/aha1542.c b/sys/dev/isa/aha1542.c
index 736e4e7d7621..7954c8b5aed6 100644
--- a/sys/dev/isa/aha1542.c
+++ b/sys/dev/isa/aha1542.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- *	$Id: aha1542.c,v 1.17 1994/01/03 23:53:29 mycroft Exp $
+ *	$Id: aha1542.c,v 1.18 1994/03/06 17:18:43 mycroft Exp $
  */
 
 /*
@@ -497,7 +497,7 @@ ahaattach(struct isa_device *dev)
 		}
 	}
 	if(!(speedprint & (1<<masunit))) {
-		DELAY(1000000);
+		delay(1000000);
 		speedprint |= (1<<masunit);
 		printf("aha%d: bus speed %dns\n", masunit, speed[masunit]);
 	}
@@ -755,7 +755,7 @@ aha_init(int unit)
 	 * Assume we have a board at this stage
 	 * setup dma channel from jumpers and save int level
 	 */
-	DELAY(1000);
+	delay(1000);
 	aha_cmd(unit, 0, sizeof(conf), 0, (u_char *)&conf, AHA_CONF_GET);
 	switch(conf.chan) {
 	case CHAN0:
diff --git a/sys/dev/isa/bt742a.c b/sys/dev/isa/bt742a.c
index be40b7e79401..882b683d1b2c 100644
--- a/sys/dev/isa/bt742a.c
+++ b/sys/dev/isa/bt742a.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- *	$Id: bt742a.c,v 1.14 1994/03/01 12:42:36 deraadt Exp $
+ *	$Id: bt742a.c,v 1.15 1994/03/06 17:18:46 mycroft Exp $
  */
 
 /*
@@ -840,7 +840,7 @@ bt_init(unit)
 	 * setup dma channel from jumpers and save int
 	 * level
 	 */
-	DELAY(200);
+	delay(200);
 
 	bt_cmd(unit, 0, sizeof(conf), 0, &conf, BT_CONF_GET);
 	switch (conf.chan) {
diff --git a/sys/dev/isa/com.c b/sys/dev/isa/com.c
index e597e24facb3..1d64cafbc43d 100644
--- a/sys/dev/isa/com.c
+++ b/sys/dev/isa/com.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: com.c,v 1.19 1994/02/09 21:13:41 mycroft Exp $
+ *	$Id: com.c,v 1.20 1994/03/06 17:18:50 mycroft Exp $
  */
 
 #include "com.h"
@@ -122,7 +122,7 @@ struct isa_device *dev;
 	/* force access to id reg */
 	outb(dev->id_iobase+com_cfcr, 0);
 	outb(dev->id_iobase+com_iir, 0);
-	DELAY(100);
+	delay(100);
 	if ((inb(dev->id_iobase+com_iir) & 0x38) == 0)
 		return(8);
 	return(0);
@@ -139,14 +139,14 @@ struct isa_device *isdp;
 
 	unit = isdp->id_unit;
 	if (unit == comconsole)
-		DELAY(1000);
+		delay(1000);
 	com_addr[unit] = port;
 	com_active |= 1 << unit;
 	comsoftCAR |= 1 << unit;	/* XXX */
 
 	/* look for a NS 16550AF UART with FIFOs */
 	outb(port+com_fifo, FIFO_ENABLE|FIFO_RCV_RST|FIFO_XMT_RST|FIFO_TRIGGER_4);
-	DELAY(100);
+	delay(100);
 	if ((inb(port+com_iir) & IIR_FIFO_MASK) == IIR_FIFO_MASK) {
 		com_hasfifo |= 1 << unit;
 		printf("com%d: fifo\n", isdp->id_unit);
diff --git a/sys/dev/isa/cy.c b/sys/dev/isa/cy.c
index e81de5f72ae5..9f3753cacbc2 100644
--- a/sys/dev/isa/cy.c
+++ b/sys/dev/isa/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.4 1994/02/09 21:13:43 mycroft Exp $
+ *	$Id: cy.c,v 1.5 1994/03/06 17:18:51 mycroft Exp $
  */
 
 /*
@@ -146,7 +146,7 @@ int		cyspeed(int speed, int *prescaler_io);
 static void	cy_channel_init(dev_t dev, int reset);
 static void	cd1400_channel_cmd(cy_addr base, u_char cmd);
 
-void		DELAY(int delay);
+void		delay(int delay);
 
 extern unsigned int	delaycount;	/* calibrated 1 ms cpu-spin delay */
 
@@ -239,14 +239,14 @@ cyprobe(struct isa_device *dev)
     /* Cyclom-16Y hardware reset (Cyclom-8Ys don't care) */
     i = *(cy_addr)(dev->id_maddr + CYCLOM_RESET_16);
 
-    DELAY(500);	/* wait for the board to get its act together (500 us) */
+    delay(500);	/* wait for the board to get its act together (500 us) */
 
     for (i = 0; i < CD1400s_PER_CYCLOM; i++) {
 	cy_addr	base = dev->id_maddr + i * CD1400_MEMSIZE;
 
 	/* wait for chip to become ready for new command */
 	for (j = 0; j < 100; j += 50) {
-	    DELAY(50);	/* wait 50 us */
+	    delay(50);	/* wait 50 us */
 
 	    if (!*(base + CD1400_CCR))
 	    	break;
@@ -260,7 +260,7 @@ cyprobe(struct isa_device *dev)
 
 	/* wait for the CD1400 to initialise itself */
 	for (j = 0; j < 1000; j += 50) {
-	    DELAY(50);	/* wait 50 us */
+	    delay(50);	/* wait 50 us */
 
 	    /* retrieve firmware version */
 	    version = *(base + CD1400_GFRCR);
diff --git a/sys/dev/isa/if_ed.c b/sys/dev/isa/if_ed.c
index e4493042a758..9a2e2582ebe1 100644
--- a/sys/dev/isa/if_ed.c
+++ b/sys/dev/isa/if_ed.c
@@ -13,7 +13,7 @@
  * Currently supports the Western Digital/SMC 8003 and 8013 series, the 3Com
  * 3c503, the NE1000 and NE2000, and a variety of similar clones.
  *
- *	$Id: if_ed.c,v 1.35 1994/03/02 22:47:36 mycroft Exp $
+ *	$Id: if_ed.c,v 1.36 1994/03/06 17:18:57 mycroft Exp $
  */
 
 #include "ed.h"
@@ -244,7 +244,7 @@ ed_probe_WD80x3(isa_dev)
 
 #ifdef TOSH_ETHER
 	outb(sc->asic_addr + ED_WD_MSR, ED_WD_MSR_POW);
-	DELAY(10000);
+	delay(10000);
 #endif
 
 	/*
@@ -273,11 +273,11 @@ ed_probe_WD80x3(isa_dev)
 #else
 	outb(sc->asic_addr + ED_WD_MSR, ED_WD_MSR_RST);
 #endif
-	DELAY(100);
+	delay(100);
 	outb(sc->asic_addr + ED_WD_MSR,
 	    inb(sc->asic_addr + ED_WD_MSR) & ~ED_WD_MSR_RST);
 	/* Wait in the case this card is reading it's EEROM. */
-	DELAY(5000);
+	delay(5000);
 
 	sc->vendor = ED_VENDOR_WD_SMC;
 	sc->type = inb(sc->asic_addr + ED_WD_CARD_ID);
@@ -668,7 +668,7 @@ ed_probe_3Com(isa_dev)
 	outb(sc->asic_addr + ED_3COM_CR, ED_3COM_CR_RST | ED_3COM_CR_XSEL);
 
 	/* Wait for a while, then un-reset it. */
-	DELAY(50);
+	delay(50);
 	/*
 	 * The 3Com ASIC defaults to rather strange settings for the CR after a
 	 * reset - it's important to set it again after the following outb
@@ -677,7 +677,7 @@ ed_probe_3Com(isa_dev)
 	outb(sc->asic_addr + ED_3COM_CR, ED_3COM_CR_XSEL);
 
 	/* Wait a bit for the NIC to recover from the reset. */
-	DELAY(5000);
+	delay(5000);
 
 	sc->vendor = ED_VENDOR_3COM;
 	sc->type_str = "3c503";
@@ -866,7 +866,7 @@ ed_probe_Novell(isa_dev)
 	 * the invasive thing for now.  Yuck.]
 	 */
 	outb(sc->asic_addr + ED_NOVELL_RESET, tmp);
-	DELAY(5000);
+	delay(5000);
 
 	/*
 	 * This is needed because some NE clones apparently don't reset the NIC
@@ -876,7 +876,7 @@ ed_probe_Novell(isa_dev)
 	 */
 	outb(sc->nic_addr + ED_P0_CR, ED_CR_RD2 | ED_CR_STP);
 
-	DELAY(5000);
+	delay(5000);
 
 	/* Make sure that we really have an 8390 based board. */
 	if (!ed_probe_generic8390(sc))
diff --git a/sys/dev/isa/if_el.c b/sys/dev/isa/if_el.c
index 7ecc48915167..694fa2d4e575 100644
--- a/sys/dev/isa/if_el.c
+++ b/sys/dev/isa/if_el.c
@@ -9,7 +9,7 @@
 /*
  * 3COM Etherlink 3C501 device driver
  *
- *	$Id: if_el.c,v 1.5 1994/03/03 15:30:27 mycroft Exp $
+ *	$Id: if_el.c,v 1.6 1994/03/06 17:19:00 mycroft Exp $
  */
 
 /*
@@ -143,7 +143,7 @@ el_probe(isa_dev)
 	/* Reset the board. */
 	dprintf(("Resetting board...\n"));
 	outb(iobase+EL_AC, EL_AC_RESET);
-	DELAY(5);
+	delay(5);
 	outb(iobase+EL_AC, 0);
 
 	/* Now read the address. */
@@ -277,7 +277,7 @@ el_hardreset(sc)
 	int i;
 
 	outb(iobase+EL_AC, EL_AC_RESET);
-	DELAY(5);
+	delay(5);
 	outb(iobase+EL_AC, 0);
 
 	for (i = 0; i < ETHER_ADDR_LEN; i++)
diff --git a/sys/dev/isa/if_ep.c b/sys/dev/isa/if_ep.c
index 66745e07f701..db03a3326270 100644
--- a/sys/dev/isa/if_ep.c
+++ b/sys/dev/isa/if_ep.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_ep.c,v 1.19 1994/03/04 01:31:50 hpeyerl Exp $
+ *	$Id: if_ep.c,v 1.20 1994/03/06 17:19:01 mycroft Exp $
  */
 /*
  * TODO:
@@ -172,12 +172,12 @@ isa_epprobe(is)
 	u_short k;
 
 	outw(BASE + EP_COMMAND, GLOBAL_RESET);
-	DELAY(1000);
+	delay(1000);
 	elink_reset();	/* global reset to ELINK_ID_PORT */
-	DELAY(1000);
+	delay(1000);
 	outb(ELINK_ID_PORT, 0x00);
 	elink_idseq(ELINK_509_POLY);
-	DELAY(1000);
+	delay(1000);
 
 	/*
 	 * MFG_ID should have 0x6d50.
@@ -351,11 +351,11 @@ epinit(unit)
 	GO_WINDOW(1);
 	if (!(ifp->if_flags & IFF_LINK0) && (sc->ep_connectors & BNC)) {
 		outw(BASE + EP_COMMAND, START_TRANSCEIVER);
-		DELAY(1000);
+		delay(1000);
 	}
 	if (ifp->if_flags & IFF_LINK0) {
 		outw(BASE + EP_COMMAND, STOP_TRANSCEIVER);
-		DELAY(1000);
+		delay(1000);
 		if((ifp->if_flags & IFF_LINK1) && (sc->ep_connectors & UTP)) {
 			GO_WINDOW(4);
 			outw(BASE + EP_W4_MEDIA_TYPE, ENABLE_UTP);
@@ -883,7 +883,7 @@ epreadeeprom(id_port, offset)
 {
 	int     i, data = 0;
 	outb(id_port, 0x80 + offset);
-	DELAY(1000);
+	delay(1000);
 	for (i = 0; i < 16; i++)
 		data = (data << 1) | (inw(id_port) & 1);
 	return (data);
@@ -899,7 +899,7 @@ epbusyeeprom(is)
 	while (i++ < 100) {
 		j = inw(BASE + EP_W0_EEPROM_COMMAND);
 		if (j & EEPROM_BUSY)
-			DELAY(100);
+			delay(100);
 		else
 			break;
 	}
diff --git a/sys/dev/isa/if_hp.c b/sys/dev/isa/if_hp.c
index 993cf8529736..c4ce24d3a4b2 100644
--- a/sys/dev/isa/if_hp.c
+++ b/sys/dev/isa/if_hp.c
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_hp.c,v 1.14 1994/02/10 17:18:01 mycroft Exp $
+ *	$Id: if_hp.c,v 1.15 1994/03/06 17:19:03 mycroft Exp $
  */
 
 /*
@@ -192,7 +192,7 @@ hpprobe(dvp)
 #if 0
 	outb(hpc + ds0_isr, 0xff);
 	outb(hpc + ds_cmd, DSCM_NODMA | DSCM_PG0 | DSCM_STOP);
-	DELAY(1000);
+	delay(1000);
 
 	/* Check cmd reg and fail if not right */
 	if ((i = inb(hpc + ds_cmd)) != (DSCM_NODMA | DSCM_PG0 | DSCM_STOP)) {
diff --git a/sys/dev/isa/if_ie.c b/sys/dev/isa/if_ie.c
index 676cfbb14e46..ccfae7d0ef35 100644
--- a/sys/dev/isa/if_ie.c
+++ b/sys/dev/isa/if_ie.c
@@ -40,7 +40,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.5 1994/02/16 20:52:37 mycroft Exp $
+ *	$Id: if_ie.c,v 1.6 1994/03/06 17:19:04 mycroft Exp $
  */
 
 /*
@@ -1354,7 +1354,7 @@ check_ie_present(sc, where, size)
 	(sc->reset_586)(sc);
 	(sc->chan_attn)(sc);
 	
-	DELAY(100);			/* wait a while... */
+	delay(100);			/* wait a while... */
 	
 	if (iscp->ie_busy) {
 		splx(s);
@@ -1377,7 +1377,7 @@ check_ie_present(sc, where, size)
 	(sc->reset_586)(sc);
 	(sc->chan_attn)(sc);
 	
-	DELAY(100);
+	delay(100);
 	
 	if (iscp->ie_busy) {
 		splx(s);
@@ -1424,9 +1424,9 @@ el_reset_586(sc)
 {
 
 	outb(PORT + IE507_CTRL, EL_CTRL_RESET);
-	DELAY(100);
+	delay(100);
 	outb(PORT + IE507_CTRL, EL_CTRL_NORMAL);
-	DELAY(100);
+	delay(100);
 }
 
 void
diff --git a/sys/dev/isa/isa.c b/sys/dev/isa/isa.c
index 5256daa0046e..50f2c48c73f7 100644
--- a/sys/dev/isa/isa.c
+++ b/sys/dev/isa/isa.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa.c,v 1.38 1994/03/01 18:22:52 mycroft Exp $
+ *	$Id: isa.c,v 1.39 1994/03/06 17:19:09 mycroft Exp $
  */
 
 /*
@@ -580,7 +580,7 @@ isa_strayintr(d) {
 extern int hz;                        /* XXX - should be elsewhere */
 
 void
-DELAY(n)
+delay(n)
 	int n;
 {
 	int counter_limit;
@@ -598,11 +598,11 @@ DELAY(n)
 	if (state == 0) {
 		state = 1;
 		for (n1 = 1; n1 <= 10000000; n1 *= 10)
-			DELAY(n1);
+			delay(n1);
 		state = 2;
 	}
 	if (state == 1)
-		printf("DELAY(%d)...", n);
+		printf("delay(%d)...", n);
 #endif
 
 	/*
diff --git a/sys/dev/isa/lpt.c b/sys/dev/isa/lpt.c
index 192dbca2837e..2c0d1cdac607 100644
--- a/sys/dev/isa/lpt.c
+++ b/sys/dev/isa/lpt.c
@@ -46,7 +46,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: lpt.c,v 1.13 1994/02/19 03:36:12 mycroft Exp $
+ *	$Id: lpt.c,v 1.14 1994/03/06 17:19:11 mycroft Exp $
  */
 
 /*
@@ -144,7 +144,7 @@ lpt_port_test(port, data, mask)
 	outb(port, data);
 	timeout = 1000;
 	do {
-		DELAY(10);
+		delay(10);
 		temp = inb(port) & mask;
 	} while (temp != data && --timeout);
 	lprintf("lpt: port=0x%x out=0x%x in=0x%x timeout=%d\n", port, data,
@@ -292,7 +292,7 @@ lptopen(dev, flag)
 	if ((flags & LPT_NOPRIME) == 0) {
 		/* assert INIT for 100 usec to start up printer */
 		outb(iobase + lpt_control, LPC_SELECT);
-		DELAY(100);
+		delay(100);
 	}
 
 	control = LPC_SELECT | LPC_NINIT;
diff --git a/sys/dev/isa/lpt_isa.c b/sys/dev/isa/lpt_isa.c
index 5e2bb07dcbac..201ada0c3982 100644
--- a/sys/dev/isa/lpt_isa.c
+++ b/sys/dev/isa/lpt_isa.c
@@ -46,7 +46,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: lpt_isa.c,v 1.13 1994/02/19 03:36:12 mycroft Exp $
+ *	$Id: lpt_isa.c,v 1.14 1994/03/06 17:19:11 mycroft Exp $
  */
 
 /*
@@ -144,7 +144,7 @@ lpt_port_test(port, data, mask)
 	outb(port, data);
 	timeout = 1000;
 	do {
-		DELAY(10);
+		delay(10);
 		temp = inb(port) & mask;
 	} while (temp != data && --timeout);
 	lprintf("lpt: port=0x%x out=0x%x in=0x%x timeout=%d\n", port, data,
@@ -292,7 +292,7 @@ lptopen(dev, flag)
 	if ((flags & LPT_NOPRIME) == 0) {
 		/* assert INIT for 100 usec to start up printer */
 		outb(iobase + lpt_control, LPC_SELECT);
-		DELAY(100);
+		delay(100);
 	}
 
 	control = LPC_SELECT | LPC_NINIT;
diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c
index b4582d3a0641..b7048c17b224 100644
--- a/sys/dev/isa/mcd.c
+++ b/sys/dev/isa/mcd.c
@@ -35,7 +35,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.6 1994/02/21 15:23:11 mycroft Exp $
+ *	$Id: mcd.c,v 1.7 1994/03/06 17:19:13 mycroft Exp $
  */
 
 /*static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";*/
@@ -550,11 +550,11 @@ mcdprobe(isa_dev)
 
 	/* Send a reset. */
 	outb(iobase + mcd_reset, 0);
-	DELAY(300000);
+	delay(300000);
 	/* Get any pending status and throw away. */
 	for (i = 10; i; i--)
 		inb(iobase + mcd_status);
-	DELAY(1000);
+	delay(1000);
 
 	/* Send get status command. */
 	outb(iobase + mcd_command, MCD_CMDGETSTAT);
@@ -576,7 +576,7 @@ mcdprobe(isa_dev)
  * driven routines mcd_getreply etc. rather than arbitrary delays.
  */
 
-	DELAY (2000);
+	delay (2000);
 	outb(iobase + mcd_command, MCD_CMDCONTINFO);
 	i = mcd_getreply(sc, DELAY_GETREPLY);
 
@@ -628,7 +628,7 @@ mcd_waitrdy(iobase, dly)
 	for (i = dly; i; i--) {
 		if ((inb(iobase + mcd_xfer) & MCD_ST_BUSY) == 0)
 			return 0;
-		DELAY(1);
+		delay(1);
 	}
 	return -1;
 }
@@ -997,7 +997,7 @@ readerr:
 #ifdef notyet
 	printf("%s: unit timeout; resetting\n", sc->sc_dev.dv_xname);
 	outb(mbx->iobase + mcd_reset, MCD_CMDRESET);
-	DELAY(300000);
+	delay(300000);
 	(void)mcd_getstat(sc, 1);
 	(void)mcd_getstat(sc, 1);
 	/*sc->status &= ~MCDDSKCHNG; */
diff --git a/sys/dev/isa/sb.c b/sys/dev/isa/sb.c
index 9ccb4ce75b8e..07e69ae5f6c2 100644
--- a/sys/dev/isa/sb.c
+++ b/sys/dev/isa/sb.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sb.c,v 1.4 1994/03/02 16:23:10 hpeyerl Exp $
+ *	$Id: sb.c,v 1.5 1994/03/06 17:19:16 mycroft Exp $
  */
 
 #include "sb.h"
@@ -362,7 +362,7 @@ sbreset(register u_long base)
 	 * Gee, what a brilliant hardware design.
 	 */
 	outb(base + SBP_DSP_RESET, 1);
-	DELAY(3);
+	delay(3);
 	outb(base + SBP_DSP_RESET, 0);
 	if (rdsp(base) != SB_MAGIC)
 		return (-1);
@@ -383,7 +383,7 @@ void
 sb_spkron(struct sb_softc *sc)
 {
 	(void)wdsp(sc->sc_base, SB_DSP_SPKR_ON);
-	DELAY(1000);
+	delay(1000);
 }
 
 /*
diff --git a/sys/dev/isa/wd.c b/sys/dev/isa/wd.c
index 1827cc45ac83..fb81ff91aead 100644
--- a/sys/dev/isa/wd.c
+++ b/sys/dev/isa/wd.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- *	$Id: wd.c,v 1.60 1994/03/05 08:17:06 mycroft Exp $
+ *	$Id: wd.c,v 1.61 1994/03/06 17:19:19 mycroft Exp $
  */
 
 #define	QUIETWORKS	/* define this to make wdopen() set DKFL_QUIET */
@@ -1465,9 +1465,9 @@ wdreset(du, err)
 
 	/* reset the device  */
 	outb(wdc+wd_ctlr, WDCTL_RST | WDCTL_IDS);
-	DELAY(1000);
+	delay(1000);
 	outb(wdc+wd_ctlr, WDCTL_IDS);
-	DELAY(1000);
+	delay(1000);
 	(void) inb(wdc+wd_error);
 	outb(wdc+wd_ctlr, WDCTL_4BIT);
 
@@ -1490,7 +1490,7 @@ wdc_wait(du, mask)
 			break;
 		if (++timeout > WDCNDELAY)
 			return -1;
-		DELAY(WDCDELAY);
+		delay(WDCDELAY);
 	}
 #ifdef WDCNDELAY_DEBUG
 	if (timeout > WDCNDELAY_DEBUG)
diff --git a/sys/dev/isa/wd7000.c b/sys/dev/isa/wd7000.c
index 402d400ac2a8..1939ffd758f7 100644
--- a/sys/dev/isa/wd7000.c
+++ b/sys/dev/isa/wd7000.c
@@ -16,7 +16,7 @@
  * scatter gather is done by the board, then look at one of the Adaptec
  * drivers to finish off the job..
  *
- *	$Id: wd7000.c,v 1.10 1994/01/03 23:53:39 mycroft Exp $
+ *	$Id: wd7000.c,v 1.11 1994/03/06 17:19:21 mycroft Exp $
  */
 #include "wds.h"
 #if NWDS > 0
@@ -359,7 +359,7 @@ wds_scsi_cmd(struct scsi_xfer *sxp)
 		return TRY_AGAIN_LATER;
 	}
 
-	DELAY(10000);
+	delay(10000);
 	/*printf("%08x/%08x mbox: %02x %02x %02x %02x\n", &r->cmd, KVTOPHYS(&r->cmd),
 		wds[unit].ombs[r->ombn].stat, wds[unit].ombs[r->ombn].addr[0],
 		wds[unit].ombs[r->ombn].addr[1], wds[unit].ombs[r->ombn].addr[2]);*/
@@ -369,7 +369,7 @@ repoll:		printf("wds%d: polling.", unit);
 		i = 0;
 		while( (inb(base+WDS_STAT) & WDS_IRQ) == 0) {
 			printf(".");
-			DELAY(10000);
+			delay(10000);
 			if(++i == 10) {
 				printf("failed %02x\n", inb(base+WDS_IRQSTAT));
 				/*r->busy = 0;*/
@@ -411,11 +411,11 @@ wdsintr(int unit)
 	u_char c;
 
 	/*printf("stat=%02x\n", inb(wds[unit].addr + WDS_STAT));*/
-	DELAY(1000);
+	delay(1000);
 	c = inb(wds[unit].addr + WDS_IRQSTAT);
 	printf("wdsintr: %02x\n", c);
 	if( (c&WDSI_MASK) == WDSI_MSVC) {
-		DELAY(1000);
+		delay(1000);
 		c = c & ~WDSI_MASK;
 		flushcache();
 		in = &wds[unit].imbs[c];
@@ -544,7 +544,7 @@ wds_getvers(int unit)
 		return -1;
 	}
 
-	DELAY(10000);
+	delay(10000);
 	/*printf("%08x/%08x mbox: %02x %02x %02x %02x\n", &r->cmd, KVTOPHYS(&r->cmd),
 		wds[unit].ombs[r->ombn].stat, wds[unit].ombs[r->ombn].addr[0],
 		wds[unit].ombs[r->ombn].addr[1], wds[unit].ombs[r->ombn].addr[2]);*/
@@ -554,7 +554,7 @@ wds_getvers(int unit)
 		i = 0;
 		while( (inb(base+WDS_STAT) & WDS_IRQ) == 0) {
 			printf(".");
-			DELAY(10000);
+			delay(10000);
 			if(++i == 10) {
 				printf("failed %02x\n", inb(base+WDS_IRQSTAT));
 				/*r->busy = 0;*/
@@ -624,7 +624,7 @@ wds_init(struct isa_device *dev)
 	for(i=0; i<4; i++)
 		if( (inb(base+WDS_STAT) & WDS_RDY) != 0) {
 			goto ready;
-		DELAY(10);
+		delay(10);
 	}
 	return 1;
 
@@ -637,9 +637,9 @@ ready:
 	 * the controller exists. reset and init.
 	 */
 	outb(base+WDS_HCR, WDSH_SCSIRESET|WDSH_ASCRESET);
-	DELAY(3);
+	delay(3);
 	outb(base+WDS_HCR, WDSH_DRQEN);
-	DELAY(20000);
+	delay(20000);
 
 #if 1
 	outb(0xd6, 0xc3);
@@ -654,7 +654,7 @@ ready:
 			if( (inb(base+WDS_STAT) & (WDS_RDY)) == WDS_RDY)
 				break;
 			printf(".");
-			DELAY(10000);
+			delay(10000);
 		}
 		if( (inb(base+WDS_STAT) & (WDS_RDY)) != WDS_RDY) {
 			printf("failed\n");
diff --git a/sys/dev/isa/wt.c b/sys/dev/isa/wt.c
index 526029539ce2..adc3fcc798a0 100644
--- a/sys/dev/isa/wt.c
+++ b/sys/dev/isa/wt.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wt.c	7.1 (Berkeley) 5/9/91
- *	$Id: wt.c,v 1.7 1994/02/09 21:13:58 mycroft Exp $
+ *	$Id: wt.c,v 1.8 1994/03/06 17:19:22 mycroft Exp $
  */
 
 /*
@@ -526,7 +526,7 @@ int	dev, flag;
 #ifdef DEBUG
 		debug("Waiting for rew to finish\n");
 #endif
-		DELAY(1000000);	/* delay one second */
+		delay(1000000);	/* delay one second */
 	}
 	/* Only do reset and select when tape light is off, and tape is rewound.
 	 * This allows multiple volumes. */
@@ -786,7 +786,7 @@ rdyexc(ticks)
 		if (!(s & READY))	/* check if controller is ready */
 			break;
 		s = splbio();
-		DELAY((ticks/HZ)*1000000); /* */
+		delay((ticks/HZ)*1000000); /* */
 		splx(s);
 	}
 #ifdef DEBUG
@@ -996,7 +996,7 @@ t_reset()
 	register i;
 	mbits |= RESET;
 	outb(CTLPORT, mbits);		/* send reset */
-	DELAY(20);
+	delay(20);
 	mbits &= ~RESET;
 	outb(CTLPORT, mbits);		/* turn off reset */
 	if ((inb(STATPORT) & RESETMASK) == RESETVAL)