doc: Fix bug with doxygen 1.6.1; enable some macros to be documented.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2979 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/Doxyfile b/Doxyfile
index c53b0c0e10ae04797f9a5e3e9ae55eeb3e1777f6..3147b4e040a5cd6addb00dad756624e245a0ebd3 100644 (file)
--- a/Doxyfile
+++ b/Doxyfile
@@ -1266,7 +1266,8 @@ PREDEFINED             = __doxygen__ \
                          CONFIG_KERN_PRI=1 \
                          CONFIG_TIMER_EVENTS=1 \
                          CONFIG_TIMER_UDELAY=1 \
-                         CONFIG_KERN_SIGNALS=1
+                         CONFIG_KERN_SIGNALS=1 \
+                         COMPILER_VARIADIC_MACROS=1
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded. 

diff --git a/Doxyfile-offline b/Doxyfile-offline
index bf7964ac0b5a322659fb23ee8a5e506949dcd42c..c3022d3e93a1f48ba9278a2d6c05810a888c8dd4 100644 (file)
--- a/Doxyfile-offline
+++ b/Doxyfile-offline
@@ -1267,7 +1267,8 @@ PREDEFINED             = __doxygen__ \
                          CONFIG_KERN_PRI=1 \
                          CONFIG_TIMER_EVENTS=1 \
                          CONFIG_TIMER_UDELAY=1 \
-                         CONFIG_KERN_SIGNALS=1
+                         CONFIG_KERN_SIGNALS=1 \
+                         COMPILER_VARIADIC_MACROS=1
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded. 

diff --git a/bertos/cfg/macros.h b/bertos/cfg/macros.h
index abf2057d5308d43d56593d60d0d8ed2c642ac5c4..9e8139688402d4e64d51c6e5e6dacb8b96149235 100644 (file)
--- a/bertos/cfg/macros.h
+++ b/bertos/cfg/macros.h
@@ -273,11 +273,11 @@
 
        #define BIT_MASK_SINGLE__(use_bv, index, max, arg) \
                ((index < max) ? (PP_CAT(BIT_EXTRACT_FLAG_, use_bv) arg) : 0) \
-               /**/
+               /* */
 
        #define BIT_MASK_IF_SINGLE__(use_bv, index, max, arg) \
                (((index < max) && (BIT_EXTRACT_VALUE__ arg)) ? (PP_CAT(BIT_EXTRACT_FLAG_, use_bv) arg) : 0) \
-               /**/
+               /* */
 
        #define BIT_ITER__2(macro, use_bv, max, a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12,a13,a14,a15, ...) \
                (macro(use_bv, 0, max, a0) | \
@@ -296,23 +296,23 @@
                macro(use_bv, 13, max, a13) | \
                macro(use_bv, 14, max, a14) | \
                macro(use_bv, 15, max, a15)) \
-               /**/
+               /* */
 
        #define BIT_ITER__(macro, use_bv, ...) \
                BIT_ITER__2(macro, use_bv, PP_COUNT(__VA_ARGS__), __VA_ARGS__, (0,1),(0,1),(0,1),(0,1),(0,1),(0,1),(0,1),(0,1),(0,1),(0,1),(0,1),(0,1),(0,1),(0,1),(0,1),(0,1)) \
-               /**/
+               /* */
 
        #define BIT_MASKS__(use_bv, ...) \
                BIT_ITER__(BIT_MASK_SINGLE__, use_bv, __VA_ARGS__)
-               /**/
+               /* */
 
        #define BIT_MASKS_CONDITIONAL__(use_bv, ...) \
                BIT_ITER__(BIT_MASK_IF_SINGLE__, use_bv, __VA_ARGS__)
-               /**/
+               /* */
 
        #define BIT_CHANGE__(reg, use_bv, ...) \
                ((reg) = ((reg) & ~BIT_MASKS__(use_bv, __VA_ARGS__)) | BIT_MASKS_CONDITIONAL__(use_bv, __VA_ARGS__)) \
-               /**/
+               /* */
 
        #define BIT_CHANGE(reg, ...)        BIT_CHANGE__(reg, 0, __VA_ARGS__)
        #define BIT_CHANGE_BV(reg, ...)     BIT_CHANGE__(reg, 1, __VA_ARGS__)