Convert over internal pseudo-function macros to true inline functions for added type...

[pub/USBasp.git] / LUFA / Drivers / USB / LowLevel / USBInterrupt.h

diff --git a/LUFA/Drivers/USB/LowLevel/USBInterrupt.h b/LUFA/Drivers/USB/LowLevel/USBInterrupt.h
index f954468..6e62bec 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/USBInterrupt.h
+++ b/LUFA/Drivers/USB/LowLevel/USBInterrupt.h
@@ -47,11 +47,6 @@
                #include <util/atomic.h>
                #include <stdbool.h>
                
                #include <util/atomic.h>
                #include <stdbool.h>
                

-               #include "../../../Common/Common.h"
-               #include "../HighLevel/USBMode.h"
-               #include "../HighLevel/Events.h"
-               #include "USBController.h"
-               

        /* Enable C linkage for C++ Compilers: */
                #if defined(__cplusplus)
                        extern "C" {
        /* Enable C linkage for C++ Compilers: */
                #if defined(__cplusplus)
                        extern "C" {


@@ -90,6 +85,12 @@
                        #define USB_INT_RSTI                             UHIEN , (1 << RSTE)   , UHINT , (1 << RSTI)
                        #define USB_INT_SRPI                             OTGIEN, (1 << SRPE)   , OTGINT, (1 << SRPI)
                        #define USB_INT_RXSTPI                           UEIENX, (1 << RXSTPE) , UEINTX, (1 << RXSTPI)
                        #define USB_INT_RSTI                             UHIEN , (1 << RSTE)   , UHINT , (1 << RSTI)
                        #define USB_INT_SRPI                             OTGIEN, (1 << SRPE)   , OTGINT, (1 << SRPI)
                        #define USB_INT_RXSTPI                           UEIENX, (1 << RXSTPE) , UEINTX, (1 << RXSTPI)

+
+               /* Includes: */
+                       #include "../../../Common/Common.h"
+                       #include "../HighLevel/USBMode.h"
+                       #include "../HighLevel/Events.h"
+                       #include "USBController.h"

        
                /* Function Prototypes: */
                        void USB_INT_ClearAllInterrupts(void);
        
                /* Function Prototypes: */
                        void USB_INT_ClearAllInterrupts(void);