From e5e34f91fa88fb95ab83c6cb8e10d313d4157a67 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Thu, 9 Jun 2011 04:32:52 +0000 Subject: [PATCH] Fix compile errors when both Host and Device modes are enabled. --- LUFA.pnproj | 2 +- LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h | 2 +- LUFA/Drivers/USB/Core/Pipe.h | 2 +- LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h | 2 +- LUFA/ManPages/FutureChanges.txt | 3 +-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/LUFA.pnproj b/LUFA.pnproj index 3cf71c5922..bf65a706a5 100644 --- a/LUFA.pnproj +++ b/LUFA.pnproj @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h index 4d49da4f42..1939d3906e 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 8d0864754f..cf99719400 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 459423c125..b82b27e54f 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 4d2b954024..b2cbf0b335 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