summaryrefslogtreecommitdiff
path: root/sys/dev/ic
diff options
context:
space:
mode:
authormycroft <mycroft@NetBSD.org>1994-03-06 17:18:43 +0000
committermycroft <mycroft@NetBSD.org>1994-03-06 17:18:43 +0000
commit0c082bcaf80b70abc2db85ab68cedaaac230bfdb (patch)
tree7398643ba3714b66260ed339d5ecedb44b7a4cbc /sys/dev/ic
parenta199f44684d3f9699cbd4710682265e20ae1eb51 (diff)
DELAY() --> delay(). This is not a macro.
Diffstat (limited to 'sys/dev/ic')
-rw-r--r--sys/dev/ic/com.c8
-rw-r--r--sys/dev/ic/lpt.c6
-rw-r--r--sys/dev/ic/lptvar.h6
3 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index e597e24facb..1d64cafbc43 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 192dbca2837..2c0d1cdac60 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 4637c4b1058..c279840456d 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;