Change AVRISP project's timeout to be interrupt based again, but make the interrupt...

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

diff --git a/LUFA/Common/Common.h b/LUFA/Common/Common.h
index 4052480..a59a213 100644 (file)
--- a/LUFA/Common/Common.h
+++ b/LUFA/Common/Common.h
@@ -29,9 +29,10 @@
 */\r
 \r
 /** \file\r
 */\r
 \r
 /** \file\r

+ *  \brief Common library convenience macros and functions.\r

  *\r
  *  This file contains macros which are common to all library elements, and which may be useful in user code. It\r
  *\r
  *  This file contains macros which are common to all library elements, and which may be useful in user code. It\r

- *  also includes other common headers, such as Atomic.h, FunctionAttributes.h and BoardTypes.h.\r
+ *  also includes other common headers, such as Atomic.h, Attributes.h and BoardTypes.h.\r

  */\r
  \r
 /** @defgroup Group_Common Common Utility Headers - LUFA/Drivers/Common/Common.h\r
  */\r
  \r
 /** @defgroup Group_Common Common Utility Headers - LUFA/Drivers/Common/Common.h\r


@@ -56,18 +57,9 @@
 #define __COMMON_H__\r
 \r
        /* Includes: */\r
 #define __COMMON_H__\r
 \r
        /* Includes: */\r

-               #if defined(__AVR32__)\r
-                       #include <avr32/io.h>\r
-                       #include <stdint.h>\r
-\r
-                       #include "Atomic.h"\r
-\r
-                       #define PROGMEM\r
-               #else\r
-                       #include <avr/io.h>\r
-               #endif\r
-\r
-               #include "FunctionAttributes.h"\r
+               #include <avr/io.h>\r
+       \r
+               #include "Attributes.h"\r

                #include "BoardTypes.h"\r
 \r
        /* Public Interface - May be used in end-application: */\r
                #include "BoardTypes.h"\r
 \r
        /* Public Interface - May be used in end-application: */\r


@@ -172,30 +164,22 @@
                         *  \param[in,out] Data  Pointer to a number containing an even number of bytes to be reversed\r
                         *  \param[in] Bytes  Length of the data in bytes\r
                         */\r
                         *  \param[in,out] Data  Pointer to a number containing an even number of bytes to be reversed\r
                         *  \param[in] Bytes  Length of the data in bytes\r
                         */\r

-                       static inline void SwapEndian_n(uint8_t* Data, uint8_t Bytes);\r
-                       static inline void SwapEndian_n(uint8_t* Data, uint8_t Bytes)\r
+                       static inline void SwapEndian_n(void* Data, uint8_t Bytes);\r
+                       static inline void SwapEndian_n(void* Data, uint8_t Bytes)\r

                        {\r
                        {\r

-                               uint8_t Temp;\r
-                               \r
+                               uint8_t* CurrDataPos = Data;\r
+                       \r

                                while (Bytes)\r
                                {\r
                                while (Bytes)\r
                                {\r

-                                       Temp = *Data;\r
-                                       *Data = *(Data + Bytes - 1);\r
-                                       *(Data + Bytes - 1) = Temp;\r
+                                       uint8_t Temp = *CurrDataPos;\r
+                                       *CurrDataPos = *(CurrDataPos + Bytes - 1);\r
+                                       *(CurrDataPos + Bytes - 1) = Temp;\r

 \r
 \r

-                                       Data++;\r
+                                       CurrDataPos++;\r

                                        Bytes -= 2;\r
                                }\r
                        }\r
 \r
                                        Bytes -= 2;\r
                                }\r
                        }\r
 \r

-               /* Type Defines: */\r
-                       #if defined(__AVR32__)\r
-                               typedef uint32_t uintN_t;\r
-                               typedef int32_t intN_t;\r
-                       #else\r
-                               typedef uint8_t uintN_t;\r
-                               typedef int8_t intN_t;\r
-                       #endif\r

 #endif\r
 \r
 /** @} */\r
 #endif\r
 \r
 /** @} */\r