diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-06-08 02:45:32 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-06-08 02:45:32 +0000 |
| commit | 0bf5064aec5ac43ba2b25d44528bebb27db2f117 (patch) | |
| tree | ee5e186bc1a7121e57dd2f37faf9f43b076b2aa5 /LUFA/Drivers/USB/Core/AVR8 | |
| parent | 34164a5550911277db03bbbc2a604bc59e0bbc99 (diff) | |
| download | lufa-0bf5064aec5ac43ba2b25d44528bebb27db2f117.tar.gz lufa-0bf5064aec5ac43ba2b25d44528bebb27db2f117.tar.bz2 lufa-0bf5064aec5ac43ba2b25d44528bebb27db2f117.zip | |
Pipe_BoundEndpointNumber() has been renamed to Pipe_GetBoundEndpointAddress(), and now returns the correct endpoint direction as part of the endpoint address.
Add Audio_GetSetEndpointProperty() function to the Host mode Audio class driver.
Diffstat (limited to 'LUFA/Drivers/USB/Core/AVR8')
| -rw-r--r-- | LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c | 8 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h | 11 |
2 files changed, 7 insertions, 12 deletions
diff --git a/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c index 48445293e..e93b256c6 100644 --- a/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c +++ b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c @@ -137,13 +137,7 @@ bool Pipe_IsEndpointBound(const uint8_t EndpointAddress) if (!(Pipe_IsConfigured())) continue; - uint8_t PipeToken = Pipe_GetPipeToken(); - bool PipeTokenCorrect = true; - - if (PipeToken != PIPE_TOKEN_SETUP) - PipeTokenCorrect = (PipeToken == ((EndpointAddress & PIPE_EPDIR_MASK) ? PIPE_TOKEN_IN : PIPE_TOKEN_OUT)); - - if (PipeTokenCorrect && (Pipe_BoundEndpointNumber() == (EndpointAddress & PIPE_EPNUM_MASK))) + if (Pipe_GetBoundEndpointAddress() == EndpointAddress) return true; } diff --git a/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h index c6bdcfb4a..4d49da4f4 100644 --- a/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h +++ b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h @@ -321,15 +321,16 @@ return ((UPSTAX & (1 << CFGOK)) ? true : false); } - /** Retrieves the endpoint number of the endpoint within the attached device that the currently selected + /** Retrieves the endpoint address of the endpoint within the attached device that the currently selected * pipe is bound to. * - * \return Endpoint number the currently selected pipe is bound to. + * \return Endpoint address the currently selected pipe is bound to. */ - static inline uint8_t Pipe_BoundEndpointNumber(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE; - static inline uint8_t Pipe_BoundEndpointNumber(void) + static inline uint8_t Pipe_GetBoundEndpointAddress(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE; + static inline uint8_t Pipe_GetBoundEndpointAddress(void) { - return ((UPCFG0X >> PEPNUM0) & PIPE_EPNUM_MASK); + return (((UPCFG0X >> PEPNUM0) & PIPE_EPNUM_MASK) | + ((Pipe_GetPipeToken() == PIPE_TOKEN_IN) ? ENDPOINT_DESCRIPTOR_DIR_IN : 0)); } /** Sets the period between interrupts for an INTERRUPT type pipe to a specified number of milliseconds. |