[src/trunk]: src/sys/arch/arm/ixp12x0 Fix shadowing warnings by renaming loca...

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

details:   https://anonhg.NetBSD.org/src/rev/d005b5c31bc5
branches:  trunk
changeset: 581748:d005b5c31bc5
user:      he <he%NetBSD.org@localhost>
date:      Sat Jun 04 21:19:23 2005 +0000

description:
Fix shadowing warnings by renaming local variables and by
removing parameter names in function prototype.

diffstat:

 sys/arch/arm/ixp12x0/ixp12x0_clk.c |  18 +++++++++---------
 sys/arch/arm/ixp12x0/ixp12x0_com.c |   6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diffs (85 lines):

diff -r 9b2b7aaba1e1 -r d005b5c31bc5 sys/arch/arm/ixp12x0/ixp12x0_clk.c
--- a/sys/arch/arm/ixp12x0/ixp12x0_clk.c        Sat Jun 04 21:18:18 2005 +0000
+++ b/sys/arch/arm/ixp12x0/ixp12x0_clk.c        Sat Jun 04 21:19:23 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ixp12x0_clk.c,v 1.8 2003/07/13 09:25:50 igy Exp $      */
+/*     $NetBSD: ixp12x0_clk.c,v 1.9 2005/06/04 21:19:23 he Exp $       */
 
 /*
  * Copyright (c) 1997 Mark Brinicombe.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_clk.c,v 1.8 2003/07/13 09:25:50 igy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_clk.c,v 1.9 2005/06/04 21:19:23 he Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -213,7 +213,7 @@
  *     recalculate the intervals here, but that would be a pain.
  */
 void
-setstatclockrate(int hz)
+setstatclockrate(int newhz)
 {
 
        /* use hardclock */
@@ -321,7 +321,7 @@
 delay(unsigned int usecs)
 {
        u_int32_t       count;
-       u_int32_t       tick;
+       u_int32_t       ticks;
        u_int32_t       otick;
        u_int32_t       delta;
        int             j;
@@ -353,16 +353,16 @@
                for(j = 100; j > 0; j--)
                        ;
 
-               tick = gettick();
-               delta = otick < tick
-                       ? ixpclk_sc->sc_clock_count + otick - tick
-                       : otick - tick;
+               ticks = gettick();
+               delta = otick < ticks
+                       ? ixpclk_sc->sc_clock_count + otick - ticks
+                       : otick - ticks;
 
                if (delta > count)
                        break;
 
                count -= delta;
-               otick = tick;
+               otick = ticks;
        }
 }
 
diff -r 9b2b7aaba1e1 -r d005b5c31bc5 sys/arch/arm/ixp12x0/ixp12x0_com.c
--- a/sys/arch/arm/ixp12x0/ixp12x0_com.c        Sat Jun 04 21:18:18 2005 +0000
+++ b/sys/arch/arm/ixp12x0/ixp12x0_com.c        Sat Jun 04 21:19:23 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ixp12x0_com.c,v 1.19 2003/08/07 16:26:53 agc Exp $ */
+/*     $NetBSD: ixp12x0_com.c,v 1.20 2005/06/04 21:19:23 he Exp $ */
 /*
  * Copyright (c) 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_com.c,v 1.19 2003/08/07 16:26:53 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_com.c,v 1.20 2005/06/04 21:19:23 he Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -973,7 +973,7 @@
        struct ixpcom_softc *sc;
        struct tty *tp;
 {
-       int (*rint) __P((int c, struct tty *tp)) = tp->t_linesw->l_rint;
+       int (*rint) __P((int, struct tty *)) = tp->t_linesw->l_rint;
        u_char *get, *end;
        u_int cc, scc;
        u_char lsr;