[src/netbsd-2]: src/sys/arch/mac68k/include Pull up following revision(s) (re...

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

details:   https://anonhg.NetBSD.org/src/rev/e8fcc053060d
branches:  netbsd-2
changeset: 564527:e8fcc053060d
user:      tron <tron%NetBSD.org@localhost>
date:      Tue Sep 12 10:56:46 2006 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #10692):
        sys/arch/mac68k/include/bus.h: revision 1.25
Apply patch in PR port-mac68k/33636 from Dave Huang (with wrapping long lines).
i.e. args in macro should be wrapped with parentheses.

diffstat:

 sys/arch/mac68k/include/bus.h |  92 ++++++++++++++++++++++++++++--------------
 1 files changed, 61 insertions(+), 31 deletions(-)

diffs (189 lines):

diff -r 6dbf59dea01b -r e8fcc053060d sys/arch/mac68k/include/bus.h
--- a/sys/arch/mac68k/include/bus.h     Mon Sep 11 21:36:06 2006 +0000
+++ b/sys/arch/mac68k/include/bus.h     Tue Sep 12 10:56:46 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus.h,v 1.20 2002/04/10 04:38:49 briggs Exp $  */
+/*     $NetBSD: bus.h,v 1.20.16.1 2006/09/12 10:56:46 tron Exp $       */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -328,22 +328,28 @@
 
 #if defined(DIAGNOSTIC)
 #define        bus_space_read_multi_1(t, h, o, a, c) do {                       \
-       if (!c) panic("bus_space_read_multi_1 called with zero count."); \
+       if ((c) == 0)                                                    \
+               panic("bus_space_read_multi_1 called with zero count."); \
        (h).bsrm1(t,&(h),o,a,c); } while (0)
 #define        bus_space_read_multi_2(t, h, o, a, c) do {                       \
-       if (!c) panic("bus_space_read_multi_2 called with zero count."); \
+       if ((c) == 0)                                                    \
+               panic("bus_space_read_multi_2 called with zero count."); \
        (h).bsrm2(t,&(h),o,a,c); } while (0)
 #define        bus_space_read_multi_4(t, h, o, a, c) do {                       \
-       if (!c) panic("bus_space_read_multi_4 called with zero count."); \
+       if ((c) == 0)                                                    \
+               panic("bus_space_read_multi_4 called with zero count."); \
        (h).bsrm4(t,&(h),o,a,c); } while (0)
 #define        bus_space_read_multi_stream_1(t, h, o, a, c) do {                \
-       if (!c) panic("bus_space_read_multi_stream_1 called with count=0."); \
+       if ((c) == 0)                                                    \
+               panic("bus_space_read_multi_stream_1 called with count=0."); \
        (h).bsrms1(t,&(h),o,a,c); } while (0)
 #define        bus_space_read_multi_stream_2(t, h, o, a, c) do {                \
-       if (!c) panic("bus_space_read_multi_stream_2 called with count=0."); \
+       if ((c) == 0)                                                    \
+               panic("bus_space_read_multi_stream_2 called with count=0."); \
        (h).bsrms2(t,&(h),o,a,c); } while (0)
 #define        bus_space_read_multi_stream_4(t, h, o, a, c) do {                \
-       if (!c) panic("bus_space_read_multi_stream_4 called with count=0."); \
+       if ((c) == 0)                                                    \
+               panic("bus_space_read_multi_stream_4 called with count=0."); \
        (h).bsrms4(t,&(h),o,a,c); } while (0)
 #else
 #define        bus_space_read_multi_1(t, h, o, a, c) \
@@ -399,22 +405,28 @@
 
 #if defined(DIAGNOSTIC)
 #define        bus_space_read_region_1(t, h, o, a, c) do {                       \
-       if (!c) panic("bus_space_read_region_1 called with zero count."); \
+       if ((c) == 0)                                                     \
+               panic("bus_space_read_region_1 called with zero count."); \
        (h).bsrr1(t,&(h),o,a,c); } while (0)
 #define        bus_space_read_region_2(t, h, o, a, c) do {                       \
-       if (!c) panic("bus_space_read_region_2 called with zero count."); \
+       if ((c) == 0)                                                     \
+               panic("bus_space_read_region_2 called with zero count."); \
        (h).bsrr2(t,&(h),o,a,c); } while (0)
 #define        bus_space_read_region_4(t, h, o, a, c) do {                       \
-       if (!c) panic("bus_space_read_region_4 called with zero count."); \
+       if ((c) == 0)                                                     \
+               panic("bus_space_read_region_4 called with zero count."); \
        (h).bsrr4(t,&(h),o,a,c); } while (0)
 #define        bus_space_read_region_stream_1(t, h, o, a, c) do {                \
-       if (!c) panic("bus_space_read_region_stream_1 called with count=0."); \
+       if ((c) == 0)                                                     \
+               panic("bus_space_read_region_stream_1 called with count=0."); \
        (h).bsrrs1(t,&(h),o,a,c); } while (0)
 #define        bus_space_read_region_stream_2(t, h, o, a, c) do {                \
-       if (!c) panic("bus_space_read_region_stream_2 called with count=0."); \
+       if ((c) == 0)                                                     \
+                panic("bus_space_read_region_stream_2 called with count=0."); \
        (h).bsrrs2(t,&(h),o,a,c); } while (0)
 #define        bus_space_read_region_stream_4(t, h, o, a, c) do {                \
-       if (!c) panic("bus_space_read_region_stream_4 called with count=0."); \
+       if ((c) == 0)                                                     \
+               panic("bus_space_read_region_stream_4 called with count=0."); \
        (h).bsrrs4(t,&(h),o,a,c); } while (0)
 #else
 #define        bus_space_read_region_1(t, h, o, a, c) \
@@ -512,22 +524,28 @@
 
 #if defined(DIAGNOSTIC)
 #define        bus_space_write_multi_1(t, h, o, a, c) do {                       \
-       if (!c) panic("bus_space_write_multi_1 called with zero count."); \
+       if ((c) == 0)                                                     \
+               panic("bus_space_write_multi_1 called with zero count."); \
        (h).bswm1(t,&(h),o,a,c); } while (0)
 #define        bus_space_write_multi_2(t, h, o, a, c) do {                       \
-       if (!c) panic("bus_space_write_multi_2 called with zero count."); \
+       if ((c) == 0)                                                     \
+               panic("bus_space_write_multi_2 called with zero count."); \
        (h).bswm2(t,&(h),o,a,c); } while (0)
 #define        bus_space_write_multi_4(t, h, o, a, c) do {                       \
-       if (!c) panic("bus_space_write_multi_4 called with zero count."); \
+       if ((c) == 0)                                                     \
+               panic("bus_space_write_multi_4 called with zero count."); \
        (h).bswm4(t,&(h),o,a,c); } while (0)
 #define        bus_space_write_multi_stream_1(t, h, o, a, c) do {                \
-       if (!c) panic("bus_space_write_multi_stream_1 called with count=0."); \
+       if ((c) == 0)                                                     \
+               panic("bus_space_write_multi_stream_1 called with count=0."); \
        (h).bswms1(t,&(h),o,a,c); } while (0)
 #define        bus_space_write_multi_stream_2(t, h, o, a, c) do {                \
-       if (!c) panic("bus_space_write_multi_stream_2 called with count=0."); \
+       if ((c) == 0)                                                     \
+               panic("bus_space_write_multi_stream_2 called with count=0."); \
        (h).bswms2(t,&(h),o,a,c); } while (0)
 #define        bus_space_write_multi_stream_4(t, h, o, a, c) do {                \
-       if (!c) panic("bus_space_write_multi_stream_4 called with count=0."); \
+       if ((c) == 0)                                                     \
+               panic("bus_space_write_multi_stream_4 called with count=0."); \
        (h).bswms4(t,&(h),o,a,c); } while (0)
 #else
 #define        bus_space_write_multi_1(t, h, o, a, c) \
@@ -583,22 +601,28 @@
 
 #if defined(DIAGNOSTIC)
 #define        bus_space_write_region_1(t, h, o, a, c) do {                       \
-       if (!c) panic("bus_space_write_region_1 called with zero count."); \
+       if ((c) == 0)                                                      \
+               panic("bus_space_write_region_1 called with zero count."); \
        (h).bswr1(t,&(h),o,a,c); } while (0)
 #define        bus_space_write_region_2(t, h, o, a, c) do {                       \
-       if (!c) panic("bus_space_write_region_2 called with zero count."); \
+       if ((c) == 0)                                                      \
+               panic("bus_space_write_region_2 called with zero count."); \
        (h).bswr2(t,&(h),o,a,c); } while (0)
 #define        bus_space_write_region_4(t, h, o, a, c) do {                       \
-       if (!c) panic("bus_space_write_region_4 called with zero count."); \
+       if ((c) == 0)                                                      \
+               panic("bus_space_write_region_4 called with zero count."); \
        (h).bswr4(t,&(h),o,a,c); } while (0)
 #define        bus_space_write_region_stream_1(t, h, o, a, c) do {                \
-       if (!c) panic("bus_space_write_region_stream_1 called with count=0."); \
+       if ((c) == 0)                                                      \
+               panic("bus_space_write_region_stream_1 called with count=0."); \
        (h).bswrs1(t,&(h),o,a,c); } while (0)
 #define        bus_space_write_region_stream_2(t, h, o, a, c) do {                \
-       if (!c) panic("bus_space_write_region_stream_2 called with count=0."); \
+       if ((c) == 0)                                                      \
+               panic("bus_space_write_region_stream_2 called with count=0."); \
        (h).bswrs2(t,&(h),o,a,c); } while (0)
 #define        bus_space_write_region_stream_4(t, h, o, a, c) do {                \
-       if (!c) panic("bus_space_write_region_stream_4 called with count=0."); \
+       if ((c) == 0)                                                      \
+               panic("bus_space_write_region_stream_4 called with count=0."); \
        (h).bswrs4(t,&(h),o,a,c); } while (0)
 #else
 #define        bus_space_write_region_1(t, h, o, a, c) \
@@ -650,13 +674,16 @@
 
 #if defined(DIAGNOSTIC)
 #define        bus_space_set_multi_1(t, h, o, val, c) do {                     \
-       if (!c) panic("bus_space_set_multi_1 called with zero count."); \
+       if ((c) == 0)                                                   \
+                panic("bus_space_set_multi_1 called with zero count."); \
        (h).bssm1(t,&(h),o,val,c); } while (0)
 #define        bus_space_set_multi_2(t, h, o, val, c) do {                     \
-       if (!c) panic("bus_space_set_multi_2 called with zero count."); \
+       if ((c) == 0)                                                   \
+               panic("bus_space_set_multi_2 called with zero count."); \
        (h).bssm2(t,&(h),o,val,c); } while (0)
 #define        bus_space_set_multi_4(t, h, o, val, c) do {                     \
-       if (!c) panic("bus_space_set_multi_4 called with zero count."); \
+       if ((c) == 0)                                                   \
+               panic("bus_space_set_multi_4 called with zero count."); \
        (h).bssm4(t,&(h),o,val,c); } while (0)
 #else
 #define        bus_space_set_multi_1(t, h, o, val, c) \
@@ -700,13 +727,16 @@
 
 #if defined(DIAGNOSTIC)
 #define        bus_space_set_region_1(t, h, o, val, c) do {                     \
-       if (!c) panic("bus_space_set_region_1 called with zero count."); \
+       if ((c) == 0)                                                    \
+               panic("bus_space_set_region_1 called with zero count."); \
        (h).bssr1(t,&(h),o,val,c); } while (0)
 #define        bus_space_set_region_2(t, h, o, val, c) do {                     \
-       if (!c) panic("bus_space_set_region_2 called with zero count."); \
+       if ((c) == 0)                                                    \
+               panic("bus_space_set_region_2 called with zero count."); \
        (h).bssr2(t,&(h),o,val,c); } while (0)
 #define        bus_space_set_region_4(t, h, o, val, c) do {                     \
-       if (!c) panic("bus_space_set_region_4 called with zero count."); \
+       if ((c) == 0)                                                    \
+               panic("bus_space_set_region_4 called with zero count."); \
        (h).bssr4(t,&(h),o,val,c); } while (0)
 #else
 #define        bus_space_set_region_1(t, h, o, val, c) \