summaryrefslogtreecommitdiff
path: root/sys/dev/ic
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2004-01-01 20:25:22 +0000
committerthorpej <thorpej@NetBSD.org>2004-01-01 20:25:22 +0000
commit9bc0bf3f159ae8060bebe26c08137bbdd9f60eba (patch)
tree007d7778edcd567e2004977ad408db17d24efb44 /sys/dev/ic
parent763657a529dd1818caace4e29aea8564f462aa34 (diff)
Prepend "wdc_" to wait_for_drq, wait_for_unbusy, and wait_for_ready.
Diffstat (limited to 'sys/dev/ic')
-rw-r--r--sys/dev/ic/wdc.c8
-rw-r--r--sys/dev/ic/wdcvar.h8
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c
index 8b10c906614..2ee38b111db 100644
--- a/sys/dev/ic/wdc.c
+++ b/sys/dev/ic/wdc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc.c,v 1.165 2004/01/01 17:18:53 thorpej Exp $ */
+/* $NetBSD: wdc.c,v 1.166 2004/01/01 20:25:22 thorpej Exp $ */
/*
* Copyright (c) 1998, 2001, 2003 Manuel Bouyer. All rights reserved.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.165 2004/01/01 17:18:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.166 2004/01/01 20:25:22 thorpej Exp $");
#ifndef WDCDEBUG
#define WDCDEBUG
@@ -312,7 +312,7 @@ wdc_drvprobe(struct channel_softc *chp)
chp->ch_drive[i].drive_flags &= ~DRIVE_OLD;
continue;
}
- if (wait_for_ready(chp, 10000, 0) == WDCWAIT_TOUT) {
+ if (wdc_wait_for_ready(chp, 10000, 0) == WDCWAIT_TOUT) {
WDCDEBUG_PRINT(("%s:%d:%d: not ready\n",
chp->wdc->sc_dev.dv_xname,
chp->channel, i), DEBUG_PROBE);
@@ -322,7 +322,7 @@ wdc_drvprobe(struct channel_softc *chp)
bus_space_write_1(chp->cmd_iot,
chp->cmd_iohs[wd_command], 0, WDCC_RECAL);
delay(10); /* 400ns delay */
- if (wait_for_ready(chp, 10000, 0) == WDCWAIT_TOUT) {
+ if (wdc_wait_for_ready(chp, 10000, 0) == WDCWAIT_TOUT) {
WDCDEBUG_PRINT(("%s:%d:%d: WDCC_RECAL failed\n",
chp->wdc->sc_dev.dv_xname,
chp->channel, i), DEBUG_PROBE);
diff --git a/sys/dev/ic/wdcvar.h b/sys/dev/ic/wdcvar.h
index 78a94e26cb2..33dc35ba5f7 100644
--- a/sys/dev/ic/wdcvar.h
+++ b/sys/dev/ic/wdcvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wdcvar.h,v 1.50 2004/01/01 20:18:33 thorpej Exp $ */
+/* $NetBSD: wdcvar.h,v 1.51 2004/01/01 20:25:22 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -213,11 +213,11 @@ void wdc_probe_caps(struct ata_drive_datas*);
* ST506 spec says that if READY or SEEKCMPLT go off, then the read or write
* command is aborted.
*/
-#define wait_for_drq(chp, timeout, flags) \
+#define wdc_wait_for_drq(chp, timeout, flags) \
wdcwait((chp), WDCS_DRQ, WDCS_DRQ, (timeout), (flags))
-#define wait_for_unbusy(chp, timeout, flags) \
+#define wdc_wait_for_unbusy(chp, timeout, flags) \
wdcwait((chp), 0, 0, (timeout), (flags))
-#define wait_for_ready(chp, timeout, flags) \
+#define wdc_wait_for_ready(chp, timeout, flags) \
wdcwait((chp), WDCS_DRDY, WDCS_DRDY, (timeout), (flags))
/* ATA/ATAPI specs says a device can take 31s to reset */