[src/trunk]: src/sys/arch/mips/alchemy Rename local variable `cpu_intr' to `c...

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

details:   https://anonhg.NetBSD.org/src/rev/1939773629c6
branches:  trunk
changeset: 581904:1939773629c6
user:      he <he%NetBSD.org@localhost>
date:      Thu Jun 09 21:42:33 2005 +0000

description:
Rename local variable `cpu_intr' to `cpu_int' to avoid shadowing.

diffstat:

 sys/arch/mips/alchemy/au_icu.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (47 lines):

diff -r 17fa65f93604 -r 1939773629c6 sys/arch/mips/alchemy/au_icu.c
--- a/sys/arch/mips/alchemy/au_icu.c    Thu Jun 09 21:41:52 2005 +0000
+++ b/sys/arch/mips/alchemy/au_icu.c    Thu Jun 09 21:42:33 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: au_icu.c,v 1.9 2004/02/13 11:36:15 wiz Exp $   */
+/*     $NetBSD: au_icu.c,v 1.10 2005/06/09 21:42:33 he Exp $   */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: au_icu.c,v 1.9 2004/02/13 11:36:15 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: au_icu.c,v 1.10 2005/06/09 21:42:33 he Exp $");
 
 #include "opt_ddb.h"
 
@@ -231,7 +231,7 @@
 {
        struct evbmips_intrhand *ih;
        uint32_t icu_base;
-       int cpu_intr, s;
+       int cpu_int, s;
 
        if (irq >= NIRQS)
                panic("au_intr_establish: bogus IRQ %d", irq);
@@ -253,8 +253,8 @@
         * XXX do we want a separate list (really, should only be one item, not
         *     a list anyway) per irq, not per CPU interrupt?
         */
-       cpu_intr = (irq < 32 ? 0 : 2);
-       LIST_INSERT_HEAD(&au1000_cpuintrs[cpu_intr].cintr_list, ih, ih_q);
+       cpu_int = (irq < 32 ? 0 : 2);
+       LIST_INSERT_HEAD(&au1000_cpuintrs[cpu_int].cintr_list, ih, ih_q);
 
        /*
         * Now enable it.
@@ -286,7 +286,7 @@
                }
 
                /* XXX handle GPIO interrupts - not done at all yet */
-               if (cpu_intr & 0x1)
+               if (cpu_int & 0x1)
                        REGVAL(icu_base + IC_ASSIGN_REQUEST_CLEAR) = irq;
                else
                        REGVAL(icu_base + IC_ASSIGN_REQUEST_SET) = irq;