[src/trunk]: src/sys/dev/marvell Use underscores to prefix local variables in...

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

details:   https://anonhg.NetBSD.org/src/rev/6d2019e630fc
branches:  trunk
changeset: 581616:6d2019e630fc
user:      scw <scw%NetBSD.org@localhost>
date:      Fri Jun 03 11:22:08 2005 +0000

description:
Use underscores to prefix local variables in macros.

diffstat:

 sys/dev/marvell/gtmpsc.c |  28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diffs (57 lines):

diff -r d47ecb8b2fe5 -r 6d2019e630fc sys/dev/marvell/gtmpsc.c
--- a/sys/dev/marvell/gtmpsc.c  Fri Jun 03 11:20:06 2005 +0000
+++ b/sys/dev/marvell/gtmpsc.c  Fri Jun 03 11:22:08 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gtmpsc.c,v 1.10 2005/02/27 00:27:21 perry Exp $        */
+/*     $NetBSD: gtmpsc.c,v 1.11 2005/06/03 11:22:08 scw Exp $  */
 
 /*
  * Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtmpsc.c,v 1.10 2005/02/27 00:27:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtmpsc.c,v 1.11 2005/06/03 11:22:08 scw Exp $");
 
 #include "opt_kgdb.h"
 
@@ -274,26 +274,26 @@
 
 
 #define SDMA_IMASK_ENABLE(sc, bit)  do { \
-       unsigned int    r; \
+       unsigned int    __r; \
        GT_WRITE(sc, SDMA_ICAUSE, ~(bit)); \
        if (gt_reva_gtmpsc_bug) \
-               r = sdma_imask; \
+               __r = sdma_imask; \
        else \
-               r = GT_READ(sc, SDMA_IMASK); \
-       r |= (bit); \
-       sdma_imask = r; \
-       GT_WRITE(sc, SDMA_IMASK, r); \
+               __r = GT_READ(sc, SDMA_IMASK); \
+       __r |= (bit); \
+       sdma_imask = __r; \
+       GT_WRITE(sc, SDMA_IMASK, __r); \
 } while (/*CONSTCOND*/ 0)
 
 #define SDMA_IMASK_DISABLE(sc, bit)  do { \
-       unsigned int    r; \
+       unsigned int    __r; \
        if (gt_reva_gtmpsc_bug) \
-               r = sdma_imask; \
+               __r = sdma_imask; \
        else \
-               r = GT_READ(sc, SDMA_IMASK); \
-       r &= ~(bit); \
-       sdma_imask = r; \
-       GT_WRITE(sc, SDMA_IMASK, r); \
+               __r = GT_READ(sc, SDMA_IMASK); \
+       __r &= ~(bit); \
+       sdma_imask = __r; \
+       GT_WRITE(sc, SDMA_IMASK, __r); \
 } while (/*CONSTCOND*/ 0)
 
 static volatile inline unsigned int