aboutsummaryrefslogtreecommitdiff
path: root/Bootloaders/TeensyHID
diff options
context:
space:
mode:
authorDean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28>2010-04-28 07:48:26 +0000
committerDean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28>2010-04-28 07:48:26 +0000
commit704941fe8bed209c2848c8844d306867f78c2192 (patch)
treeb26bb76882e9cca644ba0083bcc1c9ea50511463 /Bootloaders/TeensyHID
parentab31eb6e5ff2be73b590bb84c8e1a1f77b39f546 (diff)
USB_Init() no longer calls sei() to enable global interrupts - this must now be done in the user application once all init code has run.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1219 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'Bootloaders/TeensyHID')
-rw-r--r--Bootloaders/TeensyHID/TeensyHID.c3
-rw-r--r--Bootloaders/TeensyHID/TeensyHID.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/Bootloaders/TeensyHID/TeensyHID.c b/Bootloaders/TeensyHID/TeensyHID.c
index 2317ea4e..5431a570 100644
--- a/Bootloaders/TeensyHID/TeensyHID.c
+++ b/Bootloaders/TeensyHID/TeensyHID.c
@@ -49,6 +49,9 @@ int main(void)
/* Setup hardware required for the bootloader */
SetupHardware();
+ /* Enable global interrupts so that the USB stack can function */
+ sei();
+
while (RunBootloader)
USB_USBTask();
diff --git a/Bootloaders/TeensyHID/TeensyHID.h b/Bootloaders/TeensyHID/TeensyHID.h
index 63938987..7e3d72dc 100644
--- a/Bootloaders/TeensyHID/TeensyHID.h
+++ b/Bootloaders/TeensyHID/TeensyHID.h
@@ -41,6 +41,7 @@
#include <avr/wdt.h>
#include <avr/boot.h>
#include <avr/power.h>
+ #include <avr/interrupt.h>
#include <stdbool.h>
#include "Descriptors.h"