From d49cc0f7830319e701294e19937fae4de26ae8e2 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Thu, 11 Feb 2010 04:05:02 +0000 Subject: [PATCH] Add more include protection macros to give the user warnings when they try to manually include private driver header files, instead of the public driver headers. --- LUFA/Doxygen.conf | 3 +-- LUFA/DriverStubs/Buttons.h | 2 +- LUFA/DriverStubs/Dataflash.h | 2 +- LUFA/DriverStubs/Joystick.h | 2 +- LUFA/DriverStubs/LEDs.h | 2 +- LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h | 2 +- LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h | 2 +- LUFA/Drivers/Board/BUMBLEB/Buttons.h | 2 +- LUFA/Drivers/Board/BUMBLEB/Joystick.h | 2 +- LUFA/Drivers/Board/BUMBLEB/LEDs.h | 2 +- LUFA/Drivers/Board/Buttons.h | 1 + LUFA/Drivers/Board/Dataflash.h | 1 + LUFA/Drivers/Board/EVK527/Buttons.h | 2 +- LUFA/Drivers/Board/EVK527/Dataflash.h | 2 +- LUFA/Drivers/Board/EVK527/Joystick.h | 2 +- LUFA/Drivers/Board/EVK527/LEDs.h | 2 +- LUFA/Drivers/Board/Joystick.h | 1 + LUFA/Drivers/Board/LEDs.h | 1 + LUFA/Drivers/Board/RZUSBSTICK/LEDs.h | 2 +- LUFA/Drivers/Board/STK525/Buttons.h | 2 +- LUFA/Drivers/Board/STK525/Dataflash.h | 2 +- LUFA/Drivers/Board/STK525/Joystick.h | 2 +- LUFA/Drivers/Board/STK525/LEDs.h | 2 +- LUFA/Drivers/Board/STK526/Buttons.h | 2 +- LUFA/Drivers/Board/STK526/Dataflash.h | 2 +- LUFA/Drivers/Board/STK526/Joystick.h | 2 +- LUFA/Drivers/Board/STK526/LEDs.h | 2 +- LUFA/Drivers/Board/Temperature.h | 5 ----- LUFA/Drivers/Board/USBKEY/Buttons.h | 2 +- LUFA/Drivers/Board/USBKEY/Dataflash.h | 2 +- LUFA/Drivers/Board/USBKEY/Joystick.h | 2 +- LUFA/Drivers/Board/USBKEY/LEDs.h | 2 +- LUFA/Drivers/Board/XPLAIN/Dataflash.h | 2 +- LUFA/Drivers/Board/XPLAIN/LEDs.h | 2 +- LUFA/Drivers/Peripheral/ADC.h | 3 +-- LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h | 2 +- LUFA/Drivers/Peripheral/AVRU4U6U7/TWI.h | 2 +- LUFA/Drivers/Peripheral/SerialStream.c | 2 +- LUFA/Drivers/Peripheral/SerialStream.h | 2 +- LUFA/Drivers/Peripheral/TWI.h | 3 +-- LUFA/Drivers/USB/Class/Audio.h | 4 ++++ LUFA/Drivers/USB/Class/CDC.h | 4 ++++ LUFA/Drivers/USB/Class/Common/Audio.h | 5 +++++ LUFA/Drivers/USB/Class/Common/CDC.h | 5 +++++ LUFA/Drivers/USB/Class/Common/HID.h | 5 +++++ LUFA/Drivers/USB/Class/Common/MIDI.h | 8 ++++++++ LUFA/Drivers/USB/Class/Common/MassStorage.h | 5 +++++ LUFA/Drivers/USB/Class/Common/Printer.h | 7 ++++++- LUFA/Drivers/USB/Class/Common/RNDIS.h | 10 +++++++++- LUFA/Drivers/USB/Class/Common/StillImage.h | 5 +++++ LUFA/Drivers/USB/Class/Device/Audio.c | 2 ++ LUFA/Drivers/USB/Class/Device/Audio.h | 5 +++++ LUFA/Drivers/USB/Class/Device/CDC.c | 4 +++- LUFA/Drivers/USB/Class/Device/CDC.h | 7 ++++++- LUFA/Drivers/USB/Class/Device/HID.c | 2 ++ LUFA/Drivers/USB/Class/Device/HID.h | 5 +++++ LUFA/Drivers/USB/Class/Device/MIDI.c | 2 ++ LUFA/Drivers/USB/Class/Device/MIDI.h | 6 +++++- LUFA/Drivers/USB/Class/Device/MassStorage.c | 4 +++- LUFA/Drivers/USB/Class/Device/MassStorage.h | 7 ++++++- LUFA/Drivers/USB/Class/Device/RNDIS.c | 4 +++- LUFA/Drivers/USB/Class/Device/RNDIS.h | 7 ++++++- LUFA/Drivers/USB/Class/HID.h | 4 ++++ LUFA/Drivers/USB/Class/Host/CDC.c | 4 +++- LUFA/Drivers/USB/Class/Host/CDC.h | 7 ++++++- LUFA/Drivers/USB/Class/Host/HID.c | 4 +++- LUFA/Drivers/USB/Class/Host/HID.h | 7 ++++++- LUFA/Drivers/USB/Class/Host/HIDParser.c | 1 + LUFA/Drivers/USB/Class/Host/HIDParser.h | 4 ++++ LUFA/Drivers/USB/Class/Host/MIDI.c | 4 +++- LUFA/Drivers/USB/Class/Host/MIDI.h | 7 ++++++- LUFA/Drivers/USB/Class/Host/MassStorage.c | 4 +++- LUFA/Drivers/USB/Class/Host/MassStorage.h | 7 ++++++- LUFA/Drivers/USB/Class/Host/Printer.c | 4 +++- LUFA/Drivers/USB/Class/Host/Printer.h | 9 ++++++--- LUFA/Drivers/USB/Class/Host/RNDIS.c | 4 +++- LUFA/Drivers/USB/Class/Host/RNDIS.h | 7 ++++++- LUFA/Drivers/USB/Class/Host/StillImage.c | 4 +++- LUFA/Drivers/USB/Class/Host/StillImage.h | 7 ++++++- LUFA/Drivers/USB/Class/MIDI.h | 4 ++++ LUFA/Drivers/USB/Class/MassStorage.h | 4 ++++ LUFA/Drivers/USB/Class/Printer.h | 4 ++++ LUFA/Drivers/USB/Class/RNDIS.h | 4 ++++ LUFA/Drivers/USB/Class/StillImage.h | 4 ++++ LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c | 1 + LUFA/Drivers/USB/HighLevel/ConfigDescriptor.h | 5 +++++ LUFA/Drivers/USB/HighLevel/Events.c | 5 ++--- LUFA/Drivers/USB/HighLevel/Events.h | 9 +++++++-- LUFA/Drivers/USB/HighLevel/StdDescriptors.h | 5 +++++ LUFA/Drivers/USB/HighLevel/StdRequestType.h | 5 +++++ LUFA/Drivers/USB/HighLevel/StreamCallbacks.h | 5 +++++ LUFA/Drivers/USB/HighLevel/USBInterrupt.c | 1 + LUFA/Drivers/USB/HighLevel/USBInterrupt.h | 5 +++++ LUFA/Drivers/USB/HighLevel/USBMode.h | 5 +++++ LUFA/Drivers/USB/HighLevel/USBTask.c | 5 ++--- LUFA/Drivers/USB/HighLevel/USBTask.h | 7 ++++++- LUFA/Drivers/USB/LowLevel/DevChapter9.c | 3 ++- LUFA/Drivers/USB/LowLevel/DevChapter9.h | 7 ++++++- LUFA/Drivers/USB/LowLevel/Device.h | 4 ++++ LUFA/Drivers/USB/LowLevel/Endpoint.c | 3 ++- LUFA/Drivers/USB/LowLevel/Endpoint.h | 5 +++++ LUFA/Drivers/USB/LowLevel/Host.c | 3 ++- LUFA/Drivers/USB/LowLevel/Host.h | 7 ++++++- LUFA/Drivers/USB/LowLevel/HostChapter9.c | 3 ++- LUFA/Drivers/USB/LowLevel/HostChapter9.h | 7 ++++++- LUFA/Drivers/USB/LowLevel/LowLevel.c | 1 + LUFA/Drivers/USB/LowLevel/LowLevel.h | 4 ++++ LUFA/Drivers/USB/LowLevel/OTG.h | 5 +++++ LUFA/Drivers/USB/LowLevel/Pipe.c | 3 ++- LUFA/Drivers/USB/LowLevel/Pipe.h | 5 +++++ LUFA/Drivers/USB/USB.h | 5 +++++ 111 files changed, 341 insertions(+), 85 deletions(-) diff --git a/LUFA/Doxygen.conf b/LUFA/Doxygen.conf index 5a15bd751e..387cd34db4 100644 --- a/LUFA/Doxygen.conf +++ b/LUFA/Doxygen.conf @@ -636,8 +636,7 @@ EXCLUDE_PATTERNS = # wildcard * is used, a substring. Examples: ANamespace, AClass, # AClass::ANamespace, ANamespace::*Test -EXCLUDE_SYMBOLS = __* \ - INCLUDE_FROM_* +EXCLUDE_SYMBOLS = __* # The EXAMPLE_PATH tag can be used to specify one or more files or # directories that contain example code fragments that are included (see diff --git a/LUFA/DriverStubs/Buttons.h b/LUFA/DriverStubs/Buttons.h index bd45f40cab..deab56e9ef 100644 --- a/LUFA/DriverStubs/Buttons.h +++ b/LUFA/DriverStubs/Buttons.h @@ -54,7 +54,7 @@ #endif /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_BUTTONS_H) + #if !defined(__INCLUDE_FROM_BUTTONS_H) #error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead. #endif diff --git a/LUFA/DriverStubs/Dataflash.h b/LUFA/DriverStubs/Dataflash.h index 0f7a6c3489..10eafa2a30 100644 --- a/LUFA/DriverStubs/Dataflash.h +++ b/LUFA/DriverStubs/Dataflash.h @@ -46,7 +46,7 @@ // TODO: Add any required includes here /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_DATAFLASH_H) + #if !defined(__INCLUDE_FROM_DATAFLASH_H) #error Do not include this file directly. Include LUFA/Drivers/Board/Dataflash.h instead. #endif diff --git a/LUFA/DriverStubs/Joystick.h b/LUFA/DriverStubs/Joystick.h index 7911308f05..21e306f1e6 100644 --- a/LUFA/DriverStubs/Joystick.h +++ b/LUFA/DriverStubs/Joystick.h @@ -54,7 +54,7 @@ #endif /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_JOYSTICK_H) + #if !defined(__INCLUDE_FROM_JOYSTICK_H) #error Do not include this file directly. Include LUFA/Drivers/Board/Joystick.h instead. #endif diff --git a/LUFA/DriverStubs/LEDs.h b/LUFA/DriverStubs/LEDs.h index dcce4bce22..6bdc847d15 100644 --- a/LUFA/DriverStubs/LEDs.h +++ b/LUFA/DriverStubs/LEDs.h @@ -53,7 +53,7 @@ #endif /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_LEDS_H) + #if !defined(__INCLUDE_FROM_LEDS_H) #error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead. #endif diff --git a/LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h b/LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h index 008cca169d..af95a894b7 100644 --- a/LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h +++ b/LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h @@ -62,7 +62,7 @@ #endif /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_BUTTONS_H) + #if !defined(__INCLUDE_FROM_BUTTONS_H) #error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead. #endif diff --git a/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h b/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h index 2b8075b022..2208f2e401 100644 --- a/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h +++ b/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h @@ -61,7 +61,7 @@ #endif /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_LEDS_H) + #if !defined(__INCLUDE_FROM_LEDS_H) #error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead. #endif diff --git a/LUFA/Drivers/Board/BUMBLEB/Buttons.h b/LUFA/Drivers/Board/BUMBLEB/Buttons.h index 2407053524..e0a5cc5a9a 100644 --- a/LUFA/Drivers/Board/BUMBLEB/Buttons.h +++ b/LUFA/Drivers/Board/BUMBLEB/Buttons.h @@ -64,7 +64,7 @@ #endif /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_BUTTONS_H) + #if !defined(__INCLUDE_FROM_BUTTONS_H) #error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead. #endif diff --git a/LUFA/Drivers/Board/BUMBLEB/Joystick.h b/LUFA/Drivers/Board/BUMBLEB/Joystick.h index 4ab98ae7fe..5d57ec5597 100644 --- a/LUFA/Drivers/Board/BUMBLEB/Joystick.h +++ b/LUFA/Drivers/Board/BUMBLEB/Joystick.h @@ -63,7 +63,7 @@ #endif /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_JOYSTICK_H) + #if !defined(__INCLUDE_FROM_JOYSTICK_H) #error Do not include this file directly. Include LUFA/Drivers/Board/Joystick.h instead. #endif diff --git a/LUFA/Drivers/Board/BUMBLEB/LEDs.h b/LUFA/Drivers/Board/BUMBLEB/LEDs.h index 344a26e9c0..549bbde62a 100644 --- a/LUFA/Drivers/Board/BUMBLEB/LEDs.h +++ b/LUFA/Drivers/Board/BUMBLEB/LEDs.h @@ -63,7 +63,7 @@ #endif /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_LEDS_H) + #if !defined(__INCLUDE_FROM_LEDS_H) #error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead. #endif diff --git a/LUFA/Drivers/Board/Buttons.h b/LUFA/Drivers/Board/Buttons.h index 4e7588c286..d908fd43a4 100644 --- a/LUFA/Drivers/Board/Buttons.h +++ b/LUFA/Drivers/Board/Buttons.h @@ -63,6 +63,7 @@ /* Macros: */ #if !defined(__DOXYGEN__) + #define __INCLUDE_FROM_BUTTONS_H #define INCLUDE_FROM_BUTTONS_H #endif diff --git a/LUFA/Drivers/Board/Dataflash.h b/LUFA/Drivers/Board/Dataflash.h index 0197b3e2f2..762142c33c 100644 --- a/LUFA/Drivers/Board/Dataflash.h +++ b/LUFA/Drivers/Board/Dataflash.h @@ -62,6 +62,7 @@ /* Macros: */ #if !defined(__DOXYGEN__) + #define __INCLUDE_FROM_DATAFLASH_H #define INCLUDE_FROM_DATAFLASH_H #endif diff --git a/LUFA/Drivers/Board/EVK527/Buttons.h b/LUFA/Drivers/Board/EVK527/Buttons.h index cb8cdc5fd0..0150fa151e 100644 --- a/LUFA/Drivers/Board/EVK527/Buttons.h +++ b/LUFA/Drivers/Board/EVK527/Buttons.h @@ -68,7 +68,7 @@ #endif /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_BUTTONS_H) + #if !defined(__INCLUDE_FROM_BUTTONS_H) #error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead. #endif diff --git a/LUFA/Drivers/Board/EVK527/Dataflash.h b/LUFA/Drivers/Board/EVK527/Dataflash.h index b6a6e25d8a..25a338cec3 100644 --- a/LUFA/Drivers/Board/EVK527/Dataflash.h +++ b/LUFA/Drivers/Board/EVK527/Dataflash.h @@ -54,7 +54,7 @@ #include "AT45DB321C.h" /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_DATAFLASH_H) + #if !defined(__INCLUDE_FROM_DATAFLASH_H) #error Do not include this file directly. Include LUFA/Drivers/Board/Dataflash.h instead. #endif diff --git a/LUFA/Drivers/Board/EVK527/Joystick.h b/LUFA/Drivers/Board/EVK527/Joystick.h index c9262a4828..7d208ea9fd 100644 --- a/LUFA/Drivers/Board/EVK527/Joystick.h +++ b/LUFA/Drivers/Board/EVK527/Joystick.h @@ -61,7 +61,7 @@ #endif /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_JOYSTICK_H) + #if !defined(__INCLUDE_FROM_JOYSTICK_H) #error Do not include this file directly. Include LUFA/Drivers/Board/Joystick.h instead. #endif diff --git a/LUFA/Drivers/Board/EVK527/LEDs.h b/LUFA/Drivers/Board/EVK527/LEDs.h index a1ba50d828..ea7c7c2c71 100644 --- a/LUFA/Drivers/Board/EVK527/LEDs.h +++ b/LUFA/Drivers/Board/EVK527/LEDs.h @@ -61,7 +61,7 @@ #endif /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_LEDS_H) + #if !defined(__INCLUDE_FROM_LEDS_H) #error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead. #endif diff --git a/LUFA/Drivers/Board/Joystick.h b/LUFA/Drivers/Board/Joystick.h index be9d267cce..39375a265f 100644 --- a/LUFA/Drivers/Board/Joystick.h +++ b/LUFA/Drivers/Board/Joystick.h @@ -62,6 +62,7 @@ /* Macros: */ #if !defined(__DOXYGEN__) + #define __INCLUDE_FROM_JOYSTICK_H #define INCLUDE_FROM_JOYSTICK_H #endif diff --git a/LUFA/Drivers/Board/LEDs.h b/LUFA/Drivers/Board/LEDs.h index 222be0e65c..94fbf3cf79 100644 --- a/LUFA/Drivers/Board/LEDs.h +++ b/LUFA/Drivers/Board/LEDs.h @@ -70,6 +70,7 @@ /* Macros: */ #if !defined(__DOXYGEN__) + #define __INCLUDE_FROM_LEDS_H #define INCLUDE_FROM_LEDS_H #endif diff --git a/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h b/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h index 088cd3aef4..d095d6e0f0 100644 --- a/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h +++ b/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h @@ -61,7 +61,7 @@ #endif /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_LEDS_H) + #if !defined(__INCLUDE_FROM_LEDS_H) #error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead. #endif diff --git a/LUFA/Drivers/Board/STK525/Buttons.h b/LUFA/Drivers/Board/STK525/Buttons.h index fbf4f58c1b..f3dccafd9a 100644 --- a/LUFA/Drivers/Board/STK525/Buttons.h +++ b/LUFA/Drivers/Board/STK525/Buttons.h @@ -68,7 +68,7 @@ #endif /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_BUTTONS_H) + #if !defined(__INCLUDE_FROM_BUTTONS_H) #error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead. #endif diff --git a/LUFA/Drivers/Board/STK525/Dataflash.h b/LUFA/Drivers/Board/STK525/Dataflash.h index cab1af838b..f541edbb75 100644 --- a/LUFA/Drivers/Board/STK525/Dataflash.h +++ b/LUFA/Drivers/Board/STK525/Dataflash.h @@ -54,7 +54,7 @@ #include "AT45DB321C.h" /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_DATAFLASH_H) + #if !defined(__INCLUDE_FROM_DATAFLASH_H) #error Do not include this file directly. Include LUFA/Drivers/Board/Dataflash.h instead. #endif diff --git a/LUFA/Drivers/Board/STK525/Joystick.h b/LUFA/Drivers/Board/STK525/Joystick.h index 1cb270f3a6..6358f957e6 100644 --- a/LUFA/Drivers/Board/STK525/Joystick.h +++ b/LUFA/Drivers/Board/STK525/Joystick.h @@ -61,7 +61,7 @@ #endif /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_JOYSTICK_H) + #if !defined(__INCLUDE_FROM_JOYSTICK_H) #error Do not include this file directly. Include LUFA/Drivers/Board/Joystick.h instead. #endif diff --git a/LUFA/Drivers/Board/STK525/LEDs.h b/LUFA/Drivers/Board/STK525/LEDs.h index 39ffa0f8c8..b54a8c987d 100644 --- a/LUFA/Drivers/Board/STK525/LEDs.h +++ b/LUFA/Drivers/Board/STK525/LEDs.h @@ -61,7 +61,7 @@ #endif /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_LEDS_H) + #if !defined(__INCLUDE_FROM_LEDS_H) #error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead. #endif diff --git a/LUFA/Drivers/Board/STK526/Buttons.h b/LUFA/Drivers/Board/STK526/Buttons.h index 9aa798a6e8..f480560f65 100644 --- a/LUFA/Drivers/Board/STK526/Buttons.h +++ b/LUFA/Drivers/Board/STK526/Buttons.h @@ -68,7 +68,7 @@ #endif /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_BUTTONS_H) + #if !defined(__INCLUDE_FROM_BUTTONS_H) #error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead. #endif diff --git a/LUFA/Drivers/Board/STK526/Dataflash.h b/LUFA/Drivers/Board/STK526/Dataflash.h index ff89dce033..9d04afe4c5 100644 --- a/LUFA/Drivers/Board/STK526/Dataflash.h +++ b/LUFA/Drivers/Board/STK526/Dataflash.h @@ -54,7 +54,7 @@ #include "AT45DB642D.h" /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_DATAFLASH_H) + #if !defined(__INCLUDE_FROM_DATAFLASH_H) #error Do not include this file directly. Include LUFA/Drivers/Board/Dataflash.h instead. #endif diff --git a/LUFA/Drivers/Board/STK526/Joystick.h b/LUFA/Drivers/Board/STK526/Joystick.h index a40526a6ff..b095536aa7 100644 --- a/LUFA/Drivers/Board/STK526/Joystick.h +++ b/LUFA/Drivers/Board/STK526/Joystick.h @@ -61,7 +61,7 @@ #endif /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_JOYSTICK_H) + #if !defined(__INCLUDE_FROM_JOYSTICK_H) #error Do not include this file directly. Include LUFA/Drivers/Board/Joystick.h instead. #endif diff --git a/LUFA/Drivers/Board/STK526/LEDs.h b/LUFA/Drivers/Board/STK526/LEDs.h index 4e68d61846..d1ac493adb 100644 --- a/LUFA/Drivers/Board/STK526/LEDs.h +++ b/LUFA/Drivers/Board/STK526/LEDs.h @@ -61,7 +61,7 @@ #endif /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_LEDS_H) + #if !defined(__INCLUDE_FROM_LEDS_H) #error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead. #endif diff --git a/LUFA/Drivers/Board/Temperature.h b/LUFA/Drivers/Board/Temperature.h index 86e0b66f07..7a5af367b9 100644 --- a/LUFA/Drivers/Board/Temperature.h +++ b/LUFA/Drivers/Board/Temperature.h @@ -52,11 +52,6 @@ #ifndef __TEMPERATURE_H__ #define __TEMPERATURE_H__ - /* Macros: */ - #if !defined(__DOXYGEN__) - #define INCLUDE_FROM_BOARD_DRIVER - #endif - /* Includes: */ #include diff --git a/LUFA/Drivers/Board/USBKEY/Buttons.h b/LUFA/Drivers/Board/USBKEY/Buttons.h index 606fe81f80..db1391c8e1 100644 --- a/LUFA/Drivers/Board/USBKEY/Buttons.h +++ b/LUFA/Drivers/Board/USBKEY/Buttons.h @@ -62,7 +62,7 @@ #endif /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_BUTTONS_H) + #if !defined(__INCLUDE_FROM_BUTTONS_H) #error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead. #endif diff --git a/LUFA/Drivers/Board/USBKEY/Dataflash.h b/LUFA/Drivers/Board/USBKEY/Dataflash.h index 2ada300394..96cc3ad2d5 100644 --- a/LUFA/Drivers/Board/USBKEY/Dataflash.h +++ b/LUFA/Drivers/Board/USBKEY/Dataflash.h @@ -54,7 +54,7 @@ #include "AT45DB642D.h" /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_DATAFLASH_H) + #if !defined(__INCLUDE_FROM_DATAFLASH_H) #error Do not include this file directly. Include LUFA/Drivers/Board/Dataflash.h instead. #endif diff --git a/LUFA/Drivers/Board/USBKEY/Joystick.h b/LUFA/Drivers/Board/USBKEY/Joystick.h index bbb2a16636..b0829914b0 100644 --- a/LUFA/Drivers/Board/USBKEY/Joystick.h +++ b/LUFA/Drivers/Board/USBKEY/Joystick.h @@ -61,7 +61,7 @@ #endif /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_JOYSTICK_H) + #if !defined(__INCLUDE_FROM_JOYSTICK_H) #error Do not include this file directly. Include LUFA/Drivers/Board/Joystick.h instead. #endif diff --git a/LUFA/Drivers/Board/USBKEY/LEDs.h b/LUFA/Drivers/Board/USBKEY/LEDs.h index cccdc9390e..e1a5b23147 100644 --- a/LUFA/Drivers/Board/USBKEY/LEDs.h +++ b/LUFA/Drivers/Board/USBKEY/LEDs.h @@ -61,7 +61,7 @@ #endif /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_LEDS_H) + #if !defined(__INCLUDE_FROM_LEDS_H) #error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead. #endif diff --git a/LUFA/Drivers/Board/XPLAIN/Dataflash.h b/LUFA/Drivers/Board/XPLAIN/Dataflash.h index 045d596f12..a0e09c711b 100644 --- a/LUFA/Drivers/Board/XPLAIN/Dataflash.h +++ b/LUFA/Drivers/Board/XPLAIN/Dataflash.h @@ -54,7 +54,7 @@ #include "AT45DB642D.h" /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_DATAFLASH_H) + #if !defined(__INCLUDE_FROM_DATAFLASH_H) #error Do not include this file directly. Include LUFA/Drivers/Board/Dataflash.h instead. #endif diff --git a/LUFA/Drivers/Board/XPLAIN/LEDs.h b/LUFA/Drivers/Board/XPLAIN/LEDs.h index 36d8315b6c..add868d20b 100644 --- a/LUFA/Drivers/Board/XPLAIN/LEDs.h +++ b/LUFA/Drivers/Board/XPLAIN/LEDs.h @@ -61,7 +61,7 @@ #endif /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_LEDS_H) + #if !defined(__INCLUDE_FROM_LEDS_H) #error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead. #endif diff --git a/LUFA/Drivers/Peripheral/ADC.h b/LUFA/Drivers/Peripheral/ADC.h index 1a111697bd..982364368f 100644 --- a/LUFA/Drivers/Peripheral/ADC.h +++ b/LUFA/Drivers/Peripheral/ADC.h @@ -54,8 +54,7 @@ /* Macros: */ #if !defined(__DOXYGEN__) - #define INCLUDE_FROM_ADC_H - #define INCLUDE_FROM_CHIP_DRIVER + #define __INCLUDE_FROM_ADC_H #endif /* Includes: */ diff --git a/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h b/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h index a7414ec318..8b1b47df28 100644 --- a/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h +++ b/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h @@ -62,7 +62,7 @@ #endif /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_ADC_H) + #if !defined(__INCLUDE_FROM_ADC_H) #error Do not include this file directly. Include LUFA/Drivers/Peripheral/ADC.h instead. #endif diff --git a/LUFA/Drivers/Peripheral/AVRU4U6U7/TWI.h b/LUFA/Drivers/Peripheral/AVRU4U6U7/TWI.h index be905fe4e3..13db86e699 100644 --- a/LUFA/Drivers/Peripheral/AVRU4U6U7/TWI.h +++ b/LUFA/Drivers/Peripheral/AVRU4U6U7/TWI.h @@ -63,7 +63,7 @@ #endif /* Preprocessor Checks: */ - #if !defined(INCLUDE_FROM_TWI_H) + #if !defined(__INCLUDE_FROM_TWI_H) #error Do not include this file directly. Include LUFA/Drivers/Peripheral/TWI.h instead. #endif diff --git a/LUFA/Drivers/Peripheral/SerialStream.c b/LUFA/Drivers/Peripheral/SerialStream.c index c23d4e16ae..867160a3e6 100644 --- a/LUFA/Drivers/Peripheral/SerialStream.c +++ b/LUFA/Drivers/Peripheral/SerialStream.c @@ -28,7 +28,7 @@ this software. */ -#define INCLUDE_FROM_SERIALSTREAM_C +#define __INCLUDE_FROM_SERIALSTREAM_C #include "SerialStream.h" FILE USARTStream = FDEV_SETUP_STREAM(SerialStream_TxByte, SerialStream_RxByte, _FDEV_SETUP_RW); diff --git a/LUFA/Drivers/Peripheral/SerialStream.h b/LUFA/Drivers/Peripheral/SerialStream.h index e03ce4128c..feadd0a0ff 100644 --- a/LUFA/Drivers/Peripheral/SerialStream.h +++ b/LUFA/Drivers/Peripheral/SerialStream.h @@ -70,7 +70,7 @@ extern FILE USARTStream; /* Function Prototypes: */ - #if defined(INCLUDE_FROM_SERIALSTREAM_C) + #if defined(__INCLUDE_FROM_SERIALSTREAM_C) static int SerialStream_TxByte(char DataByte, FILE *Stream) ATTR_NON_NULL_PTR_ARG(2); static int SerialStream_RxByte(FILE *Stream) ATTR_NON_NULL_PTR_ARG(1); #endif diff --git a/LUFA/Drivers/Peripheral/TWI.h b/LUFA/Drivers/Peripheral/TWI.h index 7432a16918..29c0afe408 100644 --- a/LUFA/Drivers/Peripheral/TWI.h +++ b/LUFA/Drivers/Peripheral/TWI.h @@ -53,8 +53,7 @@ /* Macros: */ #if !defined(__DOXYGEN__) - #define INCLUDE_FROM_TWI_H - #define INCLUDE_FROM_CHIP_DRIVER + #define __INCLUDE_FROM_TWI_H #endif /* Includes: */ diff --git a/LUFA/Drivers/USB/Class/Audio.h b/LUFA/Drivers/USB/Class/Audio.h index 34e867233c..c6a926337f 100644 --- a/LUFA/Drivers/USB/Class/Audio.h +++ b/LUFA/Drivers/USB/Class/Audio.h @@ -49,6 +49,10 @@ #ifndef _AUDIO_CLASS_H_ #define _AUDIO_CLASS_H_ + /* Macros: */ + #define __INCLUDE_FROM_AUDIO_DRIVER + #define __INCLUDE_FROM_USB_DRIVER + /* Includes: */ #include "../HighLevel/USBMode.h" diff --git a/LUFA/Drivers/USB/Class/CDC.h b/LUFA/Drivers/USB/Class/CDC.h index 6b4c2c9893..cc49572b2a 100644 --- a/LUFA/Drivers/USB/Class/CDC.h +++ b/LUFA/Drivers/USB/Class/CDC.h @@ -50,6 +50,10 @@ #ifndef _CDC_CLASS_H_ #define _CDC_CLASS_H_ + /* Macros: */ + #define __INCLUDE_FROM_CDC_DRIVER + #define __INCLUDE_FROM_USB_DRIVER + /* Includes: */ #include "../HighLevel/USBMode.h" diff --git a/LUFA/Drivers/USB/Class/Common/Audio.h b/LUFA/Drivers/USB/Class/Common/Audio.h index 0e2c6928e3..5d19b6f420 100644 --- a/LUFA/Drivers/USB/Class/Common/Audio.h +++ b/LUFA/Drivers/USB/Class/Common/Audio.h @@ -51,6 +51,11 @@ extern "C" { #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_AUDIO_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/Class/Audio.h instead. + #endif + /* Macros: */ #if !defined(AUDIO_TOTAL_SAMPLE_RATES) || defined(__DOXYGEN__) /** Total number of discrete audio sample rates supported by the device. This value can be overridden by defining this diff --git a/LUFA/Drivers/USB/Class/Common/CDC.h b/LUFA/Drivers/USB/Class/Common/CDC.h index f6844979de..55f530ba97 100644 --- a/LUFA/Drivers/USB/Class/Common/CDC.h +++ b/LUFA/Drivers/USB/Class/Common/CDC.h @@ -51,6 +51,11 @@ extern "C" { #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_CDC_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/Class/CDC.h instead. + #endif + /* Macros: */ /** CDC Class specific request to get the current virtual serial port configuration settings. */ #define REQ_GetLineEncoding 0x21 diff --git a/LUFA/Drivers/USB/Class/Common/HID.h b/LUFA/Drivers/USB/Class/Common/HID.h index 5afaf48c95..33a5af4ac5 100644 --- a/LUFA/Drivers/USB/Class/Common/HID.h +++ b/LUFA/Drivers/USB/Class/Common/HID.h @@ -46,6 +46,11 @@ #include + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_HID_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/Class/HID.h instead. + #endif + /* Macros: */ /** HID Class Specific Request to get the current HID report from the device. */ #define REQ_GetReport 0x01 diff --git a/LUFA/Drivers/USB/Class/Common/MIDI.h b/LUFA/Drivers/USB/Class/Common/MIDI.h index d0813038e4..8eed101985 100644 --- 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_ #define _MIDI_CLASS_COMMON_H_ + /* Macros: */ + #define __INCLUDE_FROM_AUDIO_DRIVER + /* Includes: */ #include "../../USB.h" #include "Audio.h" @@ -52,6 +55,11 @@ extern "C" { #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_MIDI_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/Class/MIDI.h instead. + #endif + /* Macros: */ /** Audio class descriptor subtype value for a Audio class specific MIDI input jack descriptor. */ #define DSUBTYPE_InputJack 0x02 diff --git a/LUFA/Drivers/USB/Class/Common/MassStorage.h b/LUFA/Drivers/USB/Class/Common/MassStorage.h index 942d06b74b..8726148a2a 100644 --- a/LUFA/Drivers/USB/Class/Common/MassStorage.h +++ b/LUFA/Drivers/USB/Class/Common/MassStorage.h @@ -51,6 +51,11 @@ extern "C" { #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_MS_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/Class/MassStorage.h instead. + #endif + /* Macros: */ /** Mass Storage Class specific request to reset the Mass Storage interface, ready for the next command. */ #define REQ_MassStorageReset 0xFF diff --git a/LUFA/Drivers/USB/Class/Common/Printer.h b/LUFA/Drivers/USB/Class/Common/Printer.h index ea6f1abb03..06ec0bb0bc 100644 --- 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: */ #if defined(__cplusplus) extern "C" { - #endif + #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_PRINTER_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/Class/Printer.h instead. + #endif + /* Macros: */ /** Port status mask for a printer device, indicating that an error has *not* occurred. */ #define PRNT_PORTSTATUS_NOTERROR (1 << 3) diff --git a/LUFA/Drivers/USB/Class/Common/RNDIS.h b/LUFA/Drivers/USB/Class/Common/RNDIS.h index ef98ccd56a..258604debe 100644 --- 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_ #define _RNDIS_CLASS_COMMON_H_ + /* Macros: */ + #define __INCLUDE_FROM_CDC_DRIVER + /* Includes: */ #include "../../USB.h" - #include "CDC.h" #include "RNDISConstants.h" + #include "CDC.h" #include @@ -53,6 +56,11 @@ extern "C" { #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_RNDIS_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/Class/RNDIS.h instead. + #endif + /* Macros: */ /** Implemented RNDIS Version Major */ #define REMOTE_NDIS_VERSION_MAJOR 0x01 diff --git a/LUFA/Drivers/USB/Class/Common/StillImage.h b/LUFA/Drivers/USB/Class/Common/StillImage.h index bbdc0d0623..7b3df201ae 100644 --- a/LUFA/Drivers/USB/Class/Common/StillImage.h +++ b/LUFA/Drivers/USB/Class/Common/StillImage.h @@ -51,6 +51,11 @@ extern "C" { #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_SI_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/Class/StillImage.h instead. + #endif + /* Macros: */ /** Length in bytes of a given Unicode string's character length * diff --git a/LUFA/Drivers/USB/Class/Device/Audio.c b/LUFA/Drivers/USB/Class/Device/Audio.c index 89115f2db0..d2572e9aba 100644 --- a/LUFA/Drivers/USB/Class/Device/Audio.c +++ b/LUFA/Drivers/USB/Class/Device/Audio.c @@ -28,9 +28,11 @@ this software. */ +#define __INCLUDE_FROM_USB_DRIVER #include "../../HighLevel/USBMode.h" #if defined(USB_CAN_BE_DEVICE) +#define __INCLUDE_FROM_AUDIO_DRIVER #include "Audio.h" void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) diff --git a/LUFA/Drivers/USB/Class/Device/Audio.h b/LUFA/Drivers/USB/Class/Device/Audio.h index c6b68b0cba..87fab98896 100644 --- a/LUFA/Drivers/USB/Class/Device/Audio.h +++ b/LUFA/Drivers/USB/Class/Device/Audio.h @@ -55,6 +55,11 @@ extern "C" { #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_AUDIO_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/Class/Audio.h instead. + #endif + /* Public Interface - May be used in end-application: */ /* Type Defines: */ /** Class state structure. An instance of this structure should be made for each Audio interface diff --git a/LUFA/Drivers/USB/Class/Device/CDC.c b/LUFA/Drivers/USB/Class/Device/CDC.c index b8a673f03e..4cdea9485c 100644 --- a/LUFA/Drivers/USB/Class/Device/CDC.c +++ b/LUFA/Drivers/USB/Class/Device/CDC.c @@ -28,10 +28,12 @@ this software. */ +#define __INCLUDE_FROM_USB_DRIVER #include "../../HighLevel/USBMode.h" #if defined(USB_CAN_BE_DEVICE) -#define INCLUDE_FROM_CDC_CLASS_DEVICE_C +#define __INCLUDE_FROM_CDC_CLASS_DEVICE_C +#define __INCLUDE_FROM_CDC_DRIVER #include "CDC.h" void CDC_Device_Event_Stub(void) diff --git a/LUFA/Drivers/USB/Class/Device/CDC.h b/LUFA/Drivers/USB/Class/Device/CDC.h index e6a2bfd5cf..0c214441c4 100644 --- a/LUFA/Drivers/USB/Class/Device/CDC.h +++ b/LUFA/Drivers/USB/Class/Device/CDC.h @@ -73,6 +73,11 @@ extern "C" { #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_CDC_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/Class/CDC.h instead. + #endif + /* Public Interface - May be used in end-application: */ /* Type Defines: */ /** Class state structure. An instance of this structure should be made for each CDC interface @@ -281,7 +286,7 @@ /* Private Interface - For use in library only: */ #if !defined(__DOXYGEN__) /* Function Prototypes: */ - #if defined(INCLUDE_FROM_CDC_CLASS_DEVICE_C) + #if defined(__INCLUDE_FROM_CDC_CLASS_DEVICE_C) static int CDC_Device_putchar(char c, FILE* Stream); static int CDC_Device_getchar(FILE* Stream); static int CDC_Device_getchar_Blocking(FILE* Stream); diff --git a/LUFA/Drivers/USB/Class/Device/HID.c b/LUFA/Drivers/USB/Class/Device/HID.c index a5c03f7268..cc1ad43b5b 100644 --- a/LUFA/Drivers/USB/Class/Device/HID.c +++ b/LUFA/Drivers/USB/Class/Device/HID.c @@ -28,9 +28,11 @@ this software. */ +#define __INCLUDE_FROM_USB_DRIVER #include "../../HighLevel/USBMode.h" #if defined(USB_CAN_BE_DEVICE) +#define __INCLUDE_FROM_HID_DRIVER #include "HID.h" void HID_Device_ProcessControlRequest(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo) diff --git a/LUFA/Drivers/USB/Class/Device/HID.h b/LUFA/Drivers/USB/Class/Device/HID.h index f62c08c392..15b428a7ba 100644 --- a/LUFA/Drivers/USB/Class/Device/HID.h +++ b/LUFA/Drivers/USB/Class/Device/HID.h @@ -55,6 +55,11 @@ extern "C" { #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_HID_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/Class/HID.h instead. + #endif + /* Public Interface - May be used in end-application: */ /* Type Defines: */ /** Class state structure. An instance of this structure should be made for each HID interface diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.c b/LUFA/Drivers/USB/Class/Device/MIDI.c index b72c2b0276..d3f8f55b60 100644 --- a/LUFA/Drivers/USB/Class/Device/MIDI.c +++ b/LUFA/Drivers/USB/Class/Device/MIDI.c @@ -28,9 +28,11 @@ this software. */ +#define __INCLUDE_FROM_USB_DRIVER #include "../../HighLevel/USBMode.h" #if defined(USB_CAN_BE_DEVICE) +#define __INCLUDE_FROM_MIDI_DRIVER #include "MIDI.h" void MIDI_Device_ProcessControlRequest(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo) diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.h b/LUFA/Drivers/USB/Class/Device/MIDI.h index 8517782e20..772456bc10 100644 --- a/LUFA/Drivers/USB/Class/Device/MIDI.h +++ b/LUFA/Drivers/USB/Class/Device/MIDI.h @@ -47,7 +47,6 @@ /* Includes: */ #include "../../USB.h" #include "../Common/MIDI.h" - #include "Audio.h" #include @@ -56,6 +55,11 @@ extern "C" { #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_MIDI_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/Class/MIDI.h instead. + #endif + /* Public Interface - May be used in end-application: */ /* Type Define: */ /** Class state structure. An instance of this structure should be made for each MIDI interface diff --git a/LUFA/Drivers/USB/Class/Device/MassStorage.c b/LUFA/Drivers/USB/Class/Device/MassStorage.c index 941db6866c..a5ebab0295 100644 --- a/LUFA/Drivers/USB/Class/Device/MassStorage.c +++ b/LUFA/Drivers/USB/Class/Device/MassStorage.c @@ -28,10 +28,12 @@ this software. */ +#define __INCLUDE_FROM_USB_DRIVER #include "../../HighLevel/USBMode.h" #if defined(USB_CAN_BE_DEVICE) -#define INCLUDE_FROM_MS_CLASS_DEVICE_C +#define __INCLUDE_FROM_MS_CLASS_DEVICE_C +#define __INCLUDE_FROM_MS_DRIVER #include "MassStorage.h" static volatile bool* CallbackIsResetSource; diff --git a/LUFA/Drivers/USB/Class/Device/MassStorage.h b/LUFA/Drivers/USB/Class/Device/MassStorage.h index 7091dca746..87dcfb2323 100644 --- a/LUFA/Drivers/USB/Class/Device/MassStorage.h +++ b/LUFA/Drivers/USB/Class/Device/MassStorage.h @@ -55,6 +55,11 @@ extern "C" { #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_MS_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/Class/MassStorage.h instead. + #endif + /* Public Interface - May be used in end-application: */ /* Type Defines: */ /** Class state structure. An instance of this structure should be made for each Mass Storage interface @@ -134,7 +139,7 @@ /* Private Interface - For use in library only: */ #if !defined(__DOXYGEN__) /* Function Prototypes: */ - #if defined(INCLUDE_FROM_MS_CLASS_DEVICE_C) + #if defined(__INCLUDE_FROM_MS_CLASS_DEVICE_C) static void MS_Device_ReturnCommandStatus(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1); static bool MS_Device_ReadInCommandBlock(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1); static uint8_t StreamCallback_MS_Device_AbortOnMassStoreReset(void); diff --git a/LUFA/Drivers/USB/Class/Device/RNDIS.c b/LUFA/Drivers/USB/Class/Device/RNDIS.c index 0dc385942a..1961e7e84a 100644 --- a/LUFA/Drivers/USB/Class/Device/RNDIS.c +++ b/LUFA/Drivers/USB/Class/Device/RNDIS.c @@ -28,10 +28,12 @@ this software. */ +#define __INCLUDE_FROM_USB_DRIVER #include "../../HighLevel/USBMode.h" #if defined(USB_CAN_BE_DEVICE) -#define INCLUDE_FROM_RNDIS_CLASS_DEVICE_C +#define __INCLUDE_FROM_RNDIS_CLASS_DEVICE_C +#define __INCLUDE_FROM_RNDIS_DRIVER #include "RNDIS.h" static const uint32_t PROGMEM AdapterSupportedOIDList[] = diff --git a/LUFA/Drivers/USB/Class/Device/RNDIS.h b/LUFA/Drivers/USB/Class/Device/RNDIS.h index 91ec798688..7d6b3a8822 100644 --- a/LUFA/Drivers/USB/Class/Device/RNDIS.h +++ b/LUFA/Drivers/USB/Class/Device/RNDIS.h @@ -55,6 +55,11 @@ extern "C" { #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_RNDIS_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/Class/RNDIS.h instead. + #endif + /* Public Interface - May be used in end-application: */ /* Type Defines: */ /** Class state structure. An instance of this structure should be made for each RNDIS interface @@ -131,7 +136,7 @@ /* Private Interface - For use in library only: */ #if !defined(__DOXYGEN__) /* Function Prototypes: */ - #if defined(INCLUDE_FROM_RNDIS_CLASS_DEVICE_C) + #if defined(__INCLUDE_FROM_RNDIS_CLASS_DEVICE_C) static void RNDIS_Device_ProcessRNDISControlMessage(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1); static bool RNDIS_Device_ProcessNDISQuery(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfaceInfo, diff --git a/LUFA/Drivers/USB/Class/HID.h b/LUFA/Drivers/USB/Class/HID.h index ebbfb42324..5eda33b2a0 100644 --- a/LUFA/Drivers/USB/Class/HID.h +++ b/LUFA/Drivers/USB/Class/HID.h @@ -51,6 +51,10 @@ #ifndef _HID_CLASS_H_ #define _HID_CLASS_H_ + /* Macros: */ + #define __INCLUDE_FROM_HID_DRIVER + #define __INCLUDE_FROM_USB_DRIVER + /* Includes: */ #include "../HighLevel/USBMode.h" diff --git a/LUFA/Drivers/USB/Class/Host/CDC.c b/LUFA/Drivers/USB/Class/Host/CDC.c index 227ab94f84..cc1ff8a0b2 100644 --- a/LUFA/Drivers/USB/Class/Host/CDC.c +++ b/LUFA/Drivers/USB/Class/Host/CDC.c @@ -28,10 +28,12 @@ this software. */ +#define __INCLUDE_FROM_USB_DRIVER #include "../../HighLevel/USBMode.h" #if defined(USB_CAN_BE_HOST) -#define INCLUDE_FROM_CDC_CLASS_HOST_C +#define __INCLUDE_FROM_CDC_CLASS_HOST_C +#define __INCLUDE_FROM_CDC_DRIVER #include "CDC.h" uint8_t CDC_Host_ConfigurePipes(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo, uint16_t ConfigDescriptorSize, diff --git a/LUFA/Drivers/USB/Class/Host/CDC.h b/LUFA/Drivers/USB/Class/Host/CDC.h index 9433c59fae..feb6bf87a1 100644 --- a/LUFA/Drivers/USB/Class/Host/CDC.h +++ b/LUFA/Drivers/USB/Class/Host/CDC.h @@ -56,6 +56,11 @@ extern "C" { #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_CDC_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/Class/CDC.h instead. + #endif + /* Public Interface - May be used in end-application: */ /* Type Defines: */ /** Class state structure. An instance of this structure should be made within the user application, @@ -286,7 +291,7 @@ #define CDC_FOUND_NOTIFICATION_IN (1 << 2) /* Function Prototypes: */ - #if defined(INCLUDE_FROM_CDC_CLASS_HOST_C) + #if defined(__INCLUDE_FROM_CDC_CLASS_HOST_C) static int CDC_Host_putchar(char c, FILE* Stream); static int CDC_Host_getchar(FILE* Stream); static int CDC_Host_getchar_Blocking(FILE* Stream); diff --git a/LUFA/Drivers/USB/Class/Host/HID.c b/LUFA/Drivers/USB/Class/Host/HID.c index 3cd939411b..1e1dbcff6d 100644 --- a/LUFA/Drivers/USB/Class/Host/HID.c +++ b/LUFA/Drivers/USB/Class/Host/HID.c @@ -28,10 +28,12 @@ this software. */ +#define __INCLUDE_FROM_USB_DRIVER #include "../../HighLevel/USBMode.h" #if defined(USB_CAN_BE_HOST) -#define INCLUDE_FROM_HID_CLASS_HOST_C +#define __INCLUDE_FROM_HID_CLASS_HOST_C +#define __INCLUDE_FROM_HID_DRIVER #include "HID.h" uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo, uint16_t ConfigDescriptorSize, diff --git a/LUFA/Drivers/USB/Class/Host/HID.h b/LUFA/Drivers/USB/Class/Host/HID.h index 3aaf809fd7..d4ea7ac634 100644 --- a/LUFA/Drivers/USB/Class/Host/HID.h +++ b/LUFA/Drivers/USB/Class/Host/HID.h @@ -55,6 +55,11 @@ extern "C" { #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_HID_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/Class/HID.h instead. + #endif + /* Public Interface - May be used in end-application: */ /* Macros: */ /** Error code for some HID Host functions, indicating a logical (and not hardware) error */ @@ -275,7 +280,7 @@ #define HID_FOUND_DATAPIPE_OUT (1 << 1) /* Function Prototypes: */ - #if defined(INCLUDE_FROM_HID_CLASS_HOST_C) + #if defined(__INCLUDE_FROM_HID_CLASS_HOST_C) static uint8_t DComp_HID_Host_NextHIDInterface(void* const CurrentDescriptor) ATTR_NON_NULL_PTR_ARG(1); static uint8_t DComp_NextHID(void* const CurrentDescriptor) ATTR_NON_NULL_PTR_ARG(1); static uint8_t DComp_HID_Host_NextHIDInterfaceEndpoint(void* const CurrentDescriptor) ATTR_NON_NULL_PTR_ARG(1); diff --git a/LUFA/Drivers/USB/Class/Host/HIDParser.c b/LUFA/Drivers/USB/Class/Host/HIDParser.c index 6c81ae8e50..386c3b937b 100644 --- a/LUFA/Drivers/USB/Class/Host/HIDParser.c +++ b/LUFA/Drivers/USB/Class/Host/HIDParser.c @@ -28,6 +28,7 @@ this software. */ +#define __INCLUDE_FROM_USB_DRIVER #include "../../HighLevel/USBMode.h" #if defined(USB_CAN_BE_HOST) diff --git a/LUFA/Drivers/USB/Class/Host/HIDParser.h b/LUFA/Drivers/USB/Class/Host/HIDParser.h index b7225f3329..b96989393c 100644 --- a/LUFA/Drivers/USB/Class/Host/HIDParser.h +++ b/LUFA/Drivers/USB/Class/Host/HIDParser.h @@ -57,6 +57,10 @@ #ifndef __HIDPARSER_H__ #define __HIDPARSER_H__ + /* Macros: */ + #define __INCLUDE_FROM_USB_DRIVER + #define __INCLUDE_FROM_HID_DRIVER + /* Includes: */ #include #include diff --git a/LUFA/Drivers/USB/Class/Host/MIDI.c b/LUFA/Drivers/USB/Class/Host/MIDI.c index a5ad4bf2b3..c2e6257c4f 100644 --- a/LUFA/Drivers/USB/Class/Host/MIDI.c +++ b/LUFA/Drivers/USB/Class/Host/MIDI.c @@ -28,10 +28,12 @@ this software. */ +#define __INCLUDE_FROM_USB_DRIVER #include "../../HighLevel/USBMode.h" #if defined(USB_CAN_BE_HOST) -#define INCLUDE_FROM_MIDI_CLASS_HOST_C +#define __INCLUDE_FROM_MIDI_CLASS_HOST_C +#define __INCLUDE_FROM_MIDI_DRIVER #include "MIDI.h" uint8_t MIDI_Host_ConfigurePipes(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo, uint16_t ConfigDescriptorSize, diff --git a/LUFA/Drivers/USB/Class/Host/MIDI.h b/LUFA/Drivers/USB/Class/Host/MIDI.h index 7b1cba3957..84779a0e88 100644 --- a/LUFA/Drivers/USB/Class/Host/MIDI.h +++ b/LUFA/Drivers/USB/Class/Host/MIDI.h @@ -53,6 +53,11 @@ extern "C" { #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_MIDI_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/Class/MIDI.h instead. + #endif + /* Public Interface - May be used in end-application: */ /* Type Defines: */ /** Class state structure. An instance of this structure should be made within the user application, @@ -172,7 +177,7 @@ #define MIDI_FOUND_DATAPIPE_OUT (1 << 1) /* Function Prototypes: */ - #if defined(INCLUDE_FROM_MIDI_CLASS_HOST_C) + #if defined(__INCLUDE_FROM_MIDI_CLASS_HOST_C) static uint8_t DComp_MIDI_Host_NextMIDIStreamingInterface(void* const CurrentDescriptor) ATTR_NON_NULL_PTR_ARG(1); static uint8_t DComp_MIDI_Host_NextMIDIStreamingDataEndpoint(void* const CurrentDescriptor) ATTR_NON_NULL_PTR_ARG(1); #endif diff --git a/LUFA/Drivers/USB/Class/Host/MassStorage.c b/LUFA/Drivers/USB/Class/Host/MassStorage.c index 7a302632bf..1b67ba2c37 100644 --- a/LUFA/Drivers/USB/Class/Host/MassStorage.c +++ b/LUFA/Drivers/USB/Class/Host/MassStorage.c @@ -28,10 +28,12 @@ this software. */ +#define __INCLUDE_FROM_USB_DRIVER #include "../../HighLevel/USBMode.h" #if defined(USB_CAN_BE_HOST) -#define INCLUDE_FROM_MS_CLASS_HOST_C +#define __INCLUDE_FROM_MS_CLASS_HOST_C +#define __INCLUDE_FROM_MS_DRIVER #include "MassStorage.h" uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, uint16_t ConfigDescriptorSize, diff --git a/LUFA/Drivers/USB/Class/Host/MassStorage.h b/LUFA/Drivers/USB/Class/Host/MassStorage.h index 6dda5c0a94..502e9021d4 100644 --- a/LUFA/Drivers/USB/Class/Host/MassStorage.h +++ b/LUFA/Drivers/USB/Class/Host/MassStorage.h @@ -53,6 +53,11 @@ extern "C" { #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_MS_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/Class/MassStorage.h instead. + #endif + /* Public Interface - May be used in end-application: */ /* Macros: */ /** Error code for some Mass Storage Host functions, indicating a logical (and not hardware) error */ @@ -296,7 +301,7 @@ #define MS_FOUND_DATAPIPE_OUT (1 << 1) /* Function Prototypes: */ - #if defined(INCLUDE_FROM_MS_CLASS_HOST_C) + #if defined(__INCLUDE_FROM_MS_CLASS_HOST_C) static uint8_t DComp_NextMSInterface(void* const CurrentDescriptor); static uint8_t DComp_NextMSInterfaceEndpoint(void* const CurrentDescriptor); diff --git a/LUFA/Drivers/USB/Class/Host/Printer.c b/LUFA/Drivers/USB/Class/Host/Printer.c index d1fb7c91c5..2d41a0c391 100644 --- a/LUFA/Drivers/USB/Class/Host/Printer.c +++ b/LUFA/Drivers/USB/Class/Host/Printer.c @@ -28,10 +28,12 @@ this software. */ +#define __INCLUDE_FROM_USB_DRIVER #include "../../HighLevel/USBMode.h" #if defined(USB_CAN_BE_HOST) -#define INCLUDE_FROM_PRINTER_CLASS_HOST_C +#define __INCLUDE_FROM_PRINTER_CLASS_HOST_C +#define __INCLUDE_FROM_PRINTER_DRIVER #include "Printer.h" uint8_t PRNT_Host_ConfigurePipes(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo, uint16_t ConfigDescriptorSize, diff --git a/LUFA/Drivers/USB/Class/Host/Printer.h b/LUFA/Drivers/USB/Class/Host/Printer.h index 06a1f8433c..25b0beb7ee 100644 --- a/LUFA/Drivers/USB/Class/Host/Printer.h +++ b/LUFA/Drivers/USB/Class/Host/Printer.h @@ -53,9 +53,12 @@ extern "C" { #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_PRINTER_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/Class/Printer.h instead. + #endif + /* Public Interface - May be used in end-application: */ - /* Macros: */ - /* Type Defines: */ /** Class state structure. An instance of this structure should be made within the user application, * and passed to each of the Printer class driver functions as the PRNTInterfaceInfo parameter. This @@ -203,7 +206,7 @@ #define PRNT_FOUND_DATAPIPE_OUT (1 << 1) /* Function Prototypes: */ - #if defined(INCLUDE_FROM_PRINTER_CLASS_HOST_C) + #if defined(__INCLUDE_FROM_PRINTER_CLASS_HOST_C) static uint8_t DComp_NextPRNTInterface(void* const CurrentDescriptor); static uint8_t DComp_NextPRNTInterfaceEndpoint(void* const CurrentDescriptor); #endif diff --git a/LUFA/Drivers/USB/Class/Host/RNDIS.c b/LUFA/Drivers/USB/Class/Host/RNDIS.c index b06b890244..c7bf482c31 100644 --- a/LUFA/Drivers/USB/Class/Host/RNDIS.c +++ b/LUFA/Drivers/USB/Class/Host/RNDIS.c @@ -28,10 +28,12 @@ this software. */ +#define __INCLUDE_FROM_USB_DRIVER #include "../../HighLevel/USBMode.h" #if defined(USB_CAN_BE_HOST) -#define INCLUDE_FROM_RNDIS_CLASS_HOST_C +#define __INCLUDE_FROM_RNDIS_CLASS_HOST_C +#define __INCLUDE_FROM_RNDIS_DRIVER #include "RNDIS.h" uint8_t RNDIS_Host_ConfigurePipes(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo, uint16_t ConfigDescriptorSize, diff --git a/LUFA/Drivers/USB/Class/Host/RNDIS.h b/LUFA/Drivers/USB/Class/Host/RNDIS.h index 0110b5a0d0..f42ed439c0 100644 --- a/LUFA/Drivers/USB/Class/Host/RNDIS.h +++ b/LUFA/Drivers/USB/Class/Host/RNDIS.h @@ -57,6 +57,11 @@ extern "C" { #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_RNDIS_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/Class/RNDIS.h instead. + #endif + /* Public Interface - May be used in end-application: */ /* Type Defines: */ /** Class state structure. An instance of this structure should be made within the user application, @@ -245,7 +250,7 @@ #define RNDIS_FOUND_NOTIFICATION_IN (1 << 2) /* Function Prototypes: */ - #if defined(INCLUDE_FROM_RNDIS_CLASS_HOST_C) + #if defined(__INCLUDE_FROM_RNDIS_CLASS_HOST_C) static uint8_t RNDIS_SendEncapsulatedCommand(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo, void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1); static uint8_t RNDIS_GetEncapsulatedResponse(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo, diff --git a/LUFA/Drivers/USB/Class/Host/StillImage.c b/LUFA/Drivers/USB/Class/Host/StillImage.c index 2f5addaa1d..577f619c8c 100644 --- a/LUFA/Drivers/USB/Class/Host/StillImage.c +++ b/LUFA/Drivers/USB/Class/Host/StillImage.c @@ -28,10 +28,12 @@ this software. */ +#define __INCLUDE_FROM_USB_DRIVER #include "../../HighLevel/USBMode.h" #if defined(USB_CAN_BE_HOST) -#define INCLUDE_FROM_SI_CLASS_HOST_C +#define __INCLUDE_FROM_SI_CLASS_HOST_C +#define __INCLUDE_FROM_SI_DRIVER #include "StillImage.h" uint8_t SImage_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo, uint16_t ConfigDescriptorSize, diff --git a/LUFA/Drivers/USB/Class/Host/StillImage.h b/LUFA/Drivers/USB/Class/Host/StillImage.h index b6a24757cb..a2101262ef 100644 --- a/LUFA/Drivers/USB/Class/Host/StillImage.h +++ b/LUFA/Drivers/USB/Class/Host/StillImage.h @@ -53,6 +53,11 @@ extern "C" { #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_SI_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/Class/StillImage.h instead. + #endif + /* Public Interface - May be used in end-application: */ /* Macros: */ /** Error code for some Still Image Host functions, indicating a logical (and not hardware) error */ @@ -287,7 +292,7 @@ #define COMMAND_DATA_TIMEOUT_MS 10000 /* Function Prototypes: */ - #if defined(INCLUDE_FROM_SI_CLASS_HOST_C) + #if defined(__INCLUDE_FROM_SI_CLASS_HOST_C) static uint8_t DComp_SI_Host_NextSIInterface(void* const CurrentDescriptor) ATTR_NON_NULL_PTR_ARG(1); static uint8_t DComp_SI_Host_NextSIInterfaceEndpoint(void* const CurrentDescriptor) ATTR_NON_NULL_PTR_ARG(1); #endif diff --git a/LUFA/Drivers/USB/Class/MIDI.h b/LUFA/Drivers/USB/Class/MIDI.h index 7fda7ae5e5..41f2916d3d 100644 --- a/LUFA/Drivers/USB/Class/MIDI.h +++ b/LUFA/Drivers/USB/Class/MIDI.h @@ -53,6 +53,10 @@ #ifndef _MIDI_CLASS_H_ #define _MIDI_CLASS_H_ + /* Macros: */ + #define __INCLUDE_FROM_MIDI_DRIVER + #define __INCLUDE_FROM_USB_DRIVER + /* Includes: */ #include "../HighLevel/USBMode.h" diff --git a/LUFA/Drivers/USB/Class/MassStorage.h b/LUFA/Drivers/USB/Class/MassStorage.h index 9f123e213b..ccc48f35b2 100644 --- a/LUFA/Drivers/USB/Class/MassStorage.h +++ b/LUFA/Drivers/USB/Class/MassStorage.h @@ -50,6 +50,10 @@ #ifndef _MS_CLASS_H_ #define _MS_CLASS_H_ + /* Macros: */ + #define __INCLUDE_FROM_MS_DRIVER + #define __INCLUDE_FROM_USB_DRIVER + /* Includes: */ #include "../HighLevel/USBMode.h" diff --git a/LUFA/Drivers/USB/Class/Printer.h b/LUFA/Drivers/USB/Class/Printer.h index 9f852e0c99..0de231d17c 100644 --- a/LUFA/Drivers/USB/Class/Printer.h +++ b/LUFA/Drivers/USB/Class/Printer.h @@ -51,6 +51,10 @@ #ifndef _PRINTER_CLASS_H_ #define _PRINTER_CLASS_H_ + /* Macros: */ + #define __INCLUDE_FROM_PRINTER_DRIVER + #define __INCLUDE_FROM_USB_DRIVER + /* Includes: */ #include "../HighLevel/USBMode.h" diff --git a/LUFA/Drivers/USB/Class/RNDIS.h b/LUFA/Drivers/USB/Class/RNDIS.h index 2dc3e7d271..8fd6d16c84 100644 --- a/LUFA/Drivers/USB/Class/RNDIS.h +++ b/LUFA/Drivers/USB/Class/RNDIS.h @@ -50,6 +50,10 @@ #ifndef _RNDIS_CLASS_H_ #define _RNDIS_CLASS_H_ + /* Macros: */ + #define __INCLUDE_FROM_RNDIS_DRIVER + #define __INCLUDE_FROM_USB_DRIVER + /* Includes: */ #include "../HighLevel/USBMode.h" diff --git a/LUFA/Drivers/USB/Class/StillImage.h b/LUFA/Drivers/USB/Class/StillImage.h index 6e65d9e9f3..1ba5ff77e6 100644 --- a/LUFA/Drivers/USB/Class/StillImage.h +++ b/LUFA/Drivers/USB/Class/StillImage.h @@ -49,6 +49,10 @@ #ifndef _SI_CLASS_H_ #define _SI_CLASS_H_ + /* Macros: */ + #define __INCLUDE_FROM_SI_DRIVER + #define __INCLUDE_FROM_USB_DRIVER + /* Includes: */ #include "../HighLevel/USBMode.h" diff --git a/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c b/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c index 6dd36cd462..270a98aeb8 100644 --- a/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c +++ b/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c @@ -28,6 +28,7 @@ this software. */ +#define __INCLUDE_FROM_USB_DRIVER #include "ConfigDescriptor.h" #if defined(USB_CAN_BE_HOST) diff --git a/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.h b/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.h index df5109d202..454f0b61cf 100644 --- a/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.h +++ b/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.h @@ -59,6 +59,11 @@ extern "C" { #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_USB_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/USB.h instead. + #endif + /* Public Interface - May be used in end-application: */ /* Macros: */ /** Mask for determining the type of an endpoint from an endpoint descriptor. This should then be compared diff --git a/LUFA/Drivers/USB/HighLevel/Events.c b/LUFA/Drivers/USB/HighLevel/Events.c index dcf9fcc21f..4d99907880 100644 --- a/LUFA/Drivers/USB/HighLevel/Events.c +++ b/LUFA/Drivers/USB/HighLevel/Events.c @@ -28,9 +28,8 @@ this software. */ -#include "USBMode.h" - -#define INCLUDE_FROM_EVENTS_C +#define __INCLUDE_FROM_EVENTS_C +#define __INCLUDE_FROM_USB_DRIVER #include "Events.h" void USB_Event_Stub(void) diff --git a/LUFA/Drivers/USB/HighLevel/Events.h b/LUFA/Drivers/USB/HighLevel/Events.h index 08727d749e..12b30b2502 100644 --- a/LUFA/Drivers/USB/HighLevel/Events.h +++ b/LUFA/Drivers/USB/HighLevel/Events.h @@ -60,9 +60,14 @@ extern "C" { #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_USB_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/USB.h instead. + #endif + /* Public Interface - May be used in end-application: */ /* Pseudo-Functions for Doxygen: */ - #if !defined(INCLUDE_FROM_EVENTS_C) || defined(__DOXYGEN__) + #if !defined(__INCLUDE_FROM_EVENTS_C) || defined(__DOXYGEN__) /** Event for USB stack initialization failure. This event fires when the USB interface fails to * initialize correctly due to a hardware or software fault. * @@ -287,7 +292,7 @@ /* Private Interface - For use in library only: */ #if !defined(__DOXYGEN__) /* Function Prototypes: */ - #if defined(INCLUDE_FROM_EVENTS_C) + #if defined(__INCLUDE_FROM_EVENTS_C) void USB_Event_Stub(void) ATTR_CONST; #if defined(USB_CAN_BE_BOTH) diff --git a/LUFA/Drivers/USB/HighLevel/StdDescriptors.h b/LUFA/Drivers/USB/HighLevel/StdDescriptors.h index 404a44f2cc..807eb78f82 100644 --- a/LUFA/Drivers/USB/HighLevel/StdDescriptors.h +++ b/LUFA/Drivers/USB/HighLevel/StdDescriptors.h @@ -58,6 +58,11 @@ extern "C" { #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_USB_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/USB.h instead. + #endif + /* Public Interface - May be used in end-application: */ /* Macros: */ /** Indicates that a given descriptor does not exist in the device. This can be used inside descriptors diff --git a/LUFA/Drivers/USB/HighLevel/StdRequestType.h b/LUFA/Drivers/USB/HighLevel/StdRequestType.h index a887b5cdcc..4fad0378b8 100644 --- a/LUFA/Drivers/USB/HighLevel/StdRequestType.h +++ b/LUFA/Drivers/USB/HighLevel/StdRequestType.h @@ -40,6 +40,11 @@ #ifndef __STDREQTYPE_H__ #define __STDREQTYPE_H__ + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_USB_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/USB.h instead. + #endif + /* Public Interface - May be used in end-application: */ /* Macros: */ /** Mask for the request type parameter, to indicate the direction of the request data (Host to Device diff --git a/LUFA/Drivers/USB/HighLevel/StreamCallbacks.h b/LUFA/Drivers/USB/HighLevel/StreamCallbacks.h index c502330d62..3d30655ec6 100644 --- a/LUFA/Drivers/USB/HighLevel/StreamCallbacks.h +++ b/LUFA/Drivers/USB/HighLevel/StreamCallbacks.h @@ -41,6 +41,11 @@ #ifndef __STREAMCALLBACK_H__ #define __STREAMCALLBACK_H__ + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_USB_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/USB.h instead. + #endif + /* Public Interface - May be used in end-application: */ /* Macros: */ /** Used with the Endpoint and Pipe stream functions as the callback function parameter, indicating that the stream diff --git a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c index ee6d16efc2..f8da7e6563 100644 --- a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c +++ b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c @@ -28,6 +28,7 @@ this software. */ +#define __INCLUDE_FROM_USB_DRIVER #include "USBInterrupt.h" void USB_INT_DisableAllInterrupts(void) diff --git a/LUFA/Drivers/USB/HighLevel/USBInterrupt.h b/LUFA/Drivers/USB/HighLevel/USBInterrupt.h index 5aa10db08b..6ff7c70fa3 100644 --- a/LUFA/Drivers/USB/HighLevel/USBInterrupt.h +++ b/LUFA/Drivers/USB/HighLevel/USBInterrupt.h @@ -45,6 +45,11 @@ extern "C" { #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_USB_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/USB.h instead. + #endif + /* Private Interface - For use in library only: */ #if !defined(__DOXYGEN__) /* Macros: */ diff --git a/LUFA/Drivers/USB/HighLevel/USBMode.h b/LUFA/Drivers/USB/HighLevel/USBMode.h index 0f2ecab883..ba2d453947 100644 --- a/LUFA/Drivers/USB/HighLevel/USBMode.h +++ b/LUFA/Drivers/USB/HighLevel/USBMode.h @@ -43,6 +43,11 @@ #ifndef __USBMODE_H__ #define __USBMODE_H__ + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_USB_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/USB.h instead. + #endif + /* Public Interface - May be used in end-application: */ #if defined(__DOXYGEN__) /** Indicates that the target AVR microcontroller belongs to the Series 2 USB controller diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.c b/LUFA/Drivers/USB/HighLevel/USBTask.c index af3d7da90c..afddcc1e5d 100644 --- a/LUFA/Drivers/USB/HighLevel/USBTask.c +++ b/LUFA/Drivers/USB/HighLevel/USBTask.c @@ -28,9 +28,8 @@ this software. */ -#include "USBMode.h" - -#define INCLUDE_FROM_USBTASK_C +#define __INCLUDE_FROM_USBTASK_C +#define __INCLUDE_FROM_USB_DRIVER #include "USBTask.h" volatile bool USB_IsInitialized; diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.h b/LUFA/Drivers/USB/HighLevel/USBTask.h index 68d04af66b..c01b84c37e 100644 --- a/LUFA/Drivers/USB/HighLevel/USBTask.h +++ b/LUFA/Drivers/USB/HighLevel/USBTask.h @@ -54,6 +54,11 @@ #if defined(__cplusplus) extern "C" { #endif + + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_USB_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/USB.h instead. + #endif /* Public Interface - May be used in end-application: */ /* Global Variables: */ @@ -164,7 +169,7 @@ /* Private Interface - For use in library only: */ #if !defined(__DOXYGEN__) /* Function Prototypes: */ - #if defined(INCLUDE_FROM_USBTASK_C) + #if defined(__INCLUDE_FROM_USBTASK_C) #if defined(USB_CAN_BE_HOST) static void USB_HostTask(void); #endif diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.c b/LUFA/Drivers/USB/LowLevel/DevChapter9.c index 3118302cff..7d9e81502c 100644 --- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c +++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c @@ -28,11 +28,12 @@ this software. */ +#define __INCLUDE_FROM_USB_DRIVER #include "../HighLevel/USBMode.h" #if defined(USB_CAN_BE_DEVICE) -#define INCLUDE_FROM_DEVCHAPTER9_C +#define __INCLUDE_FROM_DEVCHAPTER9_C #include "DevChapter9.h" uint8_t USB_ConfigurationNumber; diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.h b/LUFA/Drivers/USB/LowLevel/DevChapter9.h index 3d49062ba0..58a5dc80e4 100644 --- a/LUFA/Drivers/USB/LowLevel/DevChapter9.h +++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.h @@ -48,6 +48,11 @@ extern "C" { #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_USB_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/USB.h instead. + #endif + /* Public Interface - May be used in end-application: */ /* Macros: */ #if defined(USE_SINGLE_DEVICE_CONFIGURATION) @@ -124,7 +129,7 @@ /* Function Prototypes: */ void USB_Device_ProcessControlRequest(void); - #if defined(INCLUDE_FROM_DEVCHAPTER9_C) + #if defined(__INCLUDE_FROM_DEVCHAPTER9_C) static void USB_Device_SetAddress(void); static void USB_Device_SetConfiguration(void); static void USB_Device_GetConfiguration(void); diff --git a/LUFA/Drivers/USB/LowLevel/Device.h b/LUFA/Drivers/USB/LowLevel/Device.h index 110adad125..1f929bff09 100644 --- 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)) #error USE_RAM_DESCRIPTORS and USE_EEPROM_DESCRIPTORS are mutually exclusive. #endif + + #if !defined(__INCLUDE_FROM_USB_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/USB.h instead. + #endif /* Public Interface - May be used in end-application: */ /* Macros: */ diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.c b/LUFA/Drivers/USB/LowLevel/Endpoint.c index 03be1185e7..81fef1c2ef 100644 --- a/LUFA/Drivers/USB/LowLevel/Endpoint.c +++ b/LUFA/Drivers/USB/LowLevel/Endpoint.c @@ -28,11 +28,12 @@ this software. */ +#define __INCLUDE_FROM_USB_DRIVER #include "../HighLevel/USBMode.h" #if defined(USB_CAN_BE_DEVICE) -#define INCLUDE_FROM_ENDPOINT_C +#define __INCLUDE_FROM_ENDPOINT_C #include "Endpoint.h" #if !defined(FIXED_CONTROL_ENDPOINT_SIZE) diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.h b/LUFA/Drivers/USB/LowLevel/Endpoint.h index b0934f5868..6d98b78f08 100644 --- a/LUFA/Drivers/USB/LowLevel/Endpoint.h +++ b/LUFA/Drivers/USB/LowLevel/Endpoint.h @@ -83,6 +83,11 @@ extern "C" { #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_USB_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/USB.h instead. + #endif + /* Public Interface - May be used in end-application: */ /* Macros: */ /** Endpoint data direction mask for \ref Endpoint_ConfigureEndpoint(). This indicates that the endpoint diff --git a/LUFA/Drivers/USB/LowLevel/Host.c b/LUFA/Drivers/USB/LowLevel/Host.c index a5452fdb63..e227fd194e 100644 --- a/LUFA/Drivers/USB/LowLevel/Host.c +++ b/LUFA/Drivers/USB/LowLevel/Host.c @@ -28,11 +28,12 @@ this software. */ +#define __INCLUDE_FROM_USB_DRIVER #include "../HighLevel/USBMode.h" #if defined(USB_CAN_BE_HOST) -#define INCLUDE_FROM_HOST_C +#define __INCLUDE_FROM_HOST_C #include "Host.h" void USB_Host_ProcessNextHostState(void) diff --git a/LUFA/Drivers/USB/LowLevel/Host.h b/LUFA/Drivers/USB/LowLevel/Host.h index 07ff0fce7e..5672dd5319 100644 --- a/LUFA/Drivers/USB/LowLevel/Host.h +++ b/LUFA/Drivers/USB/LowLevel/Host.h @@ -55,6 +55,11 @@ extern "C" { #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_USB_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/USB.h instead. + #endif + /* Public Interface - May be used in end-application: */ /* Macros: */ /** Indicates the fixed USB device address which any attached device is enumerated to when in @@ -397,7 +402,7 @@ void USB_Host_ProcessNextHostState(void); uint8_t USB_Host_WaitMS(uint8_t MS); - #if defined(INCLUDE_FROM_HOST_C) + #if defined(__INCLUDE_FROM_HOST_C) static void USB_Host_ResetDevice(void); #endif #endif diff --git a/LUFA/Drivers/USB/LowLevel/HostChapter9.c b/LUFA/Drivers/USB/LowLevel/HostChapter9.c index ff7ed86c09..e5072c8a88 100644 --- a/LUFA/Drivers/USB/LowLevel/HostChapter9.c +++ b/LUFA/Drivers/USB/LowLevel/HostChapter9.c @@ -28,11 +28,12 @@ this software. */ +#define __INCLUDE_FROM_USB_DRIVER #include "../HighLevel/USBMode.h" #if defined(USB_CAN_BE_HOST) -#define INCLUDE_FROM_HOSTCHAPTER9_C +#define __INCLUDE_FROM_HOSTCHAPTER9_C #include "HostChapter9.h" uint8_t USB_Host_SendControlRequest(void* BufferPtr) diff --git a/LUFA/Drivers/USB/LowLevel/HostChapter9.h b/LUFA/Drivers/USB/LowLevel/HostChapter9.h index fc8dfe2a54..1a85cf6d61 100644 --- a/LUFA/Drivers/USB/LowLevel/HostChapter9.h +++ b/LUFA/Drivers/USB/LowLevel/HostChapter9.h @@ -44,6 +44,11 @@ extern "C" { #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_USB_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/USB.h instead. + #endif + /* Public Interface - May be used in end-application: */ /* Enums: */ /** Enum for the \ref USB_Host_SendControlRequest() return code, indicating the reason for the error @@ -89,7 +94,7 @@ }; /* Function Prototypes: */ - #if defined(INCLUDE_FROM_HOSTCHAPTER9_C) + #if defined(__INCLUDE_FROM_HOSTCHAPTER9_C) static uint8_t USB_Host_WaitForIOS(const uint8_t WaitType); #endif #endif diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.c b/LUFA/Drivers/USB/LowLevel/LowLevel.c index b49c5b8ce7..f4f277ccb7 100644 --- a/LUFA/Drivers/USB/LowLevel/LowLevel.c +++ b/LUFA/Drivers/USB/LowLevel/LowLevel.c @@ -28,6 +28,7 @@ this software. */ +#define __INCLUDE_FROM_USB_DRIVER #include "LowLevel.h" #if (!defined(USB_HOST_ONLY) && !defined(USB_DEVICE_ONLY)) diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.h b/LUFA/Drivers/USB/LowLevel/LowLevel.h index dc01d24e55..1a92d470b7 100644 --- a/LUFA/Drivers/USB/LowLevel/LowLevel.h +++ b/LUFA/Drivers/USB/LowLevel/LowLevel.h @@ -70,6 +70,10 @@ #endif /* Preprocessor Checks and Defines: */ + #if !defined(__INCLUDE_FROM_USB_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/USB.h instead. + #endif + #if !defined(F_CLOCK) #error F_CLOCK is not defined. You must define F_CLOCK to the frequency of the unprescaled input clock in your project makefile. #endif diff --git a/LUFA/Drivers/USB/LowLevel/OTG.h b/LUFA/Drivers/USB/LowLevel/OTG.h index 9cce2e6900..25cb180a14 100644 --- a/LUFA/Drivers/USB/LowLevel/OTG.h +++ b/LUFA/Drivers/USB/LowLevel/OTG.h @@ -47,6 +47,11 @@ #include "../../../Common/Common.h" + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_USB_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/USB.h instead. + #endif + /* Public Interface - May be used in end-application: */ /* Macros: */ /** Mask for the VBUS pulsing method of SRP, supported by some OTG devices. diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.c b/LUFA/Drivers/USB/LowLevel/Pipe.c index 2b956a8da0..78c82e8c47 100644 --- a/LUFA/Drivers/USB/LowLevel/Pipe.c +++ b/LUFA/Drivers/USB/LowLevel/Pipe.c @@ -28,11 +28,12 @@ this software. */ +#define __INCLUDE_FROM_USB_DRIVER #include "../HighLevel/USBMode.h" #if defined(USB_CAN_BE_HOST) -#define INCLUDE_FROM_PIPE_C +#define __INCLUDE_FROM_PIPE_C #include "Pipe.h" uint8_t USB_ControlPipeSize = PIPE_CONTROLPIPE_DEFAULT_SIZE; diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.h b/LUFA/Drivers/USB/LowLevel/Pipe.h index 16b5ea670c..3e25d4976b 100644 --- a/LUFA/Drivers/USB/LowLevel/Pipe.h +++ b/LUFA/Drivers/USB/LowLevel/Pipe.h @@ -91,6 +91,11 @@ extern "C" { #endif + /* Preprocessor Checks: */ + #if !defined(__INCLUDE_FROM_USB_DRIVER) + #error Do not include this file directly. Include LUFA/Drivers/USB.h instead. + #endif + /* Public Interface - May be used in end-application: */ /* Macros: */ /** Mask for \ref Pipe_GetErrorFlags(), indicating that an overflow error occurred in the pipe on the received data. */ diff --git a/LUFA/Drivers/USB/USB.h b/LUFA/Drivers/USB/USB.h index a632f52e24..3bc356d8e7 100644 --- a/LUFA/Drivers/USB/USB.h +++ b/LUFA/Drivers/USB/USB.h @@ -350,6 +350,11 @@ #ifndef __USB_H__ #define __USB_H__ + /* Macros: */ + #if !defined(__DOXYGEN__) + #define __INCLUDE_FROM_USB_DRIVER + #endif + /* Includes: */ #include "HighLevel/USBMode.h"