[src/trunk]: src/sys/arch/atari/dev Prefix local variables in macros with _, ...

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

details:   https://anonhg.NetBSD.org/src/rev/f0506e67342a
branches:  trunk
changeset: 581737:f0506e67342a
user:      he <he%NetBSD.org@localhost>
date:      Sat Jun 04 14:30:10 2005 +0000

description:
Prefix local variables in macros with _, and add a character to
one variable name to avoid a shadowing warning.

diffstat:

 sys/arch/atari/dev/ym2149reg.h |  26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diffs (77 lines):

diff -r 236add72d939 -r f0506e67342a sys/arch/atari/dev/ym2149reg.h
--- a/sys/arch/atari/dev/ym2149reg.h    Sat Jun 04 14:00:18 2005 +0000
+++ b/sys/arch/atari/dev/ym2149reg.h    Sat Jun 04 14:30:10 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ym2149reg.h,v 1.3 1997/01/21 20:41:09 leo Exp $        */
+/*     $NetBSD: ym2149reg.h,v 1.4 2005/06/04 14:30:10 he Exp $ */
 
 /*
  * Copyright (c) 1996 Leo Weppelman.
@@ -107,11 +107,11 @@
 extern u_char  ym2149_ioa;     /* Soft-copy of port-A                  */
 
 #define ym2149_write_ioport(port, value) {                             \
-       int     s = splhigh();                                          \
+       int     _os = splhigh();                                        \
                                                                        \
        YM2149->sd_selr = port;                                         \
        YM2149->sd_wdat = value;                                        \
-       splx(s);                                                        \
+       splx(_os);                                                      \
 }
 
 #define ym2149_write_ioport2(port, value) {                            \
@@ -120,43 +120,43 @@
 }
 
 #define ym2149_fd_select(select) {                                     \
-       int s = splhigh();                                              \
+       int _s = splhigh();                                             \
                                                                        \
        ym2149_ioa = (ym2149_ioa & ~PA_FDSEL) | (select & PA_FDSEL);    \
        ym2149_write_ioport(YM_IOA, ym2149_ioa);                        \
-       splx(s);                                                        \
+       splx(_s);                                                       \
        }
 
 #define ym2149_rts(set) {                                              \
-       int s = splhigh();                                              \
+       int _s = splhigh();                                             \
                                                                        \
        ym2149_ioa = set ? ym2149_ioa | PA_SRTS : ym2149_ioa & ~PA_SRTS;\
        ym2149_write_ioport(YM_IOA, ym2149_ioa);                        \
-       splx(s);                                                        \
+       splx(_s);                                                       \
        }
 
 #define ym2149_dtr(set) {                                              \
-       int s = splhigh();                                              \
+       int _s = splhigh();                                             \
                                                                        \
        ym2149_ioa = set ? ym2149_ioa | PA_SDTR : ym2149_ioa & ~PA_SDTR;\
        ym2149_write_ioport(YM_IOA, ym2149_ioa);                        \
-       splx(s);                                                        \
+       splx(_s);                                                       \
        }
 
 #define ym2149_strobe(set) {                                           \
-       int s = splhigh();                                              \
+       int _s = splhigh();                                             \
                                                                        \
        ym2149_ioa = set ? ym2149_ioa | PA_PSTROBE : ym2149_ioa & ~PA_PSTROBE;\
        ym2149_write_ioport(YM_IOA, ym2149_ioa);                        \
-       splx(s);                                                        \
+       splx(_s);                                                       \
        }
 
 #define ym2149_ser2(set) {                                             \
-       int s = splhigh();                                              \
+       int _s = splhigh();                                             \
                                                                        \
        ym2149_ioa = set ? ym2149_ioa | PA_SER2 : ym2149_ioa & ~PA_SER2;\
        ym2149_write_ioport(YM_IOA, ym2149_ioa);                        \
-       splx(s);                                                        \
+       splx(_s);                                                       \
        }
 
 #undef ym2149_write_ioport2