Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/ofppc/ofppc Rename local variable `tick' to `ticks'...



details:   https://anonhg.NetBSD.org/src/rev/bb604d4de502
branches:  trunk
changeset: 581892:bb604d4de502
user:      he <he%NetBSD.org@localhost>
date:      Thu Jun 09 12:25:32 2005 +0000

description:
Rename local variable `tick' to `ticks' to make this build with -Wshadow.

diffstat:

 sys/arch/ofppc/ofppc/clock.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (48 lines):

diff -r 8b975e28936d -r bb604d4de502 sys/arch/ofppc/ofppc/clock.c
--- a/sys/arch/ofppc/ofppc/clock.c      Thu Jun 09 12:23:23 2005 +0000
+++ b/sys/arch/ofppc/ofppc/clock.c      Thu Jun 09 12:25:32 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clock.c,v 1.8 2004/06/29 12:01:11 kleink Exp $ */
+/*     $NetBSD: clock.c,v 1.9 2005/06/09 12:25:32 he Exp $     */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.8 2004/06/29 12:01:11 kleink Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.9 2005/06/09 12:25:32 he Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -77,7 +77,7 @@
        struct clockframe *frame;
 {
        u_long tb;
-       long tick;
+       long ticks;
        int nticks;
 
        /*
@@ -90,15 +90,15 @@
         * Based on the actual time delay since the last decrementer reload,
         * we arrange for earlier interrupt next time.
         */
-       asm ("mftb %0; mfdec %1" : "=r"(tb), "=r"(tick));
-       for (nticks = 0; tick < 0; nticks++)
-               tick += ticks_per_intr;
-       asm volatile ("mtdec %0" :: "r"(tick));
+       asm ("mftb %0; mfdec %1" : "=r"(tb), "=r"(ticks));
+       for (nticks = 0; ticks < 0; nticks++)
+               ticks += ticks_per_intr;
+       asm volatile ("mtdec %0" :: "r"(ticks));
        /*
         * lasttb is used during microtime. Set it to the virtual
         * start of this tick interval.
         */
-       lasttb = tb + tick - ticks_per_intr;
+       lasttb = tb + ticks - ticks_per_intr;
 
        clock_return(frame, nticks);
 }



Home | Main Index | Thread Index | Old Index