[src/trunk]: src/sys/arch/amiga/dev Fix some shadowing of variables

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

details:   https://anonhg.NetBSD.org/src/rev/81d6309e5774
branches:  trunk
changeset: 582026:81d6309e5774
user:      jmc <jmc%NetBSD.org@localhost>
date:      Mon Jun 13 21:33:15 2005 +0000

description:
Fix some shadowing of variables

diffstat:

 sys/arch/amiga/dev/drbbc.c  |  32 ++++++++++++++++----------------
 sys/arch/amiga/dev/grf_rt.c |  22 +++++++++++-----------
 sys/arch/amiga/dev/ite_cc.c |  10 +++++-----
 3 files changed, 32 insertions(+), 32 deletions(-)

diffs (169 lines):

diff -r 69c11128ff08 -r 81d6309e5774 sys/arch/amiga/dev/drbbc.c
--- a/sys/arch/amiga/dev/drbbc.c        Mon Jun 13 21:09:49 2005 +0000
+++ b/sys/arch/amiga/dev/drbbc.c        Mon Jun 13 21:33:15 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drbbc.c,v 1.11 2003/04/01 21:26:31 thorpej Exp $ */
+/*     $NetBSD: drbbc.c,v 1.12 2005/06/13 21:33:15 jmc Exp $ */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drbbc.c,v 1.11 2003/04/01 21:26:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drbbc.c,v 1.12 2005/06/13 21:33:15 jmc Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -129,42 +129,42 @@
 int
 draco_ds_read_bit(void *p)
 {
-       struct drioct *draco_ioct;
+       struct drioct *draco_ioctl;
 
-       draco_ioct = p;
+       draco_ioctl = p;
 
-       while (draco_ioct->io_status & DRSTAT_CLKBUSY);
+       while (draco_ioctl->io_status & DRSTAT_CLKBUSY);
 
-       draco_ioct->io_clockw1 = 0;
+       draco_ioctl->io_clockw1 = 0;
 
-       while (draco_ioct->io_status & DRSTAT_CLKBUSY);
+       while (draco_ioctl->io_status & DRSTAT_CLKBUSY);
 
-       return (draco_ioct->io_status & DRSTAT_CLKDAT);
+       return (draco_ioctl->io_status & DRSTAT_CLKDAT);
 }
 
 void
 draco_ds_write_bit(void *p, int b)
 {
-       struct drioct *draco_ioct;
+       struct drioct *draco_ioctl;
 
-       draco_ioct = p;
+       draco_ioctl = p;
 
-       while (draco_ioct->io_status & DRSTAT_CLKBUSY);
+       while (draco_ioctl->io_status & DRSTAT_CLKBUSY);
 
        if (b)
-               draco_ioct->io_clockw1 = 0;
+               draco_ioctl->io_clockw1 = 0;
        else
-               draco_ioct->io_clockw0 = 0;
+               draco_ioctl->io_clockw0 = 0;
 }
 
 void
 draco_ds_reset(void *p)
 {
-       struct drioct *draco_ioct;
+       struct drioct *draco_ioctl;
 
-       draco_ioct = p;
+       draco_ioctl = p;
 
-       draco_ioct->io_clockrst = 0;
+       draco_ioctl->io_clockrst = 0;
 }
 
 int
diff -r 69c11128ff08 -r 81d6309e5774 sys/arch/amiga/dev/grf_rt.c
--- a/sys/arch/amiga/dev/grf_rt.c       Mon Jun 13 21:09:49 2005 +0000
+++ b/sys/arch/amiga/dev/grf_rt.c       Mon Jun 13 21:33:15 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grf_rt.c,v 1.48 2003/01/20 05:29:59 simonb Exp $ */
+/*     $NetBSD: grf_rt.c,v 1.49 2005/06/13 21:33:15 jmc Exp $ */
 
 /*
  * Copyright (c) 1993 Markus Wild
@@ -33,7 +33,7 @@
 #include "opt_amigacons.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_rt.c,v 1.48 2003/01/20 05:29:59 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_rt.c,v 1.49 2005/06/13 21:33:15 jmc Exp $");
 
 #include "grfrt.h"
 #if NGRFRT > 0
@@ -604,16 +604,16 @@
                } while (x--);
 
                if (md->DEP != 4) {
-                       short x = 256-17;
-                       unsigned char col = 16;
+                       short xx = 256-17;
+                       unsigned char cols = 16;
                        do {
 
-                               vgaw(ba, VDAC_REG_DATA, col);
-                               vgaw(ba, VDAC_REG_DATA, col);
-                               vgaw(ba, VDAC_REG_DATA, col);
-                               col++;
+                               vgaw(ba, VDAC_REG_DATA, cols);
+                               vgaw(ba, VDAC_REG_DATA, cols);
+                               vgaw(ba, VDAC_REG_DATA, cols);
+                               cols++;
 
-                       } while (x--);
+                       } while (xx--);
                }
        }
 
@@ -671,12 +671,12 @@
                  }
 
                  if (md->FX > 8) {
-                       unsigned short z;
+                       unsigned short zz;
 
                        Map(3);
                        c = fb + md->FLo*32;
                        f = md->FData+1;
-                       for (z = md->FLo; z <= md->FHi; z++) {
+                       for (zz = md->FLo; z <= md->FHi; zz++) {
 
                                short y = md->FY-1;
                                do {
diff -r 69c11128ff08 -r 81d6309e5774 sys/arch/amiga/dev/ite_cc.c
--- a/sys/arch/amiga/dev/ite_cc.c       Mon Jun 13 21:09:49 2005 +0000
+++ b/sys/arch/amiga/dev/ite_cc.c       Mon Jun 13 21:33:15 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ite_cc.c,v 1.35 2004/02/24 15:05:54 wiz Exp $ */
+/*     $NetBSD: ite_cc.c,v 1.36 2005/06/13 21:33:15 jmc Exp $ */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -33,7 +33,7 @@
 #include "opt_amigaccgrf.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite_cc.c,v 1.35 2004/02/24 15:05:54 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite_cc.c,v 1.36 2005/06/13 21:33:15 jmc Exp $");
 
 #include "grfcc.h"
 #if NGRFCC > 0
@@ -418,15 +418,15 @@
                /*
                 * erase the cursor
                 */
-               int h;
+               int hh;
 
                if (dr_plane) {
-                       for (h = cend; h >= 0; h--) {
+                       for (hh = cend; hh >= 0; hh--) {
                                BFCLR(pl, ofs, ip->ftwidth);
                                pl += cci->row_offset;
                        }
                } else {
-                       for (h = cend; h >= 0; h--) {
+                       for (hh = cend; hh >= 0; hh--) {
                                BFCHG(pl, ofs, ip->ftwidth);
                                pl += cci->row_offset;
                        }