X-Git-Url: http://git.linex4red.de/pub/lufa.git/blobdiff_plain/a85fa30bf1ee319d3d58f7970a4b1ef7e39d92ba..a36012fc4b057dc1fe96f75a005cd8ba017a6a71:/LUFA/Common/Common.h

diff --git a/LUFA/Common/Common.h b/LUFA/Common/Common.h
index 69c4ff2c3..162d8516c 100644
--- a/LUFA/Common/Common.h
+++ b/LUFA/Common/Common.h
@@ -67,10 +67,20 @@
 		#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.
@@ -109,6 +119,21 @@
 			#define ARCH_BIG_ENDIAN
 
 			#include "Endianness.h"
+		#elif (ARCH == ARCH_XMEGA)
+			#include <avr/io.h>
+			#include <avr/interrupt.h>
+			#include <avr/pgmspace.h>
+			#include <avr/eeprom.h>
+			#include <util/delay.h>
+			
+			typedef uint8_t uint_reg_t;
+			
+			#define ARCH_HAS_EEPROM_ADDRESS_SPACE
+			#define ARCH_HAS_FLASH_ADDRESS_SPACE
+			#define ARCH_HAS_MULTI_ADDRESS_SPACE
+			#define ARCH_LITTLE_ENDIAN
+
+			#include "Endianness.h"		
 		#else
 			#error Unknown device architecture specified.
 		#endif
@@ -156,10 +181,30 @@
 			#if !defined(MIN) || defined(__DOXYGEN__)
 				#define MIN(x, y)               ((x < y) ? x : y)
 			#endif
+			
+			#if !defined(STRINGIFY) || defined(__DOXYGEN__)
+				/** Converts the given input into a string, via the C Preprocessor. This macro puts literal quotation
+				 *  marks around the input, converting the source into a string literal.
+				 *
+				 *  \param[in] x  Input to convert into a string literal.
+				 *
+				 *  \return String version of the input.
+				 */
+				#define STRINGIFY(x)            #x
+
+				/** Converts the given input into a string after macro expansion, via the C Preprocessor. This macro puts
+				 *  literal quotation marks around the expanded input, converting the source into a string literal.
+				 *
+				 *  \param[in] x  Input to expand and convert into a string literal.
+				 *
+				 *  \return String version of the expanded input.
+				 */
+				#define STRINGIFY_EXPANDED(x)   STRINGIFY(x)
+			#endif
 
 			#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.
@@ -219,31 +264,6 @@
 					#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");
-			
-			/** 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
@@ -304,6 +324,16 @@
 					__builtin_mtsr(AVR32_COUNT, 0);
 					while (__builtin_mfsr(AVR32_COUNT) < (F_CPU / 1000));				
 				}
+				#elif (ARCH == ARCH_XMEGA)
+				if (GCC_IS_COMPILE_CONST(Milliseconds))
+				{
+					_delay_ms(Milliseconds);
+				}
+				else
+				{
+					while (Milliseconds--)
+					  _delay_ms(1);
+				}				
 				#endif
 			}
 
@@ -323,7 +353,9 @@
 				#if (ARCH == ARCH_AVR8)
 				return SREG;
 				#elif (ARCH == ARCH_UC3)
-				return __builtin_mfsr(AVR32_SR);				
+				return __builtin_mfsr(AVR32_SR);
+				#elif (ARCH == ARCH_XMEGA)
+				return SREG;
 				#endif
 
 				GCC_MEMORY_BARRIER();
@@ -349,6 +381,8 @@
 				  __builtin_ssrf(AVR32_SR_GM_OFFSET);
 				else
 				  __builtin_csrf(AVR32_SR_GM_OFFSET);
+				#elif (ARCH == ARCH_XMEGA)
+				SREG = GlobalIntState;				
 				#endif
 				
 				GCC_MEMORY_BARRIER();
@@ -367,6 +401,8 @@
 				sei();
 				#elif (ARCH == ARCH_UC3)
 				__builtin_csrf(AVR32_SR_GM_OFFSET);
+				#elif (ARCH == ARCH_XMEGA)
+				sei();
 				#endif
 
 				GCC_MEMORY_BARRIER();
@@ -385,11 +421,18 @@
 				cli();
 				#elif (ARCH == ARCH_UC3)
 				__builtin_ssrf(AVR32_SR_GM_OFFSET);
+				#elif (ARCH == ARCH_XMEGA)
+				cli();
 				#endif
 
 				GCC_MEMORY_BARRIER();
 			}
 
+	/* Disable C linkage for C++ Compilers: */
+		#if defined(__cplusplus)
+			}
+		#endif
+
 #endif
 
 /** @} */