X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/852b5e612d549d1f086ceca4df0b589ac24cb37f..c029d72b9497ebf554c9d05ec58d48d7534b8a2f:/LUFA/Common/Common.h

diff --git a/LUFA/Common/Common.h b/LUFA/Common/Common.h
index 9d64403bc..87fc08cb1 100644
--- a/LUFA/Common/Common.h
+++ b/LUFA/Common/Common.h
@@ -67,13 +67,26 @@
 		#include <string.h>
 		#include <stddef.h>
 		
+		#if defined(USE_LUFA_CONFIG_HEADER)
+			#include "LUFAConfig.h"
+		#endif
+
+		#include "CompilerSpecific.h"
 		#include "Architectures.h"
 		#include "Attributes.h"
 		#include "BoardTypes.h"
 		
+	/* Enable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			extern "C" {
+		#endif
+
 	/* 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>
@@ -156,7 +169,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
-				 *  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.
@@ -213,25 +226,9 @@
 					 *
 					 *  \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
-			
-			/** Forces GCC to use pointer indirection (via the device's pointer register pairs) when accessing the given
-			 *  struct pointer. In some cases GCC will emit non-optimal assembly code when accessing a structure through
-			 *  a pointer, resulting in a larger binary. When this macro is used on a (non \c const) structure pointer before
-			 *  use, it will force GCC to use pointer indirection on the elements rather than direct store and load
-			 *  instructions.
-			 *
-			 *  \param[in, out] StructPtr  Pointer to a structure which is to be forced into indirect access mode.
-			 */
-			#define GCC_FORCE_POINTER_ACCESS(StructPtr) __asm__ __volatile__("" : "=b" (StructPtr) : "0" (StructPtr))
-
-			/** Forces GCC to create a memory barrier, ensuring that memory accesses are not reordered past the barrier point.
-			 *  This can be used before ordering-critical operations, to ensure that the compiler does not re-order the resulting
-			 *  assembly output in an unexpected manner on sections of code that are ordering-specific.
-			 */
-			#define GCC_MEMORY_BARRIER()                __asm__ __volatile__("" ::: "memory");
 
 			#if !defined(ISR) || defined(__DOXYGEN__)
 				/** Macro for the definition of interrupt service routines, so that the compiler can insert the required
@@ -248,7 +245,7 @@
 				 *
 				 *  \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: */
@@ -273,10 +270,11 @@
 			 *
 			 *  \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)
-				if (__builtin_constant_p(Milliseconds))
+				if (GCC_IS_COMPILE_CONST(Milliseconds))
 				{
 					_delay_ms(Milliseconds);
 				}
@@ -377,6 +375,11 @@
 				GCC_MEMORY_BARRIER();
 			}
 
+	/* Disable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			}
+		#endif
+
 #endif
 
 /** @} */