aboutsummaryrefslogtreecommitdiff
path: root/LUFA
diff options
context:
space:
mode:
authorDean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28>2012-03-06 14:50:59 +0000
committerDean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28>2012-03-06 14:50:59 +0000
commitbcf71e84e8ec5bb04fcb47b2d40e3ef16377f5e3 (patch)
tree60583e9d07f83593fe2068c12d6512606728663a /LUFA
parent484ea1b516be08682c1c2f629ad8be0094f050a1 (diff)
Fixed compile error for the UC3 architecture when INTERRUPT_CONTROL_ENDPOINT is specified (thanks to Andrus Aaslaid).
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@2083 d5102386-fcda-11dd-9fdb-3debd5008f28
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 36954c26..d806c6ee 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 c4dfab39..871a0cac 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: */