[src/trunk]: src/sys/dev/sbus Rename "delay" variable to avoid shadowing the ...

[jdc <jdc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0d31711ee8f3
branches:  trunk
changeset: 581464:0d31711ee8f3
user:      jdc <jdc%NetBSD.org@localhost>
date:      Wed Jun 01 21:17:28 2005 +0000

description:
Rename "delay" variable to avoid shadowing the "delay" from param.h.

diffstat:

 sys/dev/sbus/stp4020.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (68 lines):

diff -r 50bd9696fa4c -r 0d31711ee8f3 sys/dev/sbus/stp4020.c
--- a/sys/dev/sbus/stp4020.c    Wed Jun 01 21:05:36 2005 +0000
+++ b/sys/dev/sbus/stp4020.c    Wed Jun 01 21:17:28 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: stp4020.c,v 1.43 2005/02/27 00:27:48 perry Exp $ */
+/*     $NetBSD: stp4020.c,v 1.44 2005/06/01 21:17:28 jdc Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.43 2005/02/27 00:27:48 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.44 2005/06/01 21:17:28 jdc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -139,7 +139,7 @@
 static void    stp4020attach(struct device *, struct device *, void *);
 static int     stp4020_intr(void *);
 static void    stp4020_map_window(struct stp4020_socket *h, int win, int speed);
-static void    stp4020_calc_speed(int bus_speed, int ns, int *length, int *delay);
+static void    stp4020_calc_speed(int bus_speed, int ns, int *length, int *cmd_delay);
 static void    stp4020_intr_dispatch(void *arg);
 
 CFATTACH_DECL(nell, sizeof(struct stp4020_softc),
@@ -785,7 +785,7 @@
  * values for the CMDLNG and CMDDLAY registers.
  */
 static void
-stp4020_calc_speed(int bus_speed, int ns, int *length, int *delay)
+stp4020_calc_speed(int bus_speed, int ns, int *length, int *cmd_delay)
 {
        int result;
 
@@ -801,13 +801,13 @@
        *length = result;
 
        /* the sbus frequency range is limited, so we can keep this simple */
-       *delay = ns <= STP4020_MEM_SPEED_MIN? 1 : 2;
+       *cmd_delay = ns <= STP4020_MEM_SPEED_MIN? 1 : 2;
 }
 
 static void
 stp4020_map_window(struct stp4020_socket *h, int win, int speed)
 {
-       int v, length, delay;
+       int v, length, cmd_delay;
 
        /*
         * According to the PC Card standard 300ns access timing should be
@@ -815,13 +815,13 @@
         * seem to propagate timing information, so we use that
         * everywhere.
         */
-       stp4020_calc_speed(speed, (win==STP_WIN_ATTR)? 300 : 100, &length, &delay);
+       stp4020_calc_speed(speed, (win==STP_WIN_ATTR)? 300 : 100, &length, &cmd_delay);
 
        /*
         * Fill in the Address Space Select and Base Address
         * fields of this windows control register 0.
         */
-       v = ((delay << STP4020_WCR0_CMDDLY_S)&STP4020_WCR0_CMDDLY_M)
+       v = ((cmd_delay << STP4020_WCR0_CMDDLY_S)&STP4020_WCR0_CMDDLY_M)
            | ((length << STP4020_WCR0_CMDLNG_S)&STP4020_WCR0_CMDLNG_M);
        switch (win) {
        case STP_WIN_ATTR: