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 6f64dbd..a59a213 100644 (file)
--- a/LUFA/Common/Common.h
+++ b/LUFA/Common/Common.h
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
@@ -29,9 +29,10 @@
 */\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
- *  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
@@ -58,7 +59,7 @@
        /* Includes: */\r
                #include <avr/io.h>\r
        \r
-               #include "FunctionAttributes.h"\r
+               #include "Attributes.h"\r
                #include "BoardTypes.h"\r
 \r
        /* Public Interface - May be used in end-application: */\r
@@ -163,18 +164,18 @@
                         *  \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
-                               uint8_t Temp;\r
-                               \r
+                               uint8_t* CurrDataPos = Data;\r
+                       \r
                                while (Bytes)\r
                                {\r
-                                       Temp = *Data;\r
-                                       *Data = *(Data + Bytes - 1);\r
-                                       *(Data + Bytes) = Temp;\r
+                                       uint8_t Temp = *CurrDataPos;\r
+                                       *CurrDataPos = *(CurrDataPos + Bytes - 1);\r
+                                       *(CurrDataPos + Bytes - 1) = Temp;\r
 \r
-                                       Data++;\r
+                                       CurrDataPos++;\r
                                        Bytes -= 2;\r
                                }\r
                        }\r