Fix compile errors when both Host and Device modes are enabled.

[pub/USBasp.git] / LUFA / Common / Common.h

diff --git a/LUFA/Common/Common.h b/LUFA/Common/Common.h
index 9d64403..5635a4e 100644 (file)
--- a/LUFA/Common/Common.h
+++ b/LUFA/Common/Common.h
@@ -67,13 +67,20 @@
                #include <string.h>
                #include <stddef.h>
                
                #include <string.h>
                #include <stddef.h>
                

+               #if defined(USE_LUFA_CONFIG_HEADER)
+                       #include "LUFAConfig.h"
+               #endif
+

                #include "Architectures.h"
                #include "Attributes.h"
                #include "BoardTypes.h"
                
        /* Architecture specific utility includes: */
                #if defined(__DOXYGEN__)
                #include "Architectures.h"
                #include "Attributes.h"
                #include "BoardTypes.h"
                
        /* Architecture specific utility includes: */
                #if defined(__DOXYGEN__)

-                       /** Type define for an unsigned integer the same width as the selected architecture's machine register. */
+                       /** Type define for an unsigned integer the same width as the selected architecture's machine register.
+                        *  This is distinct from the non-specific standard int data type, whose width is machine dependant but
+                        *  which may not reflect the actual machine register width on some targets (e.g. AVR8).
+                        */

                        typedef MACHINE_REG_t uint_reg_t;
                #elif (ARCH == ARCH_AVR8)
                        #include <avr/io.h>
                        typedef MACHINE_REG_t uint_reg_t;
                #elif (ARCH == ARCH_AVR8)
                        #include <avr/io.h>


@@ -156,7 +163,7 @@
 
                        #if (ARCH == ARCH_AVR8) || defined(__DOXYGEN__)
                                /** Defines a volatile \c NOP statement which cannot be optimized out by the compiler, and thus can always
 
                        #if (ARCH == ARCH_AVR8) || defined(__DOXYGEN__)
                                /** Defines a volatile \c NOP statement which cannot be optimized out by the compiler, and thus can always

-                                *  be set as a breakpoint in the resulting code. Useful for debugging purposes, where the optimiser
+                                *  be set as a breakpoint in the resulting code. Useful for debugging purposes, where the optimizer

                                 *  removes/reorders code to the point where break points cannot reliably be set.
                                 *
                                 *  \note This macro is not available for all architectures.
                                 *  removes/reorders code to the point where break points cannot reliably be set.
                                 *
                                 *  \note This macro is not available for all architectures.


@@ -213,7 +220,7 @@
                                         *
                                         *  \return Pointer retrieved from PROGMEM space.
                                         */
                                         *
                                         *  \return Pointer retrieved from PROGMEM space.
                                         */

-                                       #define pgm_read_ptr(Addr)          (void*)pgm_read_word(Address)
+                                       #define pgm_read_ptr(Address)        (void*)pgm_read_word(Address)

                                #endif
                        #endif
                        
                                #endif
                        #endif
                        


@@ -232,6 +239,15 @@
                         *  assembly output in an unexpected manner on sections of code that are ordering-specific.
                         */
                        #define GCC_MEMORY_BARRIER()                __asm__ __volatile__("" ::: "memory");
                         *  assembly output in an unexpected manner on sections of code that are ordering-specific.
                         */
                        #define GCC_MEMORY_BARRIER()                __asm__ __volatile__("" ::: "memory");

+                       
+                       /** Evaluates to boolean true if the specified value can be determined at compile time to be a constant value
+                        *  when compiling under GCC.
+                        *
+                        *  \param[in] x  Value to check compile time constantness of.
+                        *
+                        *  \return Boolean true if the given value is known to be a compile time constant.
+                        */
+                       #define GCC_IS_COMPILE_CONST(x)             __builtin_constant_p(x)

 
                        #if !defined(ISR) || defined(__DOXYGEN__)
                                /** Macro for the definition of interrupt service routines, so that the compiler can insert the required
 
                        #if !defined(ISR) || defined(__DOXYGEN__)
                                /** Macro for the definition of interrupt service routines, so that the compiler can insert the required


@@ -248,7 +264,7 @@
                                 *
                                 *  \param Name  Unique name of the interrupt service routine.
                                 */
                                 *
                                 *  \param Name  Unique name of the interrupt service routine.
                                 */

-                               #define ISR(Name, ...)                  void Name (void) __attribute__((__interrupt__)); void Name (void)
+                               #define ISR(Name, ...)                  void Name (void) __attribute__((__interrupt__)) __VA_ARGS__; void Name (void)

                        #endif
 
                /* Inline Functions: */
                        #endif
 
                /* Inline Functions: */


@@ -273,10 +289,11 @@
                         *
                         *  \param[in] Milliseconds  Number of milliseconds to delay
                         */
                         *
                         *  \param[in] Milliseconds  Number of milliseconds to delay
                         */

+                       static inline void Delay_MS(uint8_t Milliseconds) ATTR_ALWAYS_INLINE;

                        static inline void Delay_MS(uint8_t Milliseconds)
                        {
                                #if (ARCH == ARCH_AVR8)
                        static inline void Delay_MS(uint8_t Milliseconds)
                        {
                                #if (ARCH == ARCH_AVR8)

-                               if (__builtin_constant_p(Milliseconds))
+                               if (GCC_IS_COMPILE_CONST(Milliseconds))

                                {
                                        _delay_ms(Milliseconds);
                                }
                                {
                                        _delay_ms(Milliseconds);
                                }