Add more include protection macros to give the user warnings when they try to manuall...

diff --git a/LUFA/Doxygen.conf b/LUFA/Doxygen.conf
index 5a15bd7..387cd34 100644 (file)
--- a/LUFA/Doxygen.conf
+++ b/LUFA/Doxygen.conf
@@ -636,8 +636,7 @@ EXCLUDE_PATTERNS       =
 # wildcard * is used, a substring. Examples: ANamespace, AClass,\r
 # AClass::ANamespace, ANamespace::*Test\r
 \r
-EXCLUDE_SYMBOLS        = __* \\r
-                         INCLUDE_FROM_*\r
+EXCLUDE_SYMBOLS        = __*\r
 \r
 # The EXAMPLE_PATH tag can be used to specify one or more files or\r
 # directories that contain example code fragments that are included (see\r

diff --git a/LUFA/DriverStubs/Buttons.h b/LUFA/DriverStubs/Buttons.h
index bd45f40..deab56e 100644 (file)
--- a/LUFA/DriverStubs/Buttons.h
+++ b/LUFA/DriverStubs/Buttons.h
@@ -54,7 +54,7 @@
                #endif\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_BUTTONS_H)\r
+               #if !defined(__INCLUDE_FROM_BUTTONS_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.\r
                #endif\r
                \r

diff --git a/LUFA/DriverStubs/Dataflash.h b/LUFA/DriverStubs/Dataflash.h
index 0f7a6c3..10eafa2 100644 (file)
--- a/LUFA/DriverStubs/Dataflash.h
+++ b/LUFA/DriverStubs/Dataflash.h
@@ -46,7 +46,7 @@
                // TODO: Add any required includes here\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_DATAFLASH_H)\r
+               #if !defined(__INCLUDE_FROM_DATAFLASH_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/Dataflash.h instead.\r
                #endif\r
                \r

diff --git a/LUFA/DriverStubs/Joystick.h b/LUFA/DriverStubs/Joystick.h
index 7911308..21e306f 100644 (file)
--- a/LUFA/DriverStubs/Joystick.h
+++ b/LUFA/DriverStubs/Joystick.h
@@ -54,7 +54,7 @@
                #endif\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_JOYSTICK_H)\r
+               #if !defined(__INCLUDE_FROM_JOYSTICK_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/Joystick.h instead.\r
                #endif\r
        \r

diff --git a/LUFA/DriverStubs/LEDs.h b/LUFA/DriverStubs/LEDs.h
index dcce4bc..6bdc847 100644 (file)
--- a/LUFA/DriverStubs/LEDs.h
+++ b/LUFA/DriverStubs/LEDs.h
@@ -53,7 +53,7 @@
                #endif\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_LEDS_H)\r
+               #if !defined(__INCLUDE_FROM_LEDS_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.\r
                #endif\r
 \r

diff --git a/LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h b/LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h
index 008cca1..af95a89 100644 (file)
--- a/LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h
+++ b/LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h
@@ -62,7 +62,7 @@
                #endif\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_BUTTONS_H)\r
+               #if !defined(__INCLUDE_FROM_BUTTONS_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.\r
                #endif\r
                \r

diff --git a/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h b/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h
index 2b8075b..2208f2e 100644 (file)
--- a/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h
+++ b/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h
@@ -61,7 +61,7 @@
                #endif\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_LEDS_H)\r
+               #if !defined(__INCLUDE_FROM_LEDS_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.\r
                #endif\r
 \r

diff --git a/LUFA/Drivers/Board/BUMBLEB/Buttons.h b/LUFA/Drivers/Board/BUMBLEB/Buttons.h
index 2407053..e0a5cc5 100644 (file)
--- a/LUFA/Drivers/Board/BUMBLEB/Buttons.h
+++ b/LUFA/Drivers/Board/BUMBLEB/Buttons.h
@@ -64,7 +64,7 @@
                #endif\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_BUTTONS_H)\r
+               #if !defined(__INCLUDE_FROM_BUTTONS_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.\r
                #endif\r
                \r

diff --git a/LUFA/Drivers/Board/BUMBLEB/Joystick.h b/LUFA/Drivers/Board/BUMBLEB/Joystick.h
index 4ab98ae..5d57ec5 100644 (file)
--- a/LUFA/Drivers/Board/BUMBLEB/Joystick.h
+++ b/LUFA/Drivers/Board/BUMBLEB/Joystick.h
@@ -63,7 +63,7 @@
                #endif\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_JOYSTICK_H)\r
+               #if !defined(__INCLUDE_FROM_JOYSTICK_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/Joystick.h instead.\r
                #endif\r
 \r

diff --git a/LUFA/Drivers/Board/BUMBLEB/LEDs.h b/LUFA/Drivers/Board/BUMBLEB/LEDs.h
index 344a26e..549bbde 100644 (file)
--- a/LUFA/Drivers/Board/BUMBLEB/LEDs.h
+++ b/LUFA/Drivers/Board/BUMBLEB/LEDs.h
@@ -63,7 +63,7 @@
                #endif\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_LEDS_H)\r
+               #if !defined(__INCLUDE_FROM_LEDS_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.\r
                #endif\r
 \r

diff --git a/LUFA/Drivers/Board/Buttons.h b/LUFA/Drivers/Board/Buttons.h
index 4e7588c..d908fd4 100644 (file)
--- a/LUFA/Drivers/Board/Buttons.h
+++ b/LUFA/Drivers/Board/Buttons.h
@@ -63,6 +63,7 @@
 \r
        /* Macros: */\r
        #if !defined(__DOXYGEN__)\r
+               #define __INCLUDE_FROM_BUTTONS_H\r
                #define INCLUDE_FROM_BUTTONS_H\r
        #endif\r
 \r

diff --git a/LUFA/Drivers/Board/Dataflash.h b/LUFA/Drivers/Board/Dataflash.h
index 0197b3e..762142c 100644 (file)
--- a/LUFA/Drivers/Board/Dataflash.h
+++ b/LUFA/Drivers/Board/Dataflash.h
@@ -62,6 +62,7 @@
 \r
        /* Macros: */\r
        #if !defined(__DOXYGEN__)\r
+               #define __INCLUDE_FROM_DATAFLASH_H\r
                #define INCLUDE_FROM_DATAFLASH_H\r
        #endif\r
 \r

diff --git a/LUFA/Drivers/Board/EVK527/Buttons.h b/LUFA/Drivers/Board/EVK527/Buttons.h
index cb8cdc5..0150fa1 100644 (file)
--- a/LUFA/Drivers/Board/EVK527/Buttons.h
+++ b/LUFA/Drivers/Board/EVK527/Buttons.h
@@ -68,7 +68,7 @@
                #endif\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_BUTTONS_H)\r
+               #if !defined(__INCLUDE_FROM_BUTTONS_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.\r
                #endif\r
                \r

diff --git a/LUFA/Drivers/Board/EVK527/Dataflash.h b/LUFA/Drivers/Board/EVK527/Dataflash.h
index b6a6e25..25a338c 100644 (file)
--- a/LUFA/Drivers/Board/EVK527/Dataflash.h
+++ b/LUFA/Drivers/Board/EVK527/Dataflash.h
@@ -54,7 +54,7 @@
                #include "AT45DB321C.h"         \r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_DATAFLASH_H)\r
+               #if !defined(__INCLUDE_FROM_DATAFLASH_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/Dataflash.h instead.\r
                #endif\r
 \r

diff --git a/LUFA/Drivers/Board/EVK527/Joystick.h b/LUFA/Drivers/Board/EVK527/Joystick.h
index c9262a4..7d208ea 100644 (file)
--- a/LUFA/Drivers/Board/EVK527/Joystick.h
+++ b/LUFA/Drivers/Board/EVK527/Joystick.h
@@ -61,7 +61,7 @@
                #endif\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_JOYSTICK_H)\r
+               #if !defined(__INCLUDE_FROM_JOYSTICK_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/Joystick.h instead.\r
                #endif\r
 \r

diff --git a/LUFA/Drivers/Board/EVK527/LEDs.h b/LUFA/Drivers/Board/EVK527/LEDs.h
index a1ba50d..ea7c7c2 100644 (file)
--- a/LUFA/Drivers/Board/EVK527/LEDs.h
+++ b/LUFA/Drivers/Board/EVK527/LEDs.h
@@ -61,7 +61,7 @@
                #endif\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_LEDS_H)\r
+               #if !defined(__INCLUDE_FROM_LEDS_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.\r
                #endif\r
 \r

diff --git a/LUFA/Drivers/Board/Joystick.h b/LUFA/Drivers/Board/Joystick.h
index be9d267..39375a2 100644 (file)
--- a/LUFA/Drivers/Board/Joystick.h
+++ b/LUFA/Drivers/Board/Joystick.h
@@ -62,6 +62,7 @@
 \r
        /* Macros: */\r
        #if !defined(__DOXYGEN__)\r
+               #define __INCLUDE_FROM_JOYSTICK_H\r
                #define INCLUDE_FROM_JOYSTICK_H\r
        #endif\r
 \r

diff --git a/LUFA/Drivers/Board/LEDs.h b/LUFA/Drivers/Board/LEDs.h
index 222be0e..94fbf3c 100644 (file)
--- a/LUFA/Drivers/Board/LEDs.h
+++ b/LUFA/Drivers/Board/LEDs.h
@@ -70,6 +70,7 @@
 \r
        /* Macros: */\r
        #if !defined(__DOXYGEN__)\r
+               #define __INCLUDE_FROM_LEDS_H\r
                #define INCLUDE_FROM_LEDS_H\r
        #endif\r
        \r

diff --git a/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h b/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h
index 088cd3a..d095d6e 100644 (file)
--- a/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h
+++ b/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h
@@ -61,7 +61,7 @@
                #endif\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_LEDS_H)\r
+               #if !defined(__INCLUDE_FROM_LEDS_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.\r
                #endif\r
 \r

diff --git a/LUFA/Drivers/Board/STK525/Buttons.h b/LUFA/Drivers/Board/STK525/Buttons.h
index fbf4f58..f3dccaf 100644 (file)
--- a/LUFA/Drivers/Board/STK525/Buttons.h
+++ b/LUFA/Drivers/Board/STK525/Buttons.h
@@ -68,7 +68,7 @@
                #endif\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_BUTTONS_H)\r
+               #if !defined(__INCLUDE_FROM_BUTTONS_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.\r
                #endif\r
                \r

diff --git a/LUFA/Drivers/Board/STK525/Dataflash.h b/LUFA/Drivers/Board/STK525/Dataflash.h
index cab1af8..f541edb 100644 (file)
--- a/LUFA/Drivers/Board/STK525/Dataflash.h
+++ b/LUFA/Drivers/Board/STK525/Dataflash.h
@@ -54,7 +54,7 @@
                #include "AT45DB321C.h"         \r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_DATAFLASH_H)\r
+               #if !defined(__INCLUDE_FROM_DATAFLASH_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/Dataflash.h instead.\r
                #endif\r
 \r

diff --git a/LUFA/Drivers/Board/STK525/Joystick.h b/LUFA/Drivers/Board/STK525/Joystick.h
index 1cb270f..6358f95 100644 (file)
--- a/LUFA/Drivers/Board/STK525/Joystick.h
+++ b/LUFA/Drivers/Board/STK525/Joystick.h
@@ -61,7 +61,7 @@
                #endif\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_JOYSTICK_H)\r
+               #if !defined(__INCLUDE_FROM_JOYSTICK_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/Joystick.h instead.\r
                #endif\r
 \r

diff --git a/LUFA/Drivers/Board/STK525/LEDs.h b/LUFA/Drivers/Board/STK525/LEDs.h
index 39ffa0f..b54a8c9 100644 (file)
--- a/LUFA/Drivers/Board/STK525/LEDs.h
+++ b/LUFA/Drivers/Board/STK525/LEDs.h
@@ -61,7 +61,7 @@
                #endif\r
                \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_LEDS_H)\r
+               #if !defined(__INCLUDE_FROM_LEDS_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.\r
                #endif\r
 \r

diff --git a/LUFA/Drivers/Board/STK526/Buttons.h b/LUFA/Drivers/Board/STK526/Buttons.h
index 9aa798a..f480560 100644 (file)
--- a/LUFA/Drivers/Board/STK526/Buttons.h
+++ b/LUFA/Drivers/Board/STK526/Buttons.h
@@ -68,7 +68,7 @@
                #endif\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_BUTTONS_H)\r
+               #if !defined(__INCLUDE_FROM_BUTTONS_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.\r
                #endif\r
                \r

diff --git a/LUFA/Drivers/Board/STK526/Dataflash.h b/LUFA/Drivers/Board/STK526/Dataflash.h
index ff89dce..9d04afe 100644 (file)
--- a/LUFA/Drivers/Board/STK526/Dataflash.h
+++ b/LUFA/Drivers/Board/STK526/Dataflash.h
@@ -54,7 +54,7 @@
                #include "AT45DB642D.h"\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_DATAFLASH_H)\r
+               #if !defined(__INCLUDE_FROM_DATAFLASH_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/Dataflash.h instead.\r
                #endif\r
 \r

diff --git a/LUFA/Drivers/Board/STK526/Joystick.h b/LUFA/Drivers/Board/STK526/Joystick.h
index a40526a..b095536 100644 (file)
--- a/LUFA/Drivers/Board/STK526/Joystick.h
+++ b/LUFA/Drivers/Board/STK526/Joystick.h
@@ -61,7 +61,7 @@
                #endif\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_JOYSTICK_H)\r
+               #if !defined(__INCLUDE_FROM_JOYSTICK_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/Joystick.h instead.\r
                #endif\r
 \r

diff --git a/LUFA/Drivers/Board/STK526/LEDs.h b/LUFA/Drivers/Board/STK526/LEDs.h
index 4e68d61..d1ac493 100644 (file)
--- a/LUFA/Drivers/Board/STK526/LEDs.h
+++ b/LUFA/Drivers/Board/STK526/LEDs.h
@@ -61,7 +61,7 @@
                #endif\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_LEDS_H)\r
+               #if !defined(__INCLUDE_FROM_LEDS_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.\r
                #endif\r
 \r

diff --git a/LUFA/Drivers/Board/Temperature.h b/LUFA/Drivers/Board/Temperature.h
index 86e0b66..7a5af36 100644 (file)
--- a/LUFA/Drivers/Board/Temperature.h
+++ b/LUFA/Drivers/Board/Temperature.h
@@ -52,11 +52,6 @@
 #ifndef __TEMPERATURE_H__\r
 #define __TEMPERATURE_H__\r
 \r
-       /* Macros: */\r
-       #if !defined(__DOXYGEN__)\r
-               #define INCLUDE_FROM_BOARD_DRIVER\r
-       #endif\r
-       \r
        /* Includes: */\r
                #include <avr/pgmspace.h>\r
 \r

diff --git a/LUFA/Drivers/Board/USBKEY/Buttons.h b/LUFA/Drivers/Board/USBKEY/Buttons.h
index 606fe81..db1391c 100644 (file)
--- a/LUFA/Drivers/Board/USBKEY/Buttons.h
+++ b/LUFA/Drivers/Board/USBKEY/Buttons.h
@@ -62,7 +62,7 @@
                #endif\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_BUTTONS_H)\r
+               #if !defined(__INCLUDE_FROM_BUTTONS_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.\r
                #endif\r
                \r

diff --git a/LUFA/Drivers/Board/USBKEY/Dataflash.h b/LUFA/Drivers/Board/USBKEY/Dataflash.h
index 2ada300..96cc3ad 100644 (file)
--- a/LUFA/Drivers/Board/USBKEY/Dataflash.h
+++ b/LUFA/Drivers/Board/USBKEY/Dataflash.h
@@ -54,7 +54,7 @@
                #include "AT45DB642D.h"\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_DATAFLASH_H)\r
+               #if !defined(__INCLUDE_FROM_DATAFLASH_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/Dataflash.h instead.\r
                #endif\r
                \r

diff --git a/LUFA/Drivers/Board/USBKEY/Joystick.h b/LUFA/Drivers/Board/USBKEY/Joystick.h
index bbb2a16..b082991 100644 (file)
--- a/LUFA/Drivers/Board/USBKEY/Joystick.h
+++ b/LUFA/Drivers/Board/USBKEY/Joystick.h
@@ -61,7 +61,7 @@
                #endif\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_JOYSTICK_H)\r
+               #if !defined(__INCLUDE_FROM_JOYSTICK_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/Joystick.h instead.\r
                #endif\r
 \r

diff --git a/LUFA/Drivers/Board/USBKEY/LEDs.h b/LUFA/Drivers/Board/USBKEY/LEDs.h
index cccdc93..e1a5b23 100644 (file)
--- a/LUFA/Drivers/Board/USBKEY/LEDs.h
+++ b/LUFA/Drivers/Board/USBKEY/LEDs.h
@@ -61,7 +61,7 @@
                #endif\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_LEDS_H)\r
+               #if !defined(__INCLUDE_FROM_LEDS_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.\r
                #endif\r
 \r

diff --git a/LUFA/Drivers/Board/XPLAIN/Dataflash.h b/LUFA/Drivers/Board/XPLAIN/Dataflash.h
index 045d596..a0e09c7 100644 (file)
--- a/LUFA/Drivers/Board/XPLAIN/Dataflash.h
+++ b/LUFA/Drivers/Board/XPLAIN/Dataflash.h
@@ -54,7 +54,7 @@
                #include "AT45DB642D.h"\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_DATAFLASH_H)\r
+               #if !defined(__INCLUDE_FROM_DATAFLASH_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/Dataflash.h instead.\r
                #endif\r
                \r

diff --git a/LUFA/Drivers/Board/XPLAIN/LEDs.h b/LUFA/Drivers/Board/XPLAIN/LEDs.h
index 36d8315..add868d 100644 (file)
--- a/LUFA/Drivers/Board/XPLAIN/LEDs.h
+++ b/LUFA/Drivers/Board/XPLAIN/LEDs.h
@@ -61,7 +61,7 @@
                #endif\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_LEDS_H)\r
+               #if !defined(__INCLUDE_FROM_LEDS_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.\r
                #endif\r
 \r

diff --git a/LUFA/Drivers/Peripheral/ADC.h b/LUFA/Drivers/Peripheral/ADC.h
index 1a11169..9823643 100644 (file)
--- a/LUFA/Drivers/Peripheral/ADC.h
+++ b/LUFA/Drivers/Peripheral/ADC.h
@@ -54,8 +54,7 @@
 \r
        /* Macros: */\r
        #if !defined(__DOXYGEN__)\r
-               #define INCLUDE_FROM_ADC_H\r
-               #define INCLUDE_FROM_CHIP_DRIVER\r
+               #define __INCLUDE_FROM_ADC_H\r
        #endif\r
 \r
        /* Includes: */\r

diff --git a/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h b/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h
index a7414ec..8b1b47d 100644 (file)
--- a/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h
+++ b/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h
@@ -62,7 +62,7 @@
                #endif\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_ADC_H)\r
+               #if !defined(__INCLUDE_FROM_ADC_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Peripheral/ADC.h instead.\r
                #endif\r
 \r

diff --git a/LUFA/Drivers/Peripheral/AVRU4U6U7/TWI.h b/LUFA/Drivers/Peripheral/AVRU4U6U7/TWI.h
index be905fe..13db86e 100644 (file)
--- a/LUFA/Drivers/Peripheral/AVRU4U6U7/TWI.h
+++ b/LUFA/Drivers/Peripheral/AVRU4U6U7/TWI.h
@@ -63,7 +63,7 @@
                #endif\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_TWI_H)\r
+               #if !defined(__INCLUDE_FROM_TWI_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Peripheral/TWI.h instead.\r
                #endif\r
 \r

diff --git a/LUFA/Drivers/Peripheral/SerialStream.c b/LUFA/Drivers/Peripheral/SerialStream.c
index c23d4e1..867160a 100644 (file)
--- a/LUFA/Drivers/Peripheral/SerialStream.c
+++ b/LUFA/Drivers/Peripheral/SerialStream.c
@@ -28,7 +28,7 @@
   this software.\r
 */\r
 \r
-#define  INCLUDE_FROM_SERIALSTREAM_C\r
+#define  __INCLUDE_FROM_SERIALSTREAM_C\r
 #include "SerialStream.h"\r
 \r
 FILE USARTStream = FDEV_SETUP_STREAM(SerialStream_TxByte, SerialStream_RxByte, _FDEV_SETUP_RW);\r

diff --git a/LUFA/Drivers/Peripheral/SerialStream.h b/LUFA/Drivers/Peripheral/SerialStream.h
index e03ce41..feadd0a 100644 (file)
--- a/LUFA/Drivers/Peripheral/SerialStream.h
+++ b/LUFA/Drivers/Peripheral/SerialStream.h
@@ -70,7 +70,7 @@
                        extern FILE USARTStream;\r
 \r
                /* Function Prototypes: */\r
-               #if defined(INCLUDE_FROM_SERIALSTREAM_C)\r
+               #if defined(__INCLUDE_FROM_SERIALSTREAM_C)\r
                        static int SerialStream_TxByte(char DataByte, FILE *Stream) ATTR_NON_NULL_PTR_ARG(2);\r
                        static int SerialStream_RxByte(FILE *Stream) ATTR_NON_NULL_PTR_ARG(1);\r
                #endif\r

diff --git a/LUFA/Drivers/Peripheral/TWI.h b/LUFA/Drivers/Peripheral/TWI.h
index 7432a16..29c0afe 100644 (file)
--- a/LUFA/Drivers/Peripheral/TWI.h
+++ b/LUFA/Drivers/Peripheral/TWI.h
@@ -53,8 +53,7 @@
 \r
        /* Macros: */\r
        #if !defined(__DOXYGEN__)\r
-               #define INCLUDE_FROM_TWI_H\r
-               #define INCLUDE_FROM_CHIP_DRIVER\r
+               #define __INCLUDE_FROM_TWI_H\r
        #endif\r
 \r
        /* Includes: */\r

diff --git a/LUFA/Drivers/USB/Class/Audio.h b/LUFA/Drivers/USB/Class/Audio.h
index 34e8672..c6a9263 100644 (file)
--- a/LUFA/Drivers/USB/Class/Audio.h
+++ b/LUFA/Drivers/USB/Class/Audio.h
@@ -49,6 +49,10 @@
 #ifndef _AUDIO_CLASS_H_\r
 #define _AUDIO_CLASS_H_\r
 \r
+       /* Macros: */\r
+               #define __INCLUDE_FROM_AUDIO_DRIVER\r
+               #define __INCLUDE_FROM_USB_DRIVER\r
+\r
        /* Includes: */\r
                #include "../HighLevel/USBMode.h"\r
                \r

diff --git a/LUFA/Drivers/USB/Class/CDC.h b/LUFA/Drivers/USB/Class/CDC.h
index 6b4c2c9..cc49572 100644 (file)
--- a/LUFA/Drivers/USB/Class/CDC.h
+++ b/LUFA/Drivers/USB/Class/CDC.h
@@ -50,6 +50,10 @@
 #ifndef _CDC_CLASS_H_\r
 #define _CDC_CLASS_H_\r
 \r
+       /* Macros: */\r
+               #define __INCLUDE_FROM_CDC_DRIVER\r
+               #define __INCLUDE_FROM_USB_DRIVER\r
+\r
        /* Includes: */\r
                #include "../HighLevel/USBMode.h"\r
 \r

diff --git a/LUFA/Drivers/USB/Class/Common/Audio.h b/LUFA/Drivers/USB/Class/Common/Audio.h
index 0e2c692..5d19b6f 100644 (file)
--- a/LUFA/Drivers/USB/Class/Common/Audio.h
+++ b/LUFA/Drivers/USB/Class/Common/Audio.h
@@ -51,6 +51,11 @@
                        extern "C" {\r
                #endif\r
 \r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_AUDIO_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/Class/Audio.h instead.\r
+               #endif\r
+\r
        /* Macros: */\r
                #if !defined(AUDIO_TOTAL_SAMPLE_RATES) || defined(__DOXYGEN__)\r
                        /** Total number of discrete audio sample rates supported by the device. This value can be overridden by defining this\r

diff --git a/LUFA/Drivers/USB/Class/Common/CDC.h b/LUFA/Drivers/USB/Class/Common/CDC.h
index f684497..55f530b 100644 (file)
--- a/LUFA/Drivers/USB/Class/Common/CDC.h
+++ b/LUFA/Drivers/USB/Class/Common/CDC.h
@@ -51,6 +51,11 @@
                        extern "C" {\r
                #endif\r
 \r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_CDC_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/Class/CDC.h instead.\r
+               #endif\r
+               \r
        /* Macros: */\r
                /** CDC Class specific request to get the current virtual serial port configuration settings. */\r
                #define REQ_GetLineEncoding              0x21\r

diff --git a/LUFA/Drivers/USB/Class/Common/HID.h b/LUFA/Drivers/USB/Class/Common/HID.h
index 5afaf48..33a5af4 100644 (file)
--- a/LUFA/Drivers/USB/Class/Common/HID.h
+++ b/LUFA/Drivers/USB/Class/Common/HID.h
@@ -46,6 +46,11 @@
 \r
                #include <string.h>\r
 \r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_HID_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/Class/HID.h instead.\r
+               #endif\r
+               \r
        /* Macros: */\r
                /** HID Class Specific Request to get the current HID report from the device. */\r
                #define REQ_GetReport                   0x01\r

diff --git a/LUFA/Drivers/USB/Class/Common/MIDI.h b/LUFA/Drivers/USB/Class/Common/MIDI.h
index d081303..8eed101 100644 (file)
--- a/LUFA/Drivers/USB/Class/Common/MIDI.h
+++ b/LUFA/Drivers/USB/Class/Common/MIDI.h
@@ -41,6 +41,9 @@
 #ifndef _MIDI_CLASS_COMMON_H_\r
 #define _MIDI_CLASS_COMMON_H_\r
 \r
+       /* Macros: */\r
+               #define __INCLUDE_FROM_AUDIO_DRIVER\r
+\r
        /* Includes: */\r
                #include "../../USB.h"\r
                #include "Audio.h"\r
@@ -52,6 +55,11 @@
                        extern "C" {\r
                #endif\r
 \r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_MIDI_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/Class/MIDI.h instead.\r
+               #endif\r
+               \r
        /* Macros: */\r
                /** Audio class descriptor subtype value for a Audio class specific MIDI input jack descriptor. */\r
                #define DSUBTYPE_InputJack          0x02\r

diff --git a/LUFA/Drivers/USB/Class/Common/MassStorage.h b/LUFA/Drivers/USB/Class/Common/MassStorage.h
index 942d06b..8726148 100644 (file)
--- a/LUFA/Drivers/USB/Class/Common/MassStorage.h
+++ b/LUFA/Drivers/USB/Class/Common/MassStorage.h
@@ -51,6 +51,11 @@
                        extern "C" {\r
                #endif\r
 \r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_MS_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/Class/MassStorage.h instead.\r
+               #endif\r
+               \r
        /* Macros: */\r
                /** Mass Storage Class specific request to reset the Mass Storage interface, ready for the next command. */\r
                #define REQ_MassStorageReset       0xFF\r

diff --git a/LUFA/Drivers/USB/Class/Common/Printer.h b/LUFA/Drivers/USB/Class/Common/Printer.h
index ea6f1ab..06ec0bb 100644 (file)
--- a/LUFA/Drivers/USB/Class/Common/Printer.h
+++ b/LUFA/Drivers/USB/Class/Common/Printer.h
@@ -49,8 +49,13 @@
        /* Enable C linkage for C++ Compilers: */\r
                #if defined(__cplusplus)\r
                        extern "C" {\r
-               #endif\r
+               #endif
 \r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_PRINTER_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/Class/Printer.h instead.\r
+               #endif\r
+               \r
        /* Macros: */\r
                /** Port status mask for a printer device, indicating that an error has *not* occurred. */\r
                #define PRNT_PORTSTATUS_NOTERROR    (1 << 3)\r

diff --git a/LUFA/Drivers/USB/Class/Common/RNDIS.h b/LUFA/Drivers/USB/Class/Common/RNDIS.h
index ef98ccd..258604d 100644 (file)
--- a/LUFA/Drivers/USB/Class/Common/RNDIS.h
+++ b/LUFA/Drivers/USB/Class/Common/RNDIS.h
@@ -41,10 +41,13 @@
 #ifndef _RNDIS_CLASS_COMMON_H_\r
 #define _RNDIS_CLASS_COMMON_H_\r
 \r
+       /* Macros: */\r
+               #define __INCLUDE_FROM_CDC_DRIVER\r
+\r
        /* Includes: */\r
                #include "../../USB.h"\r
-               #include "CDC.h"\r
                #include "RNDISConstants.h"\r
+               #include "CDC.h"\r
                \r
                #include <string.h>\r
        \r
@@ -53,6 +56,11 @@
                        extern "C" {\r
                #endif\r
 \r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_RNDIS_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/Class/RNDIS.h instead.\r
+               #endif\r
+               \r
        /* Macros: */\r
                /** Implemented RNDIS Version Major */\r
                #define REMOTE_NDIS_VERSION_MAJOR             0x01\r

diff --git a/LUFA/Drivers/USB/Class/Common/StillImage.h b/LUFA/Drivers/USB/Class/Common/StillImage.h
index bbdc0d0..7b3df20 100644 (file)
--- a/LUFA/Drivers/USB/Class/Common/StillImage.h
+++ b/LUFA/Drivers/USB/Class/Common/StillImage.h
@@ -51,6 +51,11 @@
                        extern "C" {\r
                #endif\r
 \r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_SI_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/Class/StillImage.h instead.\r
+               #endif\r
+               \r
        /* Macros: */\r
                /** Length in bytes of a given Unicode string's character length\r
                 *\r

diff --git a/LUFA/Drivers/USB/Class/Device/Audio.c b/LUFA/Drivers/USB/Class/Device/Audio.c
index 89115f2..d2572e9 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/Audio.c
+++ b/LUFA/Drivers/USB/Class/Device/Audio.c
@@ -28,9 +28,11 @@
   this software.\r
 */\r
 \r
+#define  __INCLUDE_FROM_USB_DRIVER\r
 #include "../../HighLevel/USBMode.h"\r
 #if defined(USB_CAN_BE_DEVICE)\r
 \r
+#define  __INCLUDE_FROM_AUDIO_DRIVER\r
 #include "Audio.h"\r
 \r
 void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)\r

diff --git a/LUFA/Drivers/USB/Class/Device/Audio.h b/LUFA/Drivers/USB/Class/Device/Audio.h
index c6b68b0..87fab98 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/Audio.h
+++ b/LUFA/Drivers/USB/Class/Device/Audio.h
@@ -55,6 +55,11 @@
                        extern "C" {\r
                #endif\r
 \r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_AUDIO_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/Class/Audio.h instead.\r
+               #endif\r
+\r
        /* Public Interface - May be used in end-application: */\r
                /* Type Defines: */             \r
                        /** Class state structure. An instance of this structure should be made for each Audio interface\r

diff --git a/LUFA/Drivers/USB/Class/Device/CDC.c b/LUFA/Drivers/USB/Class/Device/CDC.c
index b8a673f..4cdea94 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/CDC.c
+++ b/LUFA/Drivers/USB/Class/Device/CDC.c
@@ -28,10 +28,12 @@
   this software.\r
 */\r
 \r
+#define  __INCLUDE_FROM_USB_DRIVER\r
 #include "../../HighLevel/USBMode.h"\r
 #if defined(USB_CAN_BE_DEVICE)\r
 \r
-#define  INCLUDE_FROM_CDC_CLASS_DEVICE_C\r
+#define  __INCLUDE_FROM_CDC_CLASS_DEVICE_C\r
+#define  __INCLUDE_FROM_CDC_DRIVER\r
 #include "CDC.h"\r
 \r
 void CDC_Device_Event_Stub(void)\r

diff --git a/LUFA/Drivers/USB/Class/Device/CDC.h b/LUFA/Drivers/USB/Class/Device/CDC.h
index e6a2bfd..0c21444 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/CDC.h
+++ b/LUFA/Drivers/USB/Class/Device/CDC.h
@@ -73,6 +73,11 @@
                        extern "C" {\r
                #endif\r
 \r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_CDC_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/Class/CDC.h instead.\r
+               #endif\r
+               \r
        /* Public Interface - May be used in end-application: */\r
                /* Type Defines: */\r
                        /** Class state structure. An instance of this structure should be made for each CDC interface\r
@@ -281,7 +286,7 @@
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r
                /* Function Prototypes: */\r
-                       #if defined(INCLUDE_FROM_CDC_CLASS_DEVICE_C)\r
+                       #if defined(__INCLUDE_FROM_CDC_CLASS_DEVICE_C)\r
                                static int CDC_Device_putchar(char c, FILE* Stream);\r
                                static int CDC_Device_getchar(FILE* Stream);\r
                                static int CDC_Device_getchar_Blocking(FILE* Stream);\r

diff --git a/LUFA/Drivers/USB/Class/Device/HID.c b/LUFA/Drivers/USB/Class/Device/HID.c
index a5c03f7..cc1ad43 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/HID.c
+++ b/LUFA/Drivers/USB/Class/Device/HID.c
@@ -28,9 +28,11 @@
   this software.\r
 */\r
 \r
+#define  __INCLUDE_FROM_USB_DRIVER\r
 #include "../../HighLevel/USBMode.h"\r
 #if defined(USB_CAN_BE_DEVICE)\r
 \r
+#define  __INCLUDE_FROM_HID_DRIVER\r
 #include "HID.h"\r
 \r
 void HID_Device_ProcessControlRequest(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo)\r

diff --git a/LUFA/Drivers/USB/Class/Device/HID.h b/LUFA/Drivers/USB/Class/Device/HID.h
index f62c08c..15b428a 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/HID.h
+++ b/LUFA/Drivers/USB/Class/Device/HID.h
@@ -55,6 +55,11 @@
                        extern "C" {\r
                #endif\r
 \r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_HID_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/Class/HID.h instead.\r
+               #endif\r
+\r
        /* Public Interface - May be used in end-application: */\r
                /* Type Defines: */\r
                        /** Class state structure. An instance of this structure should be made for each HID interface\r

diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.c b/LUFA/Drivers/USB/Class/Device/MIDI.c
index b72c2b0..d3f8f55 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/MIDI.c
+++ b/LUFA/Drivers/USB/Class/Device/MIDI.c
@@ -28,9 +28,11 @@
   this software.\r
 */\r
 \r
+#define  __INCLUDE_FROM_USB_DRIVER\r
 #include "../../HighLevel/USBMode.h"\r
 #if defined(USB_CAN_BE_DEVICE)\r
 \r
+#define  __INCLUDE_FROM_MIDI_DRIVER\r
 #include "MIDI.h"\r
 \r
 void MIDI_Device_ProcessControlRequest(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo)\r

diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.h b/LUFA/Drivers/USB/Class/Device/MIDI.h
index 8517782..772456b 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/MIDI.h
+++ b/LUFA/Drivers/USB/Class/Device/MIDI.h
@@ -47,7 +47,6 @@
        /* Includes: */\r
                #include "../../USB.h"\r
                #include "../Common/MIDI.h"\r
-               #include "Audio.h"\r
 \r
                #include <string.h>\r
 \r
@@ -56,6 +55,11 @@
                        extern "C" {\r
                #endif\r
 \r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_MIDI_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/Class/MIDI.h instead.\r
+               #endif\r
+\r
        /* Public Interface - May be used in end-application: */\r
                /* Type Define: */\r
                        /** Class state structure. An instance of this structure should be made for each MIDI interface\r

diff --git a/LUFA/Drivers/USB/Class/Device/MassStorage.c b/LUFA/Drivers/USB/Class/Device/MassStorage.c
index 941db68..a5ebab0 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/MassStorage.c
+++ b/LUFA/Drivers/USB/Class/Device/MassStorage.c
@@ -28,10 +28,12 @@
   this software.\r
 */\r
 \r
+#define  __INCLUDE_FROM_USB_DRIVER\r
 #include "../../HighLevel/USBMode.h"\r
 #if defined(USB_CAN_BE_DEVICE)\r
 \r
-#define  INCLUDE_FROM_MS_CLASS_DEVICE_C\r
+#define  __INCLUDE_FROM_MS_CLASS_DEVICE_C\r
+#define  __INCLUDE_FROM_MS_DRIVER\r
 #include "MassStorage.h"\r
 \r
 static volatile bool* CallbackIsResetSource;\r

diff --git a/LUFA/Drivers/USB/Class/Device/MassStorage.h b/LUFA/Drivers/USB/Class/Device/MassStorage.h
index 7091dca..87dcfb2 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/MassStorage.h
+++ b/LUFA/Drivers/USB/Class/Device/MassStorage.h
@@ -55,6 +55,11 @@
                        extern "C" {\r
                #endif\r
 \r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_MS_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/Class/MassStorage.h instead.\r
+               #endif\r
+\r
        /* Public Interface - May be used in end-application: */\r
                /* Type Defines: */                                                                             \r
                        /** Class state structure. An instance of this structure should be made for each Mass Storage interface\r
@@ -134,7 +139,7 @@
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r
                /* Function Prototypes: */\r
-                       #if defined(INCLUDE_FROM_MS_CLASS_DEVICE_C)\r
+                       #if defined(__INCLUDE_FROM_MS_CLASS_DEVICE_C)\r
                                static void    MS_Device_ReturnCommandStatus(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);\r
                                static bool    MS_Device_ReadInCommandBlock(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);\r
                                static uint8_t StreamCallback_MS_Device_AbortOnMassStoreReset(void);\r

diff --git a/LUFA/Drivers/USB/Class/Device/RNDIS.c b/LUFA/Drivers/USB/Class/Device/RNDIS.c
index 0dc3859..1961e7e 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/RNDIS.c
+++ b/LUFA/Drivers/USB/Class/Device/RNDIS.c
@@ -28,10 +28,12 @@
   this software.\r
 */\r
 \r
+#define  __INCLUDE_FROM_USB_DRIVER\r
 #include "../../HighLevel/USBMode.h"\r
 #if defined(USB_CAN_BE_DEVICE)\r
 \r
-#define  INCLUDE_FROM_RNDIS_CLASS_DEVICE_C\r
+#define  __INCLUDE_FROM_RNDIS_CLASS_DEVICE_C\r
+#define  __INCLUDE_FROM_RNDIS_DRIVER\r
 #include "RNDIS.h"\r
 \r
 static const uint32_t PROGMEM AdapterSupportedOIDList[]  =\r

diff --git a/LUFA/Drivers/USB/Class/Device/RNDIS.h b/LUFA/Drivers/USB/Class/Device/RNDIS.h
index 91ec798..7d6b3a8 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/RNDIS.h
+++ b/LUFA/Drivers/USB/Class/Device/RNDIS.h
@@ -55,6 +55,11 @@
                        extern "C" {\r
                #endif\r
 \r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_RNDIS_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/Class/RNDIS.h instead.\r
+               #endif\r
+               \r
        /* Public Interface - May be used in end-application: */\r
                /* Type Defines: */                                      \r
                        /** Class state structure. An instance of this structure should be made for each RNDIS interface\r
@@ -131,7 +136,7 @@
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r
                /* Function Prototypes: */\r
-               #if defined(INCLUDE_FROM_RNDIS_CLASS_DEVICE_C)\r
+               #if defined(__INCLUDE_FROM_RNDIS_CLASS_DEVICE_C)\r
                        static void RNDIS_Device_ProcessRNDISControlMessage(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfaceInfo)\r
                                                                            ATTR_NON_NULL_PTR_ARG(1);\r
                        static bool RNDIS_Device_ProcessNDISQuery(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfaceInfo, \r

diff --git a/LUFA/Drivers/USB/Class/HID.h b/LUFA/Drivers/USB/Class/HID.h
index ebbfb42..5eda33b 100644 (file)
--- a/LUFA/Drivers/USB/Class/HID.h
+++ b/LUFA/Drivers/USB/Class/HID.h
@@ -51,6 +51,10 @@
 #ifndef _HID_CLASS_H_\r
 #define _HID_CLASS_H_\r
 \r
+       /* Macros: */\r
+               #define __INCLUDE_FROM_HID_DRIVER\r
+               #define __INCLUDE_FROM_USB_DRIVER\r
+               \r
        /* Includes: */\r
                #include "../HighLevel/USBMode.h"\r
 \r

diff --git a/LUFA/Drivers/USB/Class/Host/CDC.c b/LUFA/Drivers/USB/Class/Host/CDC.c
index 227ab94..cc1ff8a 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/CDC.c
+++ b/LUFA/Drivers/USB/Class/Host/CDC.c
@@ -28,10 +28,12 @@
   this software.\r
 */\r
 \r
+#define  __INCLUDE_FROM_USB_DRIVER\r
 #include "../../HighLevel/USBMode.h"\r
 #if defined(USB_CAN_BE_HOST)\r
 \r
-#define  INCLUDE_FROM_CDC_CLASS_HOST_C\r
+#define  __INCLUDE_FROM_CDC_CLASS_HOST_C\r
+#define  __INCLUDE_FROM_CDC_DRIVER\r
 #include "CDC.h"\r
 \r
 uint8_t CDC_Host_ConfigurePipes(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo, uint16_t ConfigDescriptorSize,\r

diff --git a/LUFA/Drivers/USB/Class/Host/CDC.h b/LUFA/Drivers/USB/Class/Host/CDC.h
index 9433c59..feb6bf8 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/CDC.h
+++ b/LUFA/Drivers/USB/Class/Host/CDC.h
@@ -56,6 +56,11 @@
                        extern "C" {\r
                #endif\r
 \r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_CDC_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/Class/CDC.h instead.\r
+               #endif\r
+\r
        /* Public Interface - May be used in end-application: */\r
                /* Type Defines: */\r
                        /** Class state structure. An instance of this structure should be made within the user application,\r
@@ -286,7 +291,7 @@
                        #define CDC_FOUND_NOTIFICATION_IN       (1 << 2)\r
 \r
                /* Function Prototypes: */\r
-                       #if defined(INCLUDE_FROM_CDC_CLASS_HOST_C)\r
+                       #if defined(__INCLUDE_FROM_CDC_CLASS_HOST_C)\r
                                static int CDC_Host_putchar(char c, FILE* Stream);\r
                                static int CDC_Host_getchar(FILE* Stream);\r
                                static int CDC_Host_getchar_Blocking(FILE* Stream);\r

diff --git a/LUFA/Drivers/USB/Class/Host/HID.c b/LUFA/Drivers/USB/Class/Host/HID.c
index 3cd9394..1e1dbcf 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/HID.c
+++ b/LUFA/Drivers/USB/Class/Host/HID.c
@@ -28,10 +28,12 @@
   this software.\r
 */\r
 \r
+#define  __INCLUDE_FROM_USB_DRIVER\r
 #include "../../HighLevel/USBMode.h"\r
 #if defined(USB_CAN_BE_HOST)\r
 \r
-#define INCLUDE_FROM_HID_CLASS_HOST_C\r
+#define  __INCLUDE_FROM_HID_CLASS_HOST_C\r
+#define  __INCLUDE_FROM_HID_DRIVER\r
 #include "HID.h"\r
 \r
 uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo, uint16_t ConfigDescriptorSize,\r

diff --git a/LUFA/Drivers/USB/Class/Host/HID.h b/LUFA/Drivers/USB/Class/Host/HID.h
index 3aaf809..d4ea7ac 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/HID.h
+++ b/LUFA/Drivers/USB/Class/Host/HID.h
@@ -55,6 +55,11 @@
                        extern "C" {\r
                #endif\r
 \r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_HID_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/Class/HID.h instead.\r
+               #endif\r
+\r
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r
                        /** Error code for some HID Host functions, indicating a logical (and not hardware) error */\r
@@ -275,7 +280,7 @@
                        #define HID_FOUND_DATAPIPE_OUT          (1 << 1)\r
 \r
                /* Function Prototypes: */\r
-                       #if defined(INCLUDE_FROM_HID_CLASS_HOST_C)\r
+                       #if defined(__INCLUDE_FROM_HID_CLASS_HOST_C)\r
                                static uint8_t DComp_HID_Host_NextHIDInterface(void* const CurrentDescriptor) ATTR_NON_NULL_PTR_ARG(1);\r
                                static uint8_t DComp_NextHID(void* const CurrentDescriptor) ATTR_NON_NULL_PTR_ARG(1);\r
                                static uint8_t DComp_HID_Host_NextHIDInterfaceEndpoint(void* const CurrentDescriptor) ATTR_NON_NULL_PTR_ARG(1);\r

diff --git a/LUFA/Drivers/USB/Class/Host/HIDParser.c b/LUFA/Drivers/USB/Class/Host/HIDParser.c
index 6c81ae8..386c3b9 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/HIDParser.c
+++ b/LUFA/Drivers/USB/Class/Host/HIDParser.c
@@ -28,6 +28,7 @@
   this software.\r
 */\r
 \r
+#define  __INCLUDE_FROM_USB_DRIVER\r
 #include "../../HighLevel/USBMode.h"\r
 #if defined(USB_CAN_BE_HOST)\r
 \r

diff --git a/LUFA/Drivers/USB/Class/Host/HIDParser.h b/LUFA/Drivers/USB/Class/Host/HIDParser.h
index b7225f3..b969893 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/HIDParser.h
+++ b/LUFA/Drivers/USB/Class/Host/HIDParser.h
@@ -57,6 +57,10 @@
 #ifndef __HIDPARSER_H__\r
 #define __HIDPARSER_H__\r
 \r
+       /* Macros: */\r
+               #define __INCLUDE_FROM_USB_DRIVER\r
+               #define __INCLUDE_FROM_HID_DRIVER\r
+\r
        /* Includes: */\r
                #include <string.h>\r
                #include <stdbool.h>\r

diff --git a/LUFA/Drivers/USB/Class/Host/MIDI.c b/LUFA/Drivers/USB/Class/Host/MIDI.c
index a5ad4bf..c2e6257 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/MIDI.c
+++ b/LUFA/Drivers/USB/Class/Host/MIDI.c
@@ -28,10 +28,12 @@
   this software.\r
 */\r
 \r
+#define  __INCLUDE_FROM_USB_DRIVER\r
 #include "../../HighLevel/USBMode.h"\r
 #if defined(USB_CAN_BE_HOST)\r
 \r
-#define  INCLUDE_FROM_MIDI_CLASS_HOST_C\r
+#define  __INCLUDE_FROM_MIDI_CLASS_HOST_C\r
+#define  __INCLUDE_FROM_MIDI_DRIVER\r
 #include "MIDI.h"\r
 \r
 uint8_t MIDI_Host_ConfigurePipes(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo, uint16_t ConfigDescriptorSize,\r

diff --git a/LUFA/Drivers/USB/Class/Host/MIDI.h b/LUFA/Drivers/USB/Class/Host/MIDI.h
index 7b1cba3..84779a0 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/MIDI.h
+++ b/LUFA/Drivers/USB/Class/Host/MIDI.h
@@ -53,6 +53,11 @@
                        extern "C" {\r
                #endif\r
 \r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_MIDI_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/Class/MIDI.h instead.\r
+               #endif\r
+               \r
        /* Public Interface - May be used in end-application: */\r
                /* Type Defines: */\r
                        /** Class state structure. An instance of this structure should be made within the user application,\r
@@ -172,7 +177,7 @@
                        #define MIDI_FOUND_DATAPIPE_OUT          (1 << 1)\r
 \r
                /* Function Prototypes: */\r
-                       #if defined(INCLUDE_FROM_MIDI_CLASS_HOST_C)\r
+                       #if defined(__INCLUDE_FROM_MIDI_CLASS_HOST_C)\r
                                static uint8_t DComp_MIDI_Host_NextMIDIStreamingInterface(void* const CurrentDescriptor) ATTR_NON_NULL_PTR_ARG(1);\r
                                static uint8_t DComp_MIDI_Host_NextMIDIStreamingDataEndpoint(void* const CurrentDescriptor) ATTR_NON_NULL_PTR_ARG(1);\r
                        #endif  \r

diff --git a/LUFA/Drivers/USB/Class/Host/MassStorage.c b/LUFA/Drivers/USB/Class/Host/MassStorage.c
index 7a30263..1b67ba2 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/MassStorage.c
+++ b/LUFA/Drivers/USB/Class/Host/MassStorage.c
@@ -28,10 +28,12 @@
   this software.\r
 */\r
 \r
+#define  __INCLUDE_FROM_USB_DRIVER\r
 #include "../../HighLevel/USBMode.h"\r
 #if defined(USB_CAN_BE_HOST)\r
 \r
-#define INCLUDE_FROM_MS_CLASS_HOST_C\r
+#define  __INCLUDE_FROM_MS_CLASS_HOST_C\r
+#define  __INCLUDE_FROM_MS_DRIVER\r
 #include "MassStorage.h"\r
 \r
 uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, uint16_t ConfigDescriptorSize,\r

diff --git a/LUFA/Drivers/USB/Class/Host/MassStorage.h b/LUFA/Drivers/USB/Class/Host/MassStorage.h
index 6dda5c0..502e902 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/MassStorage.h
+++ b/LUFA/Drivers/USB/Class/Host/MassStorage.h
@@ -53,6 +53,11 @@
                        extern "C" {\r
                #endif\r
 \r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_MS_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/Class/MassStorage.h instead.\r
+               #endif\r
+\r
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r
                        /** Error code for some Mass Storage Host functions, indicating a logical (and not hardware) error */\r
@@ -296,7 +301,7 @@
                        #define MS_FOUND_DATAPIPE_OUT          (1 << 1)\r
                        \r
                /* Function Prototypes: */\r
-                       #if defined(INCLUDE_FROM_MS_CLASS_HOST_C)               \r
+                       #if defined(__INCLUDE_FROM_MS_CLASS_HOST_C)             \r
                                static uint8_t DComp_NextMSInterface(void* const CurrentDescriptor);\r
                                static uint8_t DComp_NextMSInterfaceEndpoint(void* const CurrentDescriptor);\r
                                \r

diff --git a/LUFA/Drivers/USB/Class/Host/Printer.c b/LUFA/Drivers/USB/Class/Host/Printer.c
index d1fb7c9..2d41a0c 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/Printer.c
+++ b/LUFA/Drivers/USB/Class/Host/Printer.c
@@ -28,10 +28,12 @@
   this software.\r
 */\r
 \r
+#define  __INCLUDE_FROM_USB_DRIVER\r
 #include "../../HighLevel/USBMode.h"\r
 #if defined(USB_CAN_BE_HOST)\r
 \r
-#define INCLUDE_FROM_PRINTER_CLASS_HOST_C\r
+#define  __INCLUDE_FROM_PRINTER_CLASS_HOST_C\r
+#define  __INCLUDE_FROM_PRINTER_DRIVER\r
 #include "Printer.h"\r
 \r
 uint8_t PRNT_Host_ConfigurePipes(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo, uint16_t ConfigDescriptorSize,\r

diff --git a/LUFA/Drivers/USB/Class/Host/Printer.h b/LUFA/Drivers/USB/Class/Host/Printer.h
index 06a1f84..25b0beb 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/Printer.h
+++ b/LUFA/Drivers/USB/Class/Host/Printer.h
@@ -53,9 +53,12 @@
                        extern "C" {\r
                #endif\r
 \r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_PRINTER_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/Class/Printer.h instead.\r
+               #endif\r
+\r
        /* Public Interface - May be used in end-application: */\r
-               /* Macros: */\r
-       \r
                /* Type Defines: */\r
                        /** Class state structure. An instance of this structure should be made within the user application,\r
                         *  and passed to each of the Printer class driver functions as the PRNTInterfaceInfo parameter. This\r
@@ -203,7 +206,7 @@
                        #define PRNT_FOUND_DATAPIPE_OUT        (1 << 1)\r
                        \r
                /* Function Prototypes: */\r
-                       #if defined(INCLUDE_FROM_PRINTER_CLASS_HOST_C)          \r
+                       #if defined(__INCLUDE_FROM_PRINTER_CLASS_HOST_C)                \r
                                static uint8_t DComp_NextPRNTInterface(void* const CurrentDescriptor);\r
                                static uint8_t DComp_NextPRNTInterfaceEndpoint(void* const CurrentDescriptor);\r
                        #endif\r

diff --git a/LUFA/Drivers/USB/Class/Host/RNDIS.c b/LUFA/Drivers/USB/Class/Host/RNDIS.c
index b06b890..c7bf482 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/RNDIS.c
+++ b/LUFA/Drivers/USB/Class/Host/RNDIS.c
@@ -28,10 +28,12 @@
   this software.\r
 */\r
 \r
+#define  __INCLUDE_FROM_USB_DRIVER\r
 #include "../../HighLevel/USBMode.h"\r
 #if defined(USB_CAN_BE_HOST)\r
 \r
-#define  INCLUDE_FROM_RNDIS_CLASS_HOST_C\r
+#define  __INCLUDE_FROM_RNDIS_CLASS_HOST_C\r
+#define  __INCLUDE_FROM_RNDIS_DRIVER\r
 #include "RNDIS.h"\r
 \r
 uint8_t RNDIS_Host_ConfigurePipes(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo, uint16_t ConfigDescriptorSize,\r

diff --git a/LUFA/Drivers/USB/Class/Host/RNDIS.h b/LUFA/Drivers/USB/Class/Host/RNDIS.h
index 0110b5a..f42ed43 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/RNDIS.h
+++ b/LUFA/Drivers/USB/Class/Host/RNDIS.h
@@ -57,6 +57,11 @@
                        extern "C" {\r
                #endif\r
 \r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_RNDIS_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/Class/RNDIS.h instead.\r
+               #endif\r
+\r
        /* Public Interface - May be used in end-application: */\r
                /* Type Defines: */\r
                        /** Class state structure. An instance of this structure should be made within the user application,\r
@@ -245,7 +250,7 @@
                        #define RNDIS_FOUND_NOTIFICATION_IN       (1 << 2)\r
 \r
                /* Function Prototypes: */\r
-                       #if defined(INCLUDE_FROM_RNDIS_CLASS_HOST_C)\r
+                       #if defined(__INCLUDE_FROM_RNDIS_CLASS_HOST_C)\r
                                static uint8_t RNDIS_SendEncapsulatedCommand(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo, \r
                                                                             void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);\r
                                static uint8_t RNDIS_GetEncapsulatedResponse(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo,\r

diff --git a/LUFA/Drivers/USB/Class/Host/StillImage.c b/LUFA/Drivers/USB/Class/Host/StillImage.c
index 2f5adda..577f619 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/StillImage.c
+++ b/LUFA/Drivers/USB/Class/Host/StillImage.c
@@ -28,10 +28,12 @@
   this software.\r
 */\r
 \r
+#define  __INCLUDE_FROM_USB_DRIVER\r
 #include "../../HighLevel/USBMode.h"\r
 #if defined(USB_CAN_BE_HOST)\r
 \r
-#define INCLUDE_FROM_SI_CLASS_HOST_C\r
+#define  __INCLUDE_FROM_SI_CLASS_HOST_C\r
+#define  __INCLUDE_FROM_SI_DRIVER\r
 #include "StillImage.h"\r
 \r
 uint8_t SImage_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo, uint16_t ConfigDescriptorSize,\r

diff --git a/LUFA/Drivers/USB/Class/Host/StillImage.h b/LUFA/Drivers/USB/Class/Host/StillImage.h
index b6a2475..a210126 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/StillImage.h
+++ b/LUFA/Drivers/USB/Class/Host/StillImage.h
@@ -53,6 +53,11 @@
                        extern "C" {\r
                #endif\r
 \r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_SI_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/Class/StillImage.h instead.\r
+               #endif\r
+               \r
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r
                        /** Error code for some Still Image Host functions, indicating a logical (and not hardware) error */\r
@@ -287,7 +292,7 @@
                        #define COMMAND_DATA_TIMEOUT_MS        10000\r
                \r
                /* Function Prototypes: */\r
-                       #if defined(INCLUDE_FROM_SI_CLASS_HOST_C)\r
+                       #if defined(__INCLUDE_FROM_SI_CLASS_HOST_C)\r
                                static uint8_t DComp_SI_Host_NextSIInterface(void* const CurrentDescriptor) ATTR_NON_NULL_PTR_ARG(1);\r
                                static uint8_t DComp_SI_Host_NextSIInterfaceEndpoint(void* const CurrentDescriptor) ATTR_NON_NULL_PTR_ARG(1);\r
                        #endif\r

diff --git a/LUFA/Drivers/USB/Class/MIDI.h b/LUFA/Drivers/USB/Class/MIDI.h
index 7fda7ae..41f2916 100644 (file)
--- a/LUFA/Drivers/USB/Class/MIDI.h
+++ b/LUFA/Drivers/USB/Class/MIDI.h
@@ -53,6 +53,10 @@
 #ifndef _MIDI_CLASS_H_\r
 #define _MIDI_CLASS_H_\r
 \r
+       /* Macros: */\r
+               #define __INCLUDE_FROM_MIDI_DRIVER\r
+               #define __INCLUDE_FROM_USB_DRIVER\r
+               \r
        /* Includes: */\r
                #include "../HighLevel/USBMode.h"\r
 \r

diff --git a/LUFA/Drivers/USB/Class/MassStorage.h b/LUFA/Drivers/USB/Class/MassStorage.h
index 9f123e2..ccc48f3 100644 (file)
--- a/LUFA/Drivers/USB/Class/MassStorage.h
+++ b/LUFA/Drivers/USB/Class/MassStorage.h
@@ -50,6 +50,10 @@
 #ifndef _MS_CLASS_H_\r
 #define _MS_CLASS_H_\r
 \r
+       /* Macros: */\r
+               #define __INCLUDE_FROM_MS_DRIVER\r
+               #define __INCLUDE_FROM_USB_DRIVER\r
+               \r
        /* Includes: */\r
                #include "../HighLevel/USBMode.h"\r
 \r

diff --git a/LUFA/Drivers/USB/Class/Printer.h b/LUFA/Drivers/USB/Class/Printer.h
index 9f852e0..0de231d 100644 (file)
--- a/LUFA/Drivers/USB/Class/Printer.h
+++ b/LUFA/Drivers/USB/Class/Printer.h
@@ -51,6 +51,10 @@
 #ifndef _PRINTER_CLASS_H_\r
 #define _PRINTER_CLASS_H_\r
 \r
+       /* Macros: */\r
+               #define __INCLUDE_FROM_PRINTER_DRIVER\r
+               #define __INCLUDE_FROM_USB_DRIVER\r
+\r
        /* Includes: */\r
                #include "../HighLevel/USBMode.h"\r
                \r

diff --git a/LUFA/Drivers/USB/Class/RNDIS.h b/LUFA/Drivers/USB/Class/RNDIS.h
index 2dc3e7d..8fd6d16 100644 (file)
--- a/LUFA/Drivers/USB/Class/RNDIS.h
+++ b/LUFA/Drivers/USB/Class/RNDIS.h
@@ -50,6 +50,10 @@
 #ifndef _RNDIS_CLASS_H_\r
 #define _RNDIS_CLASS_H_\r
 \r
+       /* Macros: */\r
+               #define __INCLUDE_FROM_RNDIS_DRIVER\r
+               #define __INCLUDE_FROM_USB_DRIVER\r
+               \r
        /* Includes: */\r
                #include "../HighLevel/USBMode.h"\r
 \r

diff --git a/LUFA/Drivers/USB/Class/StillImage.h b/LUFA/Drivers/USB/Class/StillImage.h
index 6e65d9e..1ba5ff7 100644 (file)
--- a/LUFA/Drivers/USB/Class/StillImage.h
+++ b/LUFA/Drivers/USB/Class/StillImage.h
@@ -49,6 +49,10 @@
 #ifndef _SI_CLASS_H_\r
 #define _SI_CLASS_H_\r
 \r
+       /* Macros: */\r
+               #define __INCLUDE_FROM_SI_DRIVER\r
+               #define __INCLUDE_FROM_USB_DRIVER\r
+               \r
        /* Includes: */\r
                #include "../HighLevel/USBMode.h"\r
                \r

diff --git a/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c b/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c
index 6dd36cd..270a98a 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c
+++ b/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c
@@ -28,6 +28,7 @@
   this software.\r
 */\r
 \r
+#define  __INCLUDE_FROM_USB_DRIVER\r
 #include "ConfigDescriptor.h"\r
 \r
 #if defined(USB_CAN_BE_HOST)\r

diff --git a/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.h b/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.h
index df5109d..454f0b6 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.h
+++ b/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.h
@@ -59,6 +59,11 @@
                        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.h instead.\r
+               #endif\r
+               \r
        /* Public Interface - May be used in end-application: */        \r
                /* Macros: */\r
                        /** Mask for determining the type of an endpoint from an endpoint descriptor. This should then be compared\r

diff --git a/LUFA/Drivers/USB/HighLevel/Events.c b/LUFA/Drivers/USB/HighLevel/Events.c
index dcf9fcc..4d99907 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/Events.c
+++ b/LUFA/Drivers/USB/HighLevel/Events.c
@@ -28,9 +28,8 @@
   this software.\r
 */\r
 \r
-#include "USBMode.h"\r
-\r
-#define  INCLUDE_FROM_EVENTS_C\r
+#define  __INCLUDE_FROM_EVENTS_C\r
+#define  __INCLUDE_FROM_USB_DRIVER\r
 #include "Events.h"\r
 \r
 void USB_Event_Stub(void)\r

diff --git a/LUFA/Drivers/USB/HighLevel/Events.h b/LUFA/Drivers/USB/HighLevel/Events.h
index 08727d7..12b30b2 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
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_USB_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/USB.h instead.\r
+               #endif\r
+               \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
@@ -287,7 +292,7 @@
        /* 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

diff --git a/LUFA/Drivers/USB/HighLevel/StdDescriptors.h b/LUFA/Drivers/USB/HighLevel/StdDescriptors.h
index 404a44f..807eb78 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/StdDescriptors.h
+++ b/LUFA/Drivers/USB/HighLevel/StdDescriptors.h
@@ -58,6 +58,11 @@
                        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.h instead.\r
+               #endif\r
+               \r
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r
                        /** Indicates that a given descriptor does not exist in the device. This can be used inside descriptors\r

diff --git a/LUFA/Drivers/USB/HighLevel/StdRequestType.h b/LUFA/Drivers/USB/HighLevel/StdRequestType.h
index a887b5c..4fad037 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/StdRequestType.h
+++ b/LUFA/Drivers/USB/HighLevel/StdRequestType.h
@@ -40,6 +40,11 @@
 #ifndef __STDREQTYPE_H__\r
 #define __STDREQTYPE_H__\r
 \r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_USB_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/USB.h instead.\r
+               #endif\r
+               \r
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r
                        /** Mask for the request type parameter, to indicate the direction of the request data (Host to Device\r

diff --git a/LUFA/Drivers/USB/HighLevel/StreamCallbacks.h b/LUFA/Drivers/USB/HighLevel/StreamCallbacks.h
index c502330..3d30655 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/StreamCallbacks.h
+++ b/LUFA/Drivers/USB/HighLevel/StreamCallbacks.h
@@ -41,6 +41,11 @@
 #ifndef __STREAMCALLBACK_H__\r
 #define __STREAMCALLBACK_H__\r
 \r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_USB_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/USB.h instead.\r
+               #endif\r
+               \r
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r
                        /** Used with the Endpoint and Pipe stream functions as the callback function parameter, indicating that the stream\r

diff --git a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
index ee6d16e..f8da7e6 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
+++ b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
@@ -28,6 +28,7 @@
   this software.\r
 */\r
 \r
+#define  __INCLUDE_FROM_USB_DRIVER\r
 #include "USBInterrupt.h"\r
 \r
 void USB_INT_DisableAllInterrupts(void)\r

diff --git a/LUFA/Drivers/USB/HighLevel/USBInterrupt.h b/LUFA/Drivers/USB/HighLevel/USBInterrupt.h
index 5aa10db..6ff7c70 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBInterrupt.h
+++ b/LUFA/Drivers/USB/HighLevel/USBInterrupt.h
@@ -45,6 +45,11 @@
                        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.h instead.\r
+               #endif\r
+               \r
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r
                /* Macros: */\r

diff --git a/LUFA/Drivers/USB/HighLevel/USBMode.h b/LUFA/Drivers/USB/HighLevel/USBMode.h
index 0f2ecab..ba2d453 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBMode.h
+++ b/LUFA/Drivers/USB/HighLevel/USBMode.h
@@ -43,6 +43,11 @@
 #ifndef __USBMODE_H__\r
 #define __USBMODE_H__\r
 \r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_USB_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/USB.h instead.\r
+               #endif\r
+               \r
        /* Public Interface - May be used in end-application: */\r
        #if defined(__DOXYGEN__)\r
                /** Indicates that the target AVR microcontroller belongs to the Series 2 USB controller\r

diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.c b/LUFA/Drivers/USB/HighLevel/USBTask.c
index af3d7da..afddcc1 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBTask.c
+++ b/LUFA/Drivers/USB/HighLevel/USBTask.c
@@ -28,9 +28,8 @@
   this software.\r
 */\r
 \r
-#include "USBMode.h"\r
-\r
-#define  INCLUDE_FROM_USBTASK_C\r
+#define  __INCLUDE_FROM_USBTASK_C\r
+#define  __INCLUDE_FROM_USB_DRIVER\r
 #include "USBTask.h"\r
 \r
 volatile bool        USB_IsInitialized;\r

diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.h b/LUFA/Drivers/USB/HighLevel/USBTask.h
index 68d04af..c01b84c 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBTask.h
+++ b/LUFA/Drivers/USB/HighLevel/USBTask.h
@@ -54,6 +54,11 @@
                #if defined(__cplusplus)\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.h instead.\r
+               #endif\r
                \r
        /* Public Interface - May be used in end-application: */\r
                /* Global Variables: */\r
@@ -164,7 +169,7 @@
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r
                /* Function Prototypes: */\r
-                       #if defined(INCLUDE_FROM_USBTASK_C)\r
+                       #if defined(__INCLUDE_FROM_USBTASK_C)\r
                                #if defined(USB_CAN_BE_HOST)\r
                                        static void USB_HostTask(void);\r
                                #endif\r

diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.c b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
index 3118302..7d9e815 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
@@ -28,11 +28,12 @@
   this software.\r
 */\r
 \r
+#define  __INCLUDE_FROM_USB_DRIVER\r
 #include "../HighLevel/USBMode.h"\r
 \r
 #if defined(USB_CAN_BE_DEVICE)\r
 \r
-#define  INCLUDE_FROM_DEVCHAPTER9_C\r
+#define  __INCLUDE_FROM_DEVCHAPTER9_C\r
 #include "DevChapter9.h"\r
 \r
 uint8_t USB_ConfigurationNumber;\r

diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.h b/LUFA/Drivers/USB/LowLevel/DevChapter9.h
index 3d49062..58a5dc8 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.h
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.h
@@ -48,6 +48,11 @@
                        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.h instead.\r
+               #endif\r
+               \r
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r
                        #if defined(USE_SINGLE_DEVICE_CONFIGURATION)\r
@@ -124,7 +129,7 @@
                /* Function Prototypes: */\r
                        void USB_Device_ProcessControlRequest(void);\r
                        \r
-                       #if defined(INCLUDE_FROM_DEVCHAPTER9_C)\r
+                       #if defined(__INCLUDE_FROM_DEVCHAPTER9_C)\r
                                static void USB_Device_SetAddress(void);\r
                                static void USB_Device_SetConfiguration(void);\r
                                static void USB_Device_GetConfiguration(void);\r

diff --git a/LUFA/Drivers/USB/LowLevel/Device.h b/LUFA/Drivers/USB/LowLevel/Device.h
index 110adad..1f929bf 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Device.h
+++ b/LUFA/Drivers/USB/LowLevel/Device.h
@@ -52,6 +52,10 @@
                #if (defined(USE_RAM_DESCRIPTORS) && defined(USE_EEPROM_DESCRIPTORS))\r
                        #error USE_RAM_DESCRIPTORS and USE_EEPROM_DESCRIPTORS are mutually exclusive.\r
                #endif\r
+\r
+               #if !defined(__INCLUDE_FROM_USB_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/USB.h instead.\r
+               #endif\r
                        \r
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r

diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.c b/LUFA/Drivers/USB/LowLevel/Endpoint.c
index 03be118..81fef1c 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Endpoint.c
+++ b/LUFA/Drivers/USB/LowLevel/Endpoint.c
@@ -28,11 +28,12 @@
   this software.\r
 */\r
 \r
+#define  __INCLUDE_FROM_USB_DRIVER\r
 #include "../HighLevel/USBMode.h"\r
 \r
 #if defined(USB_CAN_BE_DEVICE)\r
 \r
-#define  INCLUDE_FROM_ENDPOINT_C\r
+#define  __INCLUDE_FROM_ENDPOINT_C\r
 #include "Endpoint.h"\r
 \r
 #if !defined(FIXED_CONTROL_ENDPOINT_SIZE)\r

diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.h b/LUFA/Drivers/USB/LowLevel/Endpoint.h
index b0934f5..6d98b78 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Endpoint.h
+++ b/LUFA/Drivers/USB/LowLevel/Endpoint.h
@@ -83,6 +83,11 @@
                        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.h instead.\r
+               #endif\r
+               \r
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r
                        /** Endpoint data direction mask for \ref Endpoint_ConfigureEndpoint(). This indicates that the endpoint\r

diff --git a/LUFA/Drivers/USB/LowLevel/Host.c b/LUFA/Drivers/USB/LowLevel/Host.c
index a5452fd..e227fd1 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Host.c
+++ b/LUFA/Drivers/USB/LowLevel/Host.c
@@ -28,11 +28,12 @@
   this software.\r
 */\r
 \r
+#define  __INCLUDE_FROM_USB_DRIVER\r
 #include "../HighLevel/USBMode.h"\r
 \r
 #if defined(USB_CAN_BE_HOST)\r
 \r
-#define  INCLUDE_FROM_HOST_C\r
+#define  __INCLUDE_FROM_HOST_C\r
 #include "Host.h"\r
 \r
 void USB_Host_ProcessNextHostState(void)\r

diff --git a/LUFA/Drivers/USB/LowLevel/Host.h b/LUFA/Drivers/USB/LowLevel/Host.h
index 07ff0fc..5672dd5 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Host.h
+++ b/LUFA/Drivers/USB/LowLevel/Host.h
@@ -55,6 +55,11 @@
                        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.h instead.\r
+               #endif\r
+               \r
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r
                        /** Indicates the fixed USB device address which any attached device is enumerated to when in\r
@@ -397,7 +402,7 @@
                        void    USB_Host_ProcessNextHostState(void);\r
                        uint8_t USB_Host_WaitMS(uint8_t MS);\r
                        \r
-                       #if defined(INCLUDE_FROM_HOST_C)\r
+                       #if defined(__INCLUDE_FROM_HOST_C)\r
                                static void USB_Host_ResetDevice(void);\r
                        #endif\r
        #endif\r

diff --git a/LUFA/Drivers/USB/LowLevel/HostChapter9.c b/LUFA/Drivers/USB/LowLevel/HostChapter9.c
index ff7ed86..e5072c8 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/HostChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/HostChapter9.c
@@ -28,11 +28,12 @@
   this software.\r
 */\r
 \r
+#define  __INCLUDE_FROM_USB_DRIVER\r
 #include "../HighLevel/USBMode.h"\r
 \r
 #if defined(USB_CAN_BE_HOST)\r
 \r
-#define  INCLUDE_FROM_HOSTCHAPTER9_C\r
+#define  __INCLUDE_FROM_HOSTCHAPTER9_C\r
 #include "HostChapter9.h"\r
 \r
 uint8_t USB_Host_SendControlRequest(void* BufferPtr)\r

diff --git a/LUFA/Drivers/USB/LowLevel/HostChapter9.h b/LUFA/Drivers/USB/LowLevel/HostChapter9.h
index fc8dfe2..1a85cf6 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/HostChapter9.h
+++ b/LUFA/Drivers/USB/LowLevel/HostChapter9.h
@@ -44,6 +44,11 @@
                        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.h instead.\r
+               #endif\r
+               \r
        /* Public Interface - May be used in end-application: */\r
                /* Enums: */\r
                        /** Enum for the \ref USB_Host_SendControlRequest() return code, indicating the reason for the error\r
@@ -89,7 +94,7 @@
                        };\r
        \r
                /* Function Prototypes: */\r
-                       #if defined(INCLUDE_FROM_HOSTCHAPTER9_C)\r
+                       #if defined(__INCLUDE_FROM_HOSTCHAPTER9_C)\r
                                static uint8_t USB_Host_WaitForIOS(const uint8_t WaitType);\r
                        #endif\r
        #endif\r

diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.c b/LUFA/Drivers/USB/LowLevel/LowLevel.c
index b49c5b8..f4f277c 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/LowLevel.c
+++ b/LUFA/Drivers/USB/LowLevel/LowLevel.c
@@ -28,6 +28,7 @@
   this software.\r
 */\r
 \r
+#define  __INCLUDE_FROM_USB_DRIVER\r
 #include "LowLevel.h"\r
 \r
 #if (!defined(USB_HOST_ONLY) && !defined(USB_DEVICE_ONLY))\r

diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.h b/LUFA/Drivers/USB/LowLevel/LowLevel.h
index dc01d24..1a92d47 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/LowLevel.h
+++ b/LUFA/Drivers/USB/LowLevel/LowLevel.h
@@ -70,6 +70,10 @@
                #endif\r
 \r
        /* Preprocessor Checks and Defines: */\r
+               #if !defined(__INCLUDE_FROM_USB_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/USB.h instead.\r
+               #endif\r
+\r
                #if !defined(F_CLOCK)\r
                        #error F_CLOCK is not defined. You must define F_CLOCK to the frequency of the unprescaled input clock in your project makefile.\r
                #endif\r

diff --git a/LUFA/Drivers/USB/LowLevel/OTG.h b/LUFA/Drivers/USB/LowLevel/OTG.h
index 9cce2e6..25cb180 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/OTG.h
+++ b/LUFA/Drivers/USB/LowLevel/OTG.h
@@ -47,6 +47,11 @@
                \r
                #include "../../../Common/Common.h"\r
 \r
+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_USB_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/USB.h instead.\r
+               #endif\r
+               \r
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r
                        /** Mask for the VBUS pulsing method of SRP, supported by some OTG devices.\r

diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.c b/LUFA/Drivers/USB/LowLevel/Pipe.c
index 2b956a8..78c82e8 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Pipe.c
+++ b/LUFA/Drivers/USB/LowLevel/Pipe.c
@@ -28,11 +28,12 @@
   this software.\r
 */\r
 \r
+#define  __INCLUDE_FROM_USB_DRIVER\r
 #include "../HighLevel/USBMode.h"\r
 \r
 #if defined(USB_CAN_BE_HOST)\r
 \r
-#define  INCLUDE_FROM_PIPE_C\r
+#define  __INCLUDE_FROM_PIPE_C\r
 #include "Pipe.h"\r
 \r
 uint8_t USB_ControlPipeSize = PIPE_CONTROLPIPE_DEFAULT_SIZE;\r

diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.h b/LUFA/Drivers/USB/LowLevel/Pipe.h
index 16b5ea6..3e25d49 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Pipe.h
+++ b/LUFA/Drivers/USB/LowLevel/Pipe.h
@@ -91,6 +91,11 @@
                        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.h instead.\r
+               #endif\r
+               \r
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r
                        /** Mask for \ref Pipe_GetErrorFlags(), indicating that an overflow error occurred in the pipe on the received data. */\r

diff --git a/LUFA/Drivers/USB/USB.h b/LUFA/Drivers/USB/USB.h
index a632f52..3bc356d 100644 (file)
--- a/LUFA/Drivers/USB/USB.h
+++ b/LUFA/Drivers/USB/USB.h
@@ -350,6 +350,11 @@
 #ifndef __USB_H__\r
 #define __USB_H__\r
 \r
+       /* Macros: */\r
+               #if !defined(__DOXYGEN__)\r
+                       #define __INCLUDE_FROM_USB_DRIVER\r
+               #endif\r
+\r
        /* Includes: */\r
                #include "HighLevel/USBMode.h"\r
 \r