Fixed PDI programming mode in the AVRISP programmer project not exiting programming...

[pub/USBasp.git] / LUFA / Drivers / USB / HighLevel / Events.h

diff --git a/LUFA/Drivers/USB/HighLevel/Events.h b/LUFA/Drivers/USB/HighLevel/Events.h
index 08727d7..ff20752 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/Events.h
+++ b/LUFA/Drivers/USB/HighLevel/Events.h
@@ -60,9 +60,14 @@
                        extern "C" {\r
                #endif\r
 \r
                        extern "C" {\r
                #endif\r
 \r

+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_USB_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.\r
+               #endif\r
+               \r

        /* Public Interface - May be used in end-application: */                        \r
                /* Pseudo-Functions for Doxygen: */\r
        /* Public Interface - May be used in end-application: */                        \r
                /* Pseudo-Functions for Doxygen: */\r

-               #if !defined(INCLUDE_FROM_EVENTS_C) || defined(__DOXYGEN__)\r
+               #if !defined(__INCLUDE_FROM_EVENTS_C) || defined(__DOXYGEN__)\r

                        /** Event for USB stack initialization failure. This event fires when the USB interface fails to\r
                         *  initialize correctly due to a hardware or software fault.\r
                         *\r
                        /** Event for USB stack initialization failure. This event fires when the USB interface fails to\r
                         *  initialize correctly due to a hardware or software fault.\r
                         *\r


@@ -287,7 +292,7 @@
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r
                /* Function Prototypes: */\r
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r
                /* Function Prototypes: */\r

-                       #if defined(INCLUDE_FROM_EVENTS_C)\r
+                       #if defined(__INCLUDE_FROM_EVENTS_C)\r

                                void USB_Event_Stub(void) ATTR_CONST;\r
                                        \r
                                #if defined(USB_CAN_BE_BOTH)\r
                                void USB_Event_Stub(void) ATTR_CONST;\r
                                        \r
                                #if defined(USB_CAN_BE_BOTH)\r