diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-06-09 04:32:52 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-06-09 04:32:52 +0000 |
| commit | e5e34f91fa88fb95ab83c6cb8e10d313d4157a67 (patch) | |
| tree | d30d9f3f763cd56351b7c8c1ef84a480faf27ee0 /LUFA | |
| parent | 1191da7b7b10c9d90ebe7c22d698d560f35cbc4a (diff) | |
| download | lufa-e5e34f91fa88fb95ab83c6cb8e10d313d4157a67.tar.gz lufa-e5e34f91fa88fb95ab83c6cb8e10d313d4157a67.tar.bz2 lufa-e5e34f91fa88fb95ab83c6cb8e10d313d4157a67.zip | |
Fix compile errors when both Host and Device modes are enabled.
Diffstat (limited to 'LUFA')
| -rw-r--r-- | LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h | 2 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Core/Pipe.h | 2 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h | 2 | ||||
| -rw-r--r-- | LUFA/ManPages/FutureChanges.txt | 3 |
4 files changed, 4 insertions, 5 deletions
diff --git a/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h index 4d49da4f4..1939d3906 100644 --- a/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h +++ b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h @@ -330,7 +330,7 @@ static inline uint8_t Pipe_GetBoundEndpointAddress(void) { return (((UPCFG0X >> PEPNUM0) & PIPE_EPNUM_MASK) | - ((Pipe_GetPipeToken() == PIPE_TOKEN_IN) ? ENDPOINT_DESCRIPTOR_DIR_IN : 0)); + ((Pipe_GetPipeToken() == PIPE_TOKEN_IN) ? PIPE_EPDIR_MASK : 0)); } /** Sets the period between interrupts for an INTERRUPT type pipe to a specified number of milliseconds. diff --git a/LUFA/Drivers/USB/Core/Pipe.h b/LUFA/Drivers/USB/Core/Pipe.h index 8d0864754..cf9971940 100644 --- a/LUFA/Drivers/USB/Core/Pipe.h +++ b/LUFA/Drivers/USB/Core/Pipe.h @@ -84,7 +84,7 @@ /* Includes: */
#include "../../../Common/Common.h"
- #include "USBMode.h"
+ #include "USBMode.h"
/* Preprocessor Checks: */
#if !defined(__INCLUDE_FROM_USB_DRIVER)
diff --git a/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h b/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h index 459423c12..b82b27e54 100644 --- a/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h +++ b/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h @@ -341,7 +341,7 @@ static inline uint8_t Pipe_GetBoundEndpointAddress(void)
{
return ((&AVR32_USBB.UPCFG0)[USB_SelectedPipe].pepnum |
- ((Pipe_GetPipeToken() == PIPE_TOKEN_IN) ? ENDPOINT_DESCRIPTOR_DIR_IN : 0));
+ ((Pipe_GetPipeToken() == PIPE_TOKEN_IN) ? PIPE_EPDIR_MASK : 0));
}
/** Sets the period between interrupts for an INTERRUPT type pipe to a specified number of milliseconds.
diff --git a/LUFA/ManPages/FutureChanges.txt b/LUFA/ManPages/FutureChanges.txt index 4d2b95402..b2cbf0b33 100644 --- a/LUFA/ManPages/FutureChanges.txt +++ b/LUFA/ManPages/FutureChanges.txt @@ -22,7 +22,7 @@ * -# Pull out third party libraries into a separate folder and reference them as required * -# Add a LUFA_YIELD macro for integration into a third-party RTOS * -# Abstract out Mass Storage byte send/receive to prevent low level API use in projects - * -# Consider switch from endpoint numbers to full endpoint addresses for future expansion + * -# Consider switch from endpoint numbers to full endpoint addresses to ease future architecture expansion * - Documentation/Support * -# Add detailed overviews of how each demo works * -# Add board overviews @@ -30,7 +30,6 @@ * - Demos/Projects * -# Device/Host USB bridge * -# Finish incomplete demos and projects - * -# Add class driver support for Audio Host class * -# Add class driver support for Test and Measurement class * -# Add class driver support for EEM class * -# Add class driver support for ECM class |