aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2013-05-14 16:31:29 +0200
committerDean Camera <dean@fourwalledcubicle.com>2013-05-14 16:31:29 +0200
commit0d800753877be372150721120452b9147a55e764 (patch)
treec21144c1bdbabf06004395ec1d92ed8661d149a8
parent4a7405b2cf8d54cbeb6400010577c36a5fee42b0 (diff)
downloadlufa-0d800753877be372150721120452b9147a55e764.tar.gz
lufa-0d800753877be372150721120452b9147a55e764.tar.bz2
lufa-0d800753877be372150721120452b9147a55e764.zip
Fix missing bitshift in the AVR8 Pipe_GetBoundEndpointAddress() function.
-rw-r--r--LUFA/DoxygenPages/ChangeLog.txt2
-rw-r--r--LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt
index bf2a23695..16d3fe676 100644
--- a/LUFA/DoxygenPages/ChangeLog.txt
+++ b/LUFA/DoxygenPages/ChangeLog.txt
@@ -25,7 +25,7 @@
* - Core:
* - Fixed Low Speed USB devices broken when using the library HID Class driver (thanks to Michael)
* - Fixed possible register corruption in USB Host mode on AVR8 devices when ORDERED_EP_CONFIG is used (thanks to Martin Aakerberg)
- * - Fixed Pipe_GetBoundEndpointAddress() returning invalid endpoint directions on AVR8 architecture devices
+ * - Fixed Pipe_GetBoundEndpointAddress() returning invalid endpoint directions on AVR8 architecture devices (thanks to decerri)
* under some circumstances
* - Library Applications:
* - Added handler for SCSI_CMD_START_STOP_UNIT in demos using the Mass Storage class, to prevent ejection errors on *nix systems due to an
diff --git a/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h
index 82664f5d8..b3962633f 100644
--- a/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h
+++ b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h
@@ -323,7 +323,7 @@
uint8_t UPCFG0X_Temp = UPCFG0X;
return (((UPCFG0X_Temp >> PEPNUM0) & PIPE_EPNUM_MASK) |
- ((UPCFG0X_Temp & PTOKEN1) ? ENDPOINT_DIR_IN : ENDPOINT_DIR_OUT));
+ ((UPCFG0X_Temp & (1 << PTOKEN1)) ? ENDPOINT_DIR_IN : ENDPOINT_DIR_OUT));
}
/** Sets the period between interrupts for an INTERRUPT type pipe to a specified number of milliseconds.