Add stream callback flags and class specific control request handler code to the...

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

diff --git a/LUFA/Common/Common.h b/LUFA/Common/Common.h
index 7fd1555..594dcf8 100644 (file)
--- a/LUFA/Common/Common.h
+++ b/LUFA/Common/Common.h
@@ -57,13 +57,14 @@
 #define __COMMON_H__
 
        /* Includes: */
 #define __COMMON_H__
 
        /* Includes: */

-               #include <avr/io.h>
+               #include <stdint.h>
+               #include <stdbool.h>

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

-               /* Macros: */           
+               /* Macros: */

                        /** Macro for encasing other multi-statement macros. This should be used along with an opening brace
                         *  before the start of any multi-statement macro, so that the macros contents as a whole are treated
                         *  as a discrete block and not as a list of separate statements which may cause problems when used as
                        /** Macro for encasing other multi-statement macros. This should be used along with an opening brace
                         *  before the start of any multi-statement macro, so that the macros contents as a whole are treated
                         *  as a discrete block and not as a list of separate statements which may cause problems when used as


@@ -171,10 +172,24 @@
                         *
                         *  \param[in] Word  Word of data whose bytes are to be swapped.
                         */
                         *
                         *  \param[in] Word  Word of data whose bytes are to be swapped.
                         */

-                       static inline uint16_t SwapEndian_16(uint16_t Word) ATTR_WARN_UNUSED_RESULT ATTR_CONST;
-                       static inline uint16_t SwapEndian_16(uint16_t Word)
+                       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)

                        {
                        {

-                               return ((Word >> 8) | (Word << 8));                             
+                               uint8_t Temp;
+
+                               union
+                               {
+                                       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;

                        }
 
                        /** Function to reverse the byte ordering of the individual bytes in a 32 bit number.
                        }
 
                        /** Function to reverse the byte ordering of the individual bytes in a 32 bit number.


@@ -183,13 +198,28 @@
                         *
                         *  \param[in] DWord  Double word of data whose bytes are to be swapped.
                         */
                         *
                         *  \param[in] DWord  Double word of data whose bytes are to be swapped.
                         */

-                       static inline uint32_t SwapEndian_32(uint32_t DWord) ATTR_WARN_UNUSED_RESULT ATTR_CONST;
-                       static inline uint32_t SwapEndian_32(uint32_t DWord)
+                       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)

                        {
                        {

-                               return (((DWord & 0xFF000000) >> 24) |
-                                       ((DWord & 0x00FF0000) >> 8)  |
-                                               ((DWord & 0x0000FF00) << 8)  |
-                                               ((DWord & 0x000000FF) << 24));
+                               uint8_t Temp;
+
+                               union
+                               {
+                                       uint32_t DWord;
+                                       uint8_t  Bytes[4];
+                               } Data;
+                               
+                               Data.DWord = DWord;
+                               
+                               Temp = Data.Bytes[0];
+                               Data.Bytes[0] = Data.Bytes[3];
+                               Data.Bytes[3] = Temp;
+                               
+                               Temp = Data.Bytes[1];
+                               Data.Bytes[1] = Data.Bytes[2];
+                               Data.Bytes[2] = Temp;
+                               
+                               return Data.DWord;

                        }
 
                        /** Function to reverse the byte ordering of the individual bytes in a n byte number.
                        }
 
                        /** Function to reverse the byte ordering of the individual bytes in a n byte number.


@@ -199,8 +229,10 @@
                         *  \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.
                         */
                         *  \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.
                         */

-                       static inline void SwapEndian_n(void* Data, uint8_t Bytes);
-                       static inline void SwapEndian_n(void* Data, uint8_t Bytes)
+                       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)

                        {
                                uint8_t* CurrDataPos = (uint8_t*)Data;
                        
                        {
                                uint8_t* CurrDataPos = (uint8_t*)Data;