Fixed USBTask.h not conditionally including HostChapter9.h only when CAN_BE_DEVICE...

diff --git a/LUFA/ChangeLog.txt b/LUFA/ChangeLog.txt
index 8447208..3c482a1 100644 (file)
--- a/LUFA/ChangeLog.txt
+++ b/LUFA/ChangeLog.txt
@@ -43,6 +43,7 @@
   *  - Removed AVRISP_Programmer project due to code quality concerns\r
   *  - Fixed CDC demo not sending an empty packet after each transfer to prevent the host from buffering incomming data\r
   *  - Fixed documentation typoes and preprocessor checks relating to misspellings of the USE_RAM_DESCRIPTORS token (thanks to Ian Gregg)\r
   *  - Removed AVRISP_Programmer project due to code quality concerns\r
   *  - Fixed CDC demo not sending an empty packet after each transfer to prevent the host from buffering incomming data\r
   *  - Fixed documentation typoes and preprocessor checks relating to misspellings of the USE_RAM_DESCRIPTORS token (thanks to Ian Gregg)\r

+  *  - Fixed USBTask.h not conditionally including HostChapter9.h only when CAN_BE_DEVICE is defined (thanks to Ian Gregg)\r

   *\r
   *  \section Sec_ChangeLog090209 Version 090209\r
   *\r
   *\r
   *  \section Sec_ChangeLog090209 Version 090209\r
   *\r

diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.h b/LUFA/Drivers/USB/HighLevel/USBTask.h
index 1fcc2bb..5bbd4f9 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBTask.h
+++ b/LUFA/Drivers/USB/HighLevel/USBTask.h
@@ -46,10 +46,13 @@
                \r
                #include "../../../Scheduler/Scheduler.h"\r
                #include "../LowLevel/LowLevel.h"\r
                \r
                #include "../../../Scheduler/Scheduler.h"\r
                #include "../LowLevel/LowLevel.h"\r

-               #include "../LowLevel/HostChapter9.h"\r

                #include "../LowLevel/USBMode.h"\r
                #include "Events.h"\r
                #include "StdDescriptors.h"\r
                #include "../LowLevel/USBMode.h"\r
                #include "Events.h"\r
                #include "StdDescriptors.h"\r

+\r
+               #if defined(USB_CAN_BE_HOST)\r
+                       #include "../LowLevel/HostChapter9.h"\r
+               #endif          \r

                \r
        /* Enable C linkage for C++ Compilers: */\r
                #if defined(__cplusplus)\r
                \r
        /* Enable C linkage for C++ Compilers: */\r
                #if defined(__cplusplus)\r

diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.h b/LUFA/Drivers/USB/LowLevel/Endpoint.h
index 1b8bade..c6aece7 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Endpoint.h
+++ b/LUFA/Drivers/USB/LowLevel/Endpoint.h
@@ -46,8 +46,9 @@
                #include "../HighLevel/USBTask.h"\r
 \r
                #if !defined(NO_STREAM_CALLBACKS) || defined(__DOXYGEN__)\r
                #include "../HighLevel/USBTask.h"\r
 \r
                #if !defined(NO_STREAM_CALLBACKS) || defined(__DOXYGEN__)\r

-               #include "StreamCallbacks.h"\r
+                       #include "StreamCallbacks.h"\r

                #endif\r
                #endif\r

+               \r

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

diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.h b/LUFA/Drivers/USB/LowLevel/Pipe.h
index 3b7783a..df3ac7d 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Pipe.h
+++ b/LUFA/Drivers/USB/LowLevel/Pipe.h
@@ -46,8 +46,9 @@
                #include "../HighLevel/USBTask.h"\r
 \r
                #if !defined(NO_STREAM_CALLBACKS) || defined(__DOXYGEN__)\r
                #include "../HighLevel/USBTask.h"\r
 \r
                #if !defined(NO_STREAM_CALLBACKS) || defined(__DOXYGEN__)\r

-               #include "StreamCallbacks.h"\r
+                       #include "StreamCallbacks.h"\r

                #endif\r
                #endif\r

+               \r

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