[src/trunk]: src/sys/arch/evbppc/ev64260 Appease -Wshadow

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

details:   https://anonhg.NetBSD.org/src/rev/18cabfee3178
branches:  trunk
changeset: 581614:18cabfee3178
user:      scw <scw%NetBSD.org@localhost>
date:      Fri Jun 03 11:17:42 2005 +0000

description:
Appease -Wshadow

diffstat:

 sys/arch/evbppc/ev64260/clock.c   |  16 ++++++++--------
 sys/arch/evbppc/ev64260/machdep.c |  18 +++++++++---------
 2 files changed, 17 insertions(+), 17 deletions(-)

diffs (111 lines):

diff -r b98d924ea3ce -r 18cabfee3178 sys/arch/evbppc/ev64260/clock.c
--- a/sys/arch/evbppc/ev64260/clock.c   Fri Jun 03 11:15:44 2005 +0000
+++ b/sys/arch/evbppc/ev64260/clock.c   Fri Jun 03 11:17:42 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clock.c,v 1.5 2003/07/15 01:37:35 lukem Exp $  */
+/*     $NetBSD: clock.c,v 1.6 2005/06/03 11:17:42 scw Exp $    */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.5 2003/07/15 01:37:35 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.6 2005/06/03 11:17:42 scw Exp $");
 
 #include "opt_ppcparam.h"
 
@@ -221,7 +221,7 @@
 {
        struct cpu_info * const ci = curcpu();
        u_quad_t tb;
-       long tick;
+       long decrtick;
        int nticks;
        int oipl;
 #ifdef DEBUG
@@ -250,16 +250,16 @@
         * we arrange for earlier interrupt next time.
         */
        tb = mftb();
-       __asm __volatile ("mfdec %0" : "=r"(tick));
-       for (nticks = 0; tick < 0; nticks++)
-               tick += ticks_per_intr;
-       __asm __volatile ("mtdec %0" :: "r"(tick));
+       __asm __volatile ("mfdec %0" : "=r"(decrtick));
+       for (nticks = 0; decrtick < 0; nticks++)
+               decrtick += ticks_per_intr;
+       __asm __volatile ("mtdec %0" :: "r"(decrtick));
 
        /*
         * lasttb is used during microtime. Set it to the virtual
         * start of this tick interval.
         */
-       ci->ci_lasttb = tb + (tick - ticks_per_intr);
+       ci->ci_lasttb = tb + (decrtick - ticks_per_intr);
 
        uvmexp.intrs++;
        curcpu()->ci_ev_clock.ev_count++;
diff -r b98d924ea3ce -r 18cabfee3178 sys/arch/evbppc/ev64260/machdep.c
--- a/sys/arch/evbppc/ev64260/machdep.c Fri Jun 03 11:15:44 2005 +0000
+++ b/sys/arch/evbppc/ev64260/machdep.c Fri Jun 03 11:17:42 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.16 2004/03/13 07:22:21 matt Exp $        */
+/*     $NetBSD: machdep.c,v 1.17 2005/06/03 11:17:42 scw Exp $ */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.16 2004/03/13 07:22:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.17 2005/06/03 11:17:42 scw Exp $");
 
 #include "opt_marvell.h"
 #include "opt_ev64260.h"
@@ -426,7 +426,7 @@
 }
 
 void
-gt_halt(bus_space_tag_t gt_memt, bus_space_handle_t gt_memh)
+gt_halt(bus_space_tag_t memt, bus_space_handle_t memh)
 {
        int i;
        u_int32_t data;
@@ -435,10 +435,10 @@
         * Shut down the MPSC ports
         */
        for (i = 0; i < 2; i++) {
-               bus_space_write_4(gt_memt, gt_memh,
+               bus_space_write_4(memt, memh,
                    SDMA_U_SDCM(i), SDMA_SDCM_AR|SDMA_SDCM_AT);
                for (;;) {
-                       data = bus_space_read_4(gt_memt, gt_memh,
+                       data = bus_space_read_4(memt, memh,
                            SDMA_U_SDCM(i));
                        if (((SDMA_SDCM_AR|SDMA_SDCM_AT) & data) == 0)
                                break;
@@ -449,17 +449,17 @@
         * Shut down the Ethernets
         */
        for (i = 0; i < 3; i++) {
-               bus_space_write_4(gt_memt, gt_memh,
+               bus_space_write_4(memt, memh,
                    ETH_ESDCMR(2), ETH_ESDCMR_AR|ETH_ESDCMR_AT);
                for (;;) {
-                       data = bus_space_read_4(gt_memt, gt_memh,
+                       data = bus_space_read_4(memt, memh,
                            ETH_ESDCMR(i));
                        if (((ETH_ESDCMR_AR|ETH_ESDCMR_AT) & data) == 0)
                                break;
                }
-               data = bus_space_read_4(gt_memt, gt_memh, ETH_EPCR(i));
+               data = bus_space_read_4(memt, memh, ETH_EPCR(i));
                data &= ~ETH_EPCR_EN;
-               bus_space_write_4(gt_memt, gt_memh, ETH_EPCR(i), data);
+               bus_space_write_4(memt, memh, ETH_EPCR(i), data);
        }
 }