diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-03-26 00:20:28 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-03-26 00:20:28 +0000 |
| commit | 1c9092a8a6db41709b9cb77534f06011868baf01 (patch) | |
| tree | e08a08db01108e00bfb6215fed1294b3f5f26afb | |
| parent | 4bb59f9673bdac23109575a1979640c81cbc2058 (diff) | |
| download | lufa-1c9092a8a6db41709b9cb77534f06011868baf01.tar.gz lufa-1c9092a8a6db41709b9cb77534f06011868baf01.tar.bz2 lufa-1c9092a8a6db41709b9cb77534f06011868baf01.zip | |
Fixed USBTask.h not conditionally including HostChapter9.h only when CAN_BE_DEVICE is defined (thanks to Ian Gregg).
| -rw-r--r-- | LUFA/ChangeLog.txt | 1 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/HighLevel/USBTask.h | 5 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/LowLevel/Endpoint.h | 3 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/LowLevel/Pipe.h | 3 |
4 files changed, 9 insertions, 3 deletions
diff --git a/LUFA/ChangeLog.txt b/LUFA/ChangeLog.txt index 844720834..3c482a153 100644 --- a/LUFA/ChangeLog.txt +++ b/LUFA/ChangeLog.txt @@ -43,6 +43,7 @@ * - Removed AVRISP_Programmer project due to code quality concerns
* - Fixed CDC demo not sending an empty packet after each transfer to prevent the host from buffering incomming data
* - Fixed documentation typoes and preprocessor checks relating to misspellings of the USE_RAM_DESCRIPTORS token (thanks to Ian Gregg)
+ * - Fixed USBTask.h not conditionally including HostChapter9.h only when CAN_BE_DEVICE is defined (thanks to Ian Gregg)
*
* \section Sec_ChangeLog090209 Version 090209
*
diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.h b/LUFA/Drivers/USB/HighLevel/USBTask.h index 1fcc2bbb3..5bbd4f92e 100644 --- a/LUFA/Drivers/USB/HighLevel/USBTask.h +++ b/LUFA/Drivers/USB/HighLevel/USBTask.h @@ -46,10 +46,13 @@ #include "../../../Scheduler/Scheduler.h"
#include "../LowLevel/LowLevel.h"
- #include "../LowLevel/HostChapter9.h"
#include "../LowLevel/USBMode.h"
#include "Events.h"
#include "StdDescriptors.h"
+
+ #if defined(USB_CAN_BE_HOST)
+ #include "../LowLevel/HostChapter9.h"
+ #endif
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.h b/LUFA/Drivers/USB/LowLevel/Endpoint.h index 1b8bade7c..c6aece708 100644 --- a/LUFA/Drivers/USB/LowLevel/Endpoint.h +++ b/LUFA/Drivers/USB/LowLevel/Endpoint.h @@ -46,8 +46,9 @@ #include "../HighLevel/USBTask.h"
#if !defined(NO_STREAM_CALLBACKS) || defined(__DOXYGEN__)
- #include "StreamCallbacks.h"
+ #include "StreamCallbacks.h"
#endif
+
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
extern "C" {
diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.h b/LUFA/Drivers/USB/LowLevel/Pipe.h index 3b7783a5d..df3ac7ddc 100644 --- a/LUFA/Drivers/USB/LowLevel/Pipe.h +++ b/LUFA/Drivers/USB/LowLevel/Pipe.h @@ -46,8 +46,9 @@ #include "../HighLevel/USBTask.h"
#if !defined(NO_STREAM_CALLBACKS) || defined(__DOXYGEN__)
- #include "StreamCallbacks.h"
+ #include "StreamCallbacks.h"
#endif
+
/* Enable C linkage for C++ Compilers: */
#if defined(__cplusplus)
extern "C" {
|