From 9a5999eef8da573fca01ea4b525b0eb39318eb87 Mon Sep 17 00:00:00 2001 From: lottaviano Date: Mon, 28 Sep 2009 07:36:43 +0000 Subject: [PATCH] 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 --- Doxyfile | 3 ++- Doxyfile-offline | 3 ++- bertos/cfg/macros.h | 14 +++++++------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Doxyfile b/Doxyfile index c53b0c0e..3147b4e0 100644 --- 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 bf7964ac..c3022d3e 100644 --- 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 abf2057d..9e813968 100644 --- 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__) -- 2.25.1