From 48c5cdced47897934d8473a3097181d0e9ca8b4c Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Mon, 2 Aug 2010 08:53:23 +0000 Subject: Hide the PROGMEM attribute from Doxygen, as it appears to confuse the parser in some situations. --- Projects/AVRISP-MKII/Doxygen.conf | 3 ++- Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c | 10 ++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'Projects/AVRISP-MKII') diff --git a/Projects/AVRISP-MKII/Doxygen.conf b/Projects/AVRISP-MKII/Doxygen.conf index 3ebf34f41..f144b070a 100644 --- a/Projects/AVRISP-MKII/Doxygen.conf +++ b/Projects/AVRISP-MKII/Doxygen.conf @@ -1307,7 +1307,8 @@ INCLUDE_FILE_PATTERNS = # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = __DOXYGEN__ +PREDEFINED = __DOXYGEN__ \ + PROGMEM # 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/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c index 47ce43bca..55d65511e 100644 --- a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c +++ b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c @@ -37,7 +37,10 @@ #if defined(ENABLE_ISP_PROTOCOL) || defined(__DOXYGEN__) -/** List of hardware SPI prescaler masks for possible AVRStudio ISP programming speeds. */ +/** List of hardware SPI prescaler masks for possible AVRStudio ISP programming speeds. + * + * \hideinitializer + */ static uint8_t SPIMaskFromSCKDuration[] PROGMEM = { #if (F_CPU == 8000000) @@ -61,7 +64,10 @@ static uint8_t SPIMaskFromSCKDuration[] PROGMEM = #endif }; -/** Lookup table to convert the slower ISP speeds into a compare value for the software SPI driver. */ +/** Lookup table to convert the slower ISP speeds into a compare value for the software SPI driver. + * + * \hideinitializer + */ static uint16_t TimerCompareFromSCKDuration[] PROGMEM = { TIMER_COMP(96386), TIMER_COMP(89888), TIMER_COMP(84211), TIMER_COMP(79208), TIMER_COMP(74767), -- cgit v1.2.3