projects / pub / USBasp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add build tests to verify correct compilation of as many modules as possible under...
[pub/USBasp.git] / LUFA / Common / Common.h
diff --git a/LUFA/Common/Common.h b/LUFA/Common/Common.h
index 4efa27e..4c9aa49 100644 (file)
--- a/LUFA/Common/Common.h
+++ b/LUFA/Common/Common.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2012.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
@@ -43,55 +43,96 @@
  *  @{
  */
 
  *  @{
  */
 
-/** \defgroup Group_Debugging Debugging Macros
- *  \brief Convenience macros to aid in debugging applications.
+/** \defgroup Group_GlobalInt Global Interrupt Macros
+ *  \brief Convenience macros for the management of interrupts globally within the device.
  *
  *
- *  Macros to aid debugging of a user application.
- */
-
-/** \defgroup Group_BitManip Endian and Bit Macros
- *  \brief Convenience macros to aid in bit manipulations and endianness transforms.
- *
- *  Functions for swapping endianness and reversing bit orders of data.
+ *  Macros and functions to create and control global interrupts within the device.
  */
 
 #ifndef __LUFA_COMMON_H__
 #define __LUFA_COMMON_H__
 
        /* Macros: */
  */
 
 #ifndef __LUFA_COMMON_H__
 #define __LUFA_COMMON_H__
 
        /* Macros: */
-               #if !defined(__DOXYGEN__)
-                       #define __INCLUDE_FROM_COMMON_H
-               #endif
-               
+               #define __INCLUDE_FROM_COMMON_H
+
        /* Includes: */
                #include <stdint.h>
                #include <stdbool.h>
                #include <string.h>
                #include <stddef.h>
        /* Includes: */
                #include <stdint.h>
                #include <stdbool.h>
                #include <string.h>
                #include <stddef.h>
-               
+
+               #if defined(USE_LUFA_CONFIG_HEADER)
+                       #include "LUFAConfig.h"
+               #endif
+
                #include "Architectures.h"
                #include "Architectures.h"
-               #include "Attributes.h"
                #include "BoardTypes.h"
                #include "BoardTypes.h"
-               
+               #include "ArchitectureSpecific.h"
+               #include "CompilerSpecific.h"
+               #include "Attributes.h"
+
+       /* Enable C linkage for C++ Compilers: */
+               #if defined(__cplusplus)
+                       extern "C" {
+               #endif
+
        /* Architecture specific utility includes: */
        /* Architecture specific utility includes: */
-               #if (ARCH == ARCH_AVR8)
+               #if defined(__DOXYGEN__)
+                       /** 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>
                        #include <avr/interrupt.h>
                        #include <avr/pgmspace.h>
                        #include <avr/eeprom.h>
                        #include <avr/boot.h>
                        #include <avr/io.h>
                        #include <avr/interrupt.h>
                        #include <avr/pgmspace.h>
                        #include <avr/eeprom.h>
                        #include <avr/boot.h>
-                       #include <util/atomic.h>
+                       #include <math.h>
                        #include <util/delay.h>
                        #include <util/delay.h>
-                       
-                       typedef uint8_t uintN_t;
-                       typedef int8_t  intN_t;
-               #elif (ARCH == ARCH_UC3B)
+
+                       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"
+               #elif (ARCH == ARCH_UC3)
                        #include <avr32/io.h>
 
                        #include <avr32/io.h>
 
-                       typedef uint32_t uintN_t;
-                       typedef int32_t  intN_t;
-                       
-                       #warning The UC3B architecture support is currently experimental and incomplete!
+                       // === TODO: Find abstracted way to handle these ===
+                       #define PROGMEM                  const
+                       #define pgm_read_byte(x)         *x
+                       #define memcmp_P(...)            memcmp(__VA_ARGS__)
+                       #define memcpy_P(...)            memcpy(__VA_ARGS__)
+                       // =================================================
+
+                       typedef uint32_t uint_reg_t;
+
+                       #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 <math.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
 
        /* Public Interface - May be used in end-application: */
                #endif
 
        /* Public Interface - May be used in end-application: */
@@ -121,7 +162,7 @@
                         *  \return The larger of the two input parameters
                         */
                        #if !defined(MAX) || defined(__DOXYGEN__)
                         *  \return The larger of the two input parameters
                         */
                        #if !defined(MAX) || defined(__DOXYGEN__)
-                               #define MAX(x, y)               ((x > y) ? x : y)
+                               #define MAX(x, y)               (((x) > (y)) ? (x) : (y))
                        #endif
 
                        /** Convenience macro to determine the smaller of two values.
                        #endif
 
                        /** Convenience macro to determine the smaller of two values.
@@ -135,102 +176,54 @@
                         *  \return The smaller of the two input parameters
                         */
                        #if !defined(MIN) || defined(__DOXYGEN__)
                         *  \return The smaller of the two input parameters
                         */
                        #if !defined(MIN) || defined(__DOXYGEN__)
-                               #define MIN(x, y)               ((x < y) ? x : y)
+                               #define MIN(x, y)               (((x) < (y)) ? (x) : (y))
                        #endif
 
                        #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
-                                *  removes/reorders code to the point where break points cannot reliably be set.
+                       #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.
                                 *
                                 *
-                                *  \ingroup Group_Debugging
-                                */
-                               #define JTAG_DEBUG_POINT()      __asm__ __volatile__ ("NOP" ::)
-
-                               /** Defines an explicit JTAG break point in the resulting binary via the assembly \c BREAK statement. When
-                                *  a JTAG is used, this causes the program execution to halt when reached until manually resumed.
+                                *  \param[in] x  Input to convert into a string literal.
                                 *
                                 *
-                                *  \ingroup Group_Debugging
+                                *  \return String version of the input.
                                 */
                                 */
-                               #define JTAG_DEBUG_BREAK()      __asm__ __volatile__ ("BREAK" ::)
-
-                               #if !defined(pgm_read_ptr) || defined(__DOXYGEN__)
-                                       /** Reads a pointer out of PROGMEM space on the AVR8 architecture. This is currently a wrapper for the
-                                        *  avr-libc \c pgm_read_ptr() macro with a \c void* cast, so that its value can be assigned directly
-                                        *  to a pointer variable or used in pointer arithmetic without further casting in C. In a future
-                                        *  avr-libc distribution this will be part of the standard API and will be implemented in a more formal
-                                        *  manner.
-                                        *
-                                        *  \param[in] Addr  Address of the pointer to read.
-                                        *
-                                        *  \return Pointer retrieved from PROGMEM space.
-                                        */
-                                       #define pgm_read_ptr(Addr)    (void*)pgm_read_word(Addr)
-                               #endif
+                               #define STRINGIFY(x)            #x
 
 
-                               /** Macro for testing condition "x" and breaking via \ref JTAG_DEBUG_BREAK() if the condition is false.
+                               /** 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] Condition  Condition that will be evaluated,
+                                *  \param[in] x  Input to expand and convert into a string literal.
                                 *
                                 *
-                                *  \ingroup Group_Debugging
-                               */
-                               #define JTAG_DEBUG_ASSERT(Condition)    MACROS{ if (!(Condition)) { JTAG_DEBUG_BREAK(); } }MACROE
+                                *  \return String version of the expanded input.
+                                */
+                               #define STRINGIFY_EXPANDED(x)   STRINGIFY(x)
+                       #endif
 
 
-                               /** Macro for testing condition "x" and writing debug data to the stdout stream if \c false. The stdout stream
-                                *  must be pre-initialized before this macro is run and linked to an output device, such as the microcontroller's
-                                *  USART peripheral.
+                       #if !defined(ISR) || defined(__DOXYGEN__)
+                               /** Macro for the definition of interrupt service routines, so that the compiler can insert the required
+                                *  prologue and epilogue code to properly manage the interrupt routine without affecting the main thread's
+                                *  state with unintentional side-effects.
                                 *
                                 *
-                                *  The output takes the form "{FILENAME}: Function {FUNCTION NAME}, Line {LINE NUMBER}: Assertion {Condition} failed."
+                                *  Interrupt handlers written using this macro may still need to be registered with the microcontroller's
+                                *  Interrupt Controller (if present) before they will properly handle incoming interrupt events.
                                 *
                                 *
-                                *  \param[in] Condition  Condition that will be evaluated,
+                                *  \note This macro is only supplied on some architectures, where the standard library does not include a valid
+                                *        definition. If an existing definition exists, the alternative definition here will be ignored.
                                 *
                                 *
-                                *  \ingroup Group_Debugging
+                                *  \ingroup Group_GlobalInt
+                                *
+                                *  \param Name  Unique name of the interrupt service routine.
                                 */
                                 */
-                               #define STDOUT_ASSERT(Condition)        MACROS{ if (!(x)) { printf_P(PSTR("%s: Function \"%s\", Line %d: "   \
-                                                                               "Assertion \"%s\" failed.\r\n"),     \
-                                                                               __FILE__, __func__, __LINE__, #Condition); } }MACROE
+                               #define ISR(Name, ...)          void Name (void) __attribute__((__interrupt__)) __VA_ARGS__; void Name (void)
                        #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))
-
-                       /** Swaps the byte ordering of a 16-bit value at compile time. Do not use this macro for swapping byte orderings
-                        *  of dynamic values computed at runtime, use \ref SwapEndian_16() instead. The result of this macro can be used
-                        *  inside struct or other variable initializers outside of a function, something that is not possible with the
-                        *  inline function variant.
-                        *
-                        *  \param[in]  x  16-bit value whose byte ordering is to be swapped.
-                        *
-                        *  \return Input value with the byte ordering reversed.
-                        */
-                       #define SWAPENDIAN_16(x)          ((((x) & 0xFF00) >> 8) | (((x) & 0x00FF) << 8))
-
-                       /** Swaps the byte ordering of a 32-bit value at compile time. Do not use this macro for swapping byte orderings
-                        *  of dynamic values computed at runtime- use \ref SwapEndian_32() instead. The result of this macro can be used
-                        *  inside struct or other variable initializers outside of a function, something that is not possible with the
-                        *  inline function variant.
-                        *
-                        *  \param[in]  x  32-bit value whose byte ordering is to be swapped.
-                        *
-                        *  \return Input value with the byte ordering reversed.
-                        */
-                       #define SWAPENDIAN_32(x)          ((((x) & 0xFF000000UL) >> 24UL) | (((x) & 0x00FF0000UL) >> 8UL) | \
-                                                          (((x) & 0x0000FF00UL) << 8UL)  | (((x) & 0x000000FFUL) << 24UL))
 
                /* Inline Functions: */
                        /** Function to reverse the individual bits in a byte - i.e. bit 7 is moved to bit 0, bit 6 to bit 1,
                         *  etc.
                         *
 
                /* Inline Functions: */
                        /** Function to reverse the individual bits in a byte - i.e. bit 7 is moved to bit 0, bit 6 to bit 1,
                         *  etc.
                         *
-                        *  \ingroup Group_BitManip
-                        *
                         *  \param[in] Byte  Byte of data whose bits are to be reversed.
                         *  \param[in] Byte  Byte of data whose bits are to be reversed.
+                        *
+                        *  \return Input data with the individual bits reversed (mirrored).
                         */
                        static inline uint8_t BitReverse(uint8_t Byte) ATTR_WARN_UNUSED_RESULT ATTR_CONST;
                        static inline uint8_t BitReverse(uint8_t Byte)
                         */
                        static inline uint8_t BitReverse(uint8_t Byte) ATTR_WARN_UNUSED_RESULT ATTR_CONST;
                        static inline uint8_t BitReverse(uint8_t Byte)
@@ -242,86 +235,139 @@
                                return Byte;
                        }
 
                                return Byte;
                        }
 
-                       /** Function to reverse the byte ordering of the individual bytes in a 16 bit number.
-                        *
-                        *  \ingroup Group_BitManip
+                       /** Function to perform a blocking delay for a specified number of milliseconds. The actual delay will be
+                        *  at a minimum the specified number of milliseconds, however due to loop overhead and internal calculations
+                        *  may be slightly higher.
                         *
                         *
-                        *  \param[in] Word  Word of data whose bytes are to be swapped.
+                        *  \param[in] Milliseconds  Number of milliseconds to delay
                         */
                         */
-                       static inline uint16_t SwapEndian_16(const uint16_t Word) ATTR_WARN_UNUSED_RESULT ATTR_CONST;
-                       static inline uint16_t SwapEndian_16(const uint16_t Word)
+                       static inline void Delay_MS(uint16_t Milliseconds) ATTR_ALWAYS_INLINE;
+                       static inline void Delay_MS(uint16_t Milliseconds)
                        {
                        {
-                               uint8_t Temp;
-
-                               union
+                               #if (ARCH == ARCH_AVR8)
+                               if (GCC_IS_COMPILE_CONST(Milliseconds))
                                {
                                {
-                                       uint16_t Word;
-                                       uint8_t  Bytes[2];
-                               } Data;
-
-                               Data.Word = Word;
-
-                               Temp = Data.Bytes[0];
-                               Data.Bytes[0] = Data.Bytes[1];
-                               Data.Bytes[1] = Temp;
-
-                               return Data.Word;
+                                       _delay_ms(Milliseconds);
+                               }
+                               else
+                               {
+                                       while (Milliseconds--)
+                                         _delay_ms(1);
+                               }
+                               #elif (ARCH == ARCH_UC3)
+                               while (Milliseconds--)
+                               {
+                                       __builtin_mtsr(AVR32_COUNT, 0);
+                                       while ((uint32_t)__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
                        }
 
                        }
 
-                       /** Function to reverse the byte ordering of the individual bytes in a 32 bit number.
+                       /** Retrieves a mask which contains the current state of the global interrupts for the device. This
+                        *  value can be stored before altering the global interrupt enable state, before restoring the
+                        *  flag(s) back to their previous values after a critical section using \ref SetGlobalInterruptMask().
                         *
                         *
-                        *  \ingroup Group_BitManip
+                        *  \ingroup Group_GlobalInt
                         *
                         *
-                        *  \param[in] DWord  Double word of data whose bytes are to be swapped.
+                        *  \return  Mask containing the current Global Interrupt Enable Mask bit(s).
                         */
                         */
-                       static inline uint32_t SwapEndian_32(const uint32_t DWord) ATTR_WARN_UNUSED_RESULT ATTR_CONST;
-                       static inline uint32_t SwapEndian_32(const uint32_t DWord)
+                       static inline uint_reg_t GetGlobalInterruptMask(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
+                       static inline uint_reg_t GetGlobalInterruptMask(void)
                        {
                        {
-                               uint8_t Temp;
+                               GCC_MEMORY_BARRIER();
+
+                               #if (ARCH == ARCH_AVR8)
+                               return SREG;
+                               #elif (ARCH == ARCH_UC3)
+                               return __builtin_mfsr(AVR32_SR);
+                               #elif (ARCH == ARCH_XMEGA)
+                               return SREG;
+                               #endif
 
 
-                               union
-                               {
-                                       uint32_t DWord;
-                                       uint8_t  Bytes[4];
-                               } Data;
+                               GCC_MEMORY_BARRIER();
+                       }
 
 
-                               Data.DWord = DWord;
+                       /** Sets the global interrupt enable state of the microcontroller to the mask passed into the function.
+                        *  This can be combined with \ref GetGlobalInterruptMask() to save and restore the Global Interrupt Enable
+                        *  Mask bit(s) of the device after a critical section has completed.
+                        *
+                        *  \ingroup Group_GlobalInt
+                        *
+                        *  \param[in] GlobalIntState  Global Interrupt Enable Mask value to use
+                        */
+                       static inline void SetGlobalInterruptMask(const uint_reg_t GlobalIntState) ATTR_ALWAYS_INLINE;
+                       static inline void SetGlobalInterruptMask(const uint_reg_t GlobalIntState)
+                       {
+                               GCC_MEMORY_BARRIER();
+
+                               #if (ARCH == ARCH_AVR8)
+                               SREG = GlobalIntState;
+                               #elif (ARCH == ARCH_UC3)
+                               if (GlobalIntState & AVR32_SR_GM)
+                                 __builtin_ssrf(AVR32_SR_GM_OFFSET);
+                               else
+                                 __builtin_csrf(AVR32_SR_GM_OFFSET);
+                               #elif (ARCH == ARCH_XMEGA)
+                               SREG = GlobalIntState;
+                               #endif
 
 
-                               Temp = Data.Bytes[0];
-                               Data.Bytes[0] = Data.Bytes[3];
-                               Data.Bytes[3] = Temp;
+                               GCC_MEMORY_BARRIER();
+                       }
 
 
-                               Temp = Data.Bytes[1];
-                               Data.Bytes[1] = Data.Bytes[2];
-                               Data.Bytes[2] = Temp;
+                       /** Enables global interrupt handling for the device, allowing interrupts to be handled.
+                        *
+                        *  \ingroup Group_GlobalInt
+                        */
+                       static inline void GlobalInterruptEnable(void) ATTR_ALWAYS_INLINE;
+                       static inline void GlobalInterruptEnable(void)
+                       {
+                               GCC_MEMORY_BARRIER();
+
+                               #if (ARCH == ARCH_AVR8)
+                               sei();
+                               #elif (ARCH == ARCH_UC3)
+                               __builtin_csrf(AVR32_SR_GM_OFFSET);
+                               #elif (ARCH == ARCH_XMEGA)
+                               sei();
+                               #endif
 
 
-                               return Data.DWord;
+                               GCC_MEMORY_BARRIER();
                        }
 
                        }
 
-                       /** Function to reverse the byte ordering of the individual bytes in a n byte number.
-                        *
-                        *  \ingroup Group_BitManip
+                       /** Disabled global interrupt handling for the device, preventing interrupts from being handled.
                         *
                         *
-                        *  \param[in,out] Data   Pointer to a number containing an even number of bytes to be reversed.
-                        *  \param[in]     Bytes  Length of the data in bytes.
+                        *  \ingroup Group_GlobalInt
                         */
                         */
-                       static inline void SwapEndian_n(void* Data,
-                                                       uint8_t Bytes) ATTR_NON_NULL_PTR_ARG(1);
-                       static inline void SwapEndian_n(void* Data,
-                                                       uint8_t Bytes)
+                       static inline void GlobalInterruptDisable(void) ATTR_ALWAYS_INLINE;
+                       static inline void GlobalInterruptDisable(void)
                        {
                        {
-                               uint8_t* CurrDataPos = (uint8_t*)Data;
+                               GCC_MEMORY_BARRIER();
+
+                               #if (ARCH == ARCH_AVR8)
+                               cli();
+                               #elif (ARCH == ARCH_UC3)
+                               __builtin_ssrf(AVR32_SR_GM_OFFSET);
+                               #elif (ARCH == ARCH_XMEGA)
+                               cli();
+                               #endif
 
 
-                               while (Bytes > 1)
-                               {
-                                       uint8_t Temp = *CurrDataPos;
-                                       *CurrDataPos = *(CurrDataPos + Bytes - 1);
-                                       *(CurrDataPos + Bytes - 1) = Temp;
+                               GCC_MEMORY_BARRIER();
+                       }
 
 
-                                       CurrDataPos++;
-                                       Bytes -= 2;
-                               }
+       /* Disable C linkage for C++ Compilers: */
+               #if defined(__cplusplus)
                        }
                        }
+               #endif
 
 #endif
 
 
 #endif
 
USB isp AVR programmer