[src/trunk]: src/sys/dev/ieee1394 Change the name of a shadowed variable in F...

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

details:   https://anonhg.NetBSD.org/src/rev/7205e637c4da
branches:  trunk
changeset: 581872:7205e637c4da
user:      fair <fair%NetBSD.org@localhost>
date:      Wed Jun 08 18:33:15 2005 +0000

description:
Change the name of a shadowed variable in FW_DEBUG code to make this
compile again.

diffstat:

 sys/dev/ieee1394/fwohci.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (33 lines):

diff -r 643a5674348d -r 7205e637c4da sys/dev/ieee1394/fwohci.c
--- a/sys/dev/ieee1394/fwohci.c Wed Jun 08 17:55:06 2005 +0000
+++ b/sys/dev/ieee1394/fwohci.c Wed Jun 08 18:33:15 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fwohci.c,v 1.87 2005/05/31 00:46:46 christos Exp $     */
+/*     $NetBSD: fwohci.c,v 1.88 2005/06/08 18:33:15 fair Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.87 2005/05/31 00:46:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.88 2005/06/08 18:33:15 fair Exp $");
 
 #define FWOHCI_WAIT_DEBUG 1
 
@@ -6035,10 +6035,11 @@
            itc->itc_buf_start->itd_num, itc->itc_buf_end->itd_num,
            itc->itc_buf_cnt);
        {
-               u_int32_t reg
+               u_int32_t cntlstatus
                    = OHCI_CSR_READ(sc, OHCI_REG_IsochronousCycleTimer);
-               printf("\t\tIsoCounter 0x%08x, %d %d %d\n", reg,
-                   (reg >> 25) & 0xfe, (reg >> 12) & 0x1fff, reg & 0xfff);
+               printf("\t\tIsoCounter 0x%08x, %d %d %d\n", cntlstatus,
+                   (cntlstatus >> 25) & 0xfe, (cntlstatus >> 12) & 0x1fff,
+                   cntlstatus & 0xfff);
        }
 #endif /* FW_DEBUG */
        /* end print out debug info */