[src/trunk]: src/sys Fix a shadowing variable.

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

details:   https://anonhg.NetBSD.org/src/rev/8ae7f16395fe
branches:  trunk
changeset: 581721:8ae7f16395fe
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Jun 04 04:35:27 2005 +0000

description:
Fix a shadowing variable.

diffstat:

 sys/arch/sparc/sparc/pmap.c |   6 +++---
 sys/dev/sbus/p9100.c        |  10 +++++-----
 sys/dev/sbus/zx.c           |  10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diffs (99 lines):

diff -r 9991773a3f0a -r 8ae7f16395fe sys/arch/sparc/sparc/pmap.c
--- a/sys/arch/sparc/sparc/pmap.c       Sat Jun 04 04:34:49 2005 +0000
+++ b/sys/arch/sparc/sparc/pmap.c       Sat Jun 04 04:35:27 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.300 2005/06/03 22:15:48 martin Exp $ */
+/*     $NetBSD: pmap.c,v 1.301 2005/06/04 04:35:27 tsutsui Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.300 2005/06/03 22:15:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.301 2005/06/04 04:35:27 tsutsui Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -2044,7 +2044,7 @@
        else {
                /* Map kernel address into all contexts */
                int ctx = getcontext4();
-               int i = ncontext - 1;
+               i = ncontext - 1;
                do {
                        setcontext4(i);
                        setsegmap(va, pmeg);
diff -r 9991773a3f0a -r 8ae7f16395fe sys/dev/sbus/p9100.c
--- a/sys/dev/sbus/p9100.c      Sat Jun 04 04:34:49 2005 +0000
+++ b/sys/dev/sbus/p9100.c      Sat Jun 04 04:35:27 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: p9100.c,v 1.22 2005/05/16 15:16:43 macallan Exp $ */
+/*     $NetBSD: p9100.c,v 1.23 2005/06/04 04:36:04 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.22 2005/05/16 15:16:43 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.23 2005/06/04 04:36:04 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -613,14 +613,14 @@
 p9100_init_engine(struct p9100_softc *sc)
 {
        /* reset clipping rectangles */
-       uint32_t max = ((sc->sc_width & 0x3fff) << 16) | 
+       uint32_t rmax = ((sc->sc_width & 0x3fff) << 16) | 
            (sc->sc_height & 0x3fff);
        
        p9100_ctl_write_4(sc, WINDOW_OFFSET, 0);
        p9100_ctl_write_4(sc, WINDOW_MIN, 0);
-       p9100_ctl_write_4(sc, WINDOW_MAX, max);
+       p9100_ctl_write_4(sc, WINDOW_MAX, rmax);
        p9100_ctl_write_4(sc, BYTE_CLIP_MIN, 0);
-       p9100_ctl_write_4(sc, BYTE_CLIP_MAX, max);
+       p9100_ctl_write_4(sc, BYTE_CLIP_MAX, rmax);
        p9100_ctl_write_4(sc, DRAW_MODE, 0);
        p9100_ctl_write_4(sc, PLANE_MASK, 0xffffffff);  
        p9100_ctl_write_4(sc, PATTERN0, 0xffffffff);    
diff -r 9991773a3f0a -r 8ae7f16395fe sys/dev/sbus/zx.c
--- a/sys/dev/sbus/zx.c Sat Jun 04 04:34:49 2005 +0000
+++ b/sys/dev/sbus/zx.c Sat Jun 04 04:35:27 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: zx.c,v 1.14 2005/02/27 00:27:48 perry Exp $    */
+/*     $NetBSD: zx.c,v 1.15 2005/06/04 04:36:32 tsutsui Exp $  */
 
 /*
  *  Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zx.c,v 1.14 2005/02/27 00:27:48 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zx.c,v 1.15 2005/06/04 04:36:32 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -750,14 +750,14 @@
 zxmmap(dev_t dev, off_t off, int prot)
 {
        struct zx_softc *sc;
-       const struct zx_mmo *mm, *max;
+       const struct zx_mmo *mm, *mmmax;
 
        sc = device_lookup(&zx_cd, minor(dev));
        off = trunc_page(off);
        mm = zx_mmo;
-       max = mm + sizeof(zx_mmo) / sizeof(zx_mmo[0]);
+       mmmax = mm + sizeof(zx_mmo) / sizeof(zx_mmo[0]);
 
-       for (; mm < max; mm++)
+       for (; mm < mmmax; mm++)
                if (off >= mm->mo_va && off < mm->mo_va + mm->mo_size) {
                        off = off - mm->mo_va + mm->mo_pa;
                        return (bus_space_mmap(sc->sc_bt, sc->sc_paddr,