Move global interrupt enable/disable functions out to Common.h and document them.

[pub/USBasp.git] / LUFA / Drivers / USB / Core / UC3 / USBInterrupt_UC3.h

diff --git a/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.h b/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.h
index a9ad566..2cebf41 100644 (file)
--- a/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.h
+++ b/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.h
@@ -55,10 +55,7 @@
                #endif\r
 \r
        /* Private Interface - For use in library only: */\r
-       #if !defined(__DOXYGEN__)\r
-               /* Macros: */\r
-                       #define LUFA_ISR(Name)                void Name (void) __attribute__((__interrupt__)); void Name (void)\r
-                       \r
+       #if !defined(__DOXYGEN__)               \r
                /* Enums: */\r
                        enum USB_Interrupts_t\r
                        {\r
@@ -83,38 +80,6 @@
                        };\r
                \r
                /* Inline Functions: */\r
-                       static inline uint_reg_t USB_INT_GetGlobalEnableState(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;\r
-                       static inline uint_reg_t USB_INT_GetGlobalEnableState(void)\r
-                       {\r
-                               GCC_MEMORY_BARRIER();\r
-                               return __builtin_mfsr(AVR32_SR);\r
-                       }\r
-\r
-                       static inline void USB_INT_SetGlobalEnableState(uint_reg_t GlobalIntState) ATTR_ALWAYS_INLINE;\r
-                       static inline void USB_INT_SetGlobalEnableState(uint_reg_t GlobalIntState)\r
-                       {\r
-                               GCC_MEMORY_BARRIER();\r
-                               if (GlobalIntState & AVR32_SR_GM)\r
-                                 __builtin_ssrf(AVR32_SR_GM_OFFSET);\r
-                               GCC_MEMORY_BARRIER();\r
-                       }\r
-               \r
-                       static inline void USB_INT_GlobalEnable(void) ATTR_ALWAYS_INLINE;\r
-                       static inline void USB_INT_GlobalEnable(void)\r
-                       {\r
-                               GCC_MEMORY_BARRIER();\r
-                               __builtin_csrf(AVR32_SR_GM_OFFSET);\r
-                               GCC_MEMORY_BARRIER();\r
-                       }               \r
-\r
-                       static inline void USB_INT_GlobalDisable(void) ATTR_ALWAYS_INLINE;\r
-                       static inline void USB_INT_GlobalDisable(void)\r
-                       {\r
-                               GCC_MEMORY_BARRIER();\r
-                               __builtin_ssrf(AVR32_SR_GM_OFFSET);\r
-                               GCC_MEMORY_BARRIER();\r
-                       }\r
-\r
                        static inline void USB_INT_Enable(const uint8_t Interrupt) ATTR_ALWAYS_INLINE;\r
                        static inline void USB_INT_Enable(const uint8_t Interrupt)\r
                        {                       \r
@@ -376,7 +341,7 @@
                                 */\r
                                void USB_GEN_vect(void);\r
                        #else\r
-                               LUFA_ISR(USB_GEN_vect);\r
+                               ISR(USB_GEN_vect);\r
                        #endif\r
                        \r
        /* Disable C linkage for C++ Compilers: */\r