aboutsummaryrefslogtreecommitdiffstats
path: root/LUFA
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2012-03-06 14:50:59 +0000
committerDean Camera <dean@fourwalledcubicle.com>2012-03-06 14:50:59 +0000
commit17f104cbe84c5c04526d800350ec2f723f0f0b19 (patch)
tree60583e9d07f83593fe2068c12d6512606728663a /LUFA
parent6ee79029d5eecbaea5125417731c87e765f3907c (diff)
downloadlufa-17f104cbe84c5c04526d800350ec2f723f0f0b19.tar.gz
lufa-17f104cbe84c5c04526d800350ec2f723f0f0b19.tar.bz2
lufa-17f104cbe84c5c04526d800350ec2f723f0f0b19.zip
Fixed compile error for the UC3 architecture when INTERRUPT_CONTROL_ENDPOINT is specified (thanks to Andrus Aaslaid).
Diffstat (limited to 'LUFA')
-rw-r--r--LUFA/DoxygenPages/ChangeLog.txt1
-rw-r--r--LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt
index 36954c266..d806c6ee8 100644
--- a/LUFA/DoxygenPages/ChangeLog.txt
+++ b/LUFA/DoxygenPages/ChangeLog.txt
@@ -23,6 +23,7 @@
* - Core:
* - Fixed possible enumeration error if the user application selects a pipe other than the default Control pipe between the Powered and Default states of
* the host state machine
+ * - Fixed compile error for the UC3 architecture when INTERRUPT_CONTROL_ENDPOINT is specified (thanks to Andrus Aaslaid)
* - Library Applications:
* - None
*
diff --git a/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.h b/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.h
index c4dfab392..871a0cac2 100644
--- a/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.h
+++ b/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.h
@@ -357,6 +357,8 @@
* using the user application's preferred USB controller driver.
*/
void USB_GEN_vect(void);
+ #else
+ ISR(USB_GEN_vect);
#endif
/* Disable C linkage for C++ Compilers: */