summaryrefslogtreecommitdiff
path: root/sys/dev/isa/cy.c
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/isa/cy.c
parenta199f44684d3f9699cbd4710682265e20ae1eb51 (diff)
DELAY() --> delay(). This is not a macro.
Diffstat (limited to 'sys/dev/isa/cy.c')
-rw-r--r--sys/dev/isa/cy.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/isa/cy.c b/sys/dev/isa/cy.c
index e81de5f72ae..9f3753cacbc 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);