aboutsummaryrefslogtreecommitdiffstats
path: root/LUFA/Drivers/USB/Core
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2013-05-10 21:48:42 +0200
committerDean Camera <dean@fourwalledcubicle.com>2013-05-10 21:48:42 +0200
commit214d5b39fca5636742367f7e3539bb3856767566 (patch)
treee25de343b8d59cb78710f1988b74fab2a62701f4 /LUFA/Drivers/USB/Core
parent0223c3668c1ad5507a4d3a393b2bea5f3426289c (diff)
downloadlufa-214d5b39fca5636742367f7e3539bb3856767566.tar.gz
lufa-214d5b39fca5636742367f7e3539bb3856767566.tar.bz2
lufa-214d5b39fca5636742367f7e3539bb3856767566.zip
Fix Pipe_GetBoundEndpointAddress() returning bad values in some circumstances.
Diffstat (limited to 'LUFA/Drivers/USB/Core')
-rw-r--r--LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h
index 5f2e46ddb..82664f5d8 100644
--- a/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h
+++ b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h
@@ -322,7 +322,8 @@
{
uint8_t UPCFG0X_Temp = UPCFG0X;
- return (((UPCFG0X_Temp >> PEPNUM0) & PIPE_EPNUM_MASK) | ((UPCFG0X_Temp & PEPNUM1) ? ENDPOINT_DIR_OUT : ENDPOINT_DIR_IN));
+ return (((UPCFG0X_Temp >> PEPNUM0) & PIPE_EPNUM_MASK) |
+ ((UPCFG0X_Temp & PTOKEN1) ? ENDPOINT_DIR_IN : ENDPOINT_DIR_OUT));
}
/** Sets the period between interrupts for an INTERRUPT type pipe to a specified number of milliseconds.