diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2011-06-09 04:32:52 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2011-06-09 04:32:52 +0000 |
| commit | dbbbc195dcfdf56e797c0431e10ee50329760d23 (patch) | |
| tree | d30d9f3f763cd56351b7c8c1ef84a480faf27ee0 /LUFA/Drivers/USB | |
| parent | 99a12dc177dade81960b1324ab798f776064b6e8 (diff) | |
Fix compile errors when both Host and Device modes are enabled.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1796 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'LUFA/Drivers/USB')
| -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 |
3 files changed, 3 insertions, 3 deletions
diff --git a/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h index 4d49da4f..1939d390 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 8d086475..cf997194 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 459423c1..b82b27e5 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.
|