diff options
author | Dean Camera <[email protected]> | 2010-04-28 07:48:26 +0000 |
---|---|---|
committer | Dean Camera <[email protected]> | 2010-04-28 07:48:26 +0000 |
commit | 59c4871f8011247a056f6ca2ca8aca89000e3841 (patch) | |
tree | b26bb76882e9cca644ba0083bcc1c9ea50511463 /Bootloaders/CDC | |
parent | 85aaaf84ce14568580a35c31e22062ba529b49fe (diff) | |
download | qmk_firmware-59c4871f8011247a056f6ca2ca8aca89000e3841.tar.gz qmk_firmware-59c4871f8011247a056f6ca2ca8aca89000e3841.zip |
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.
Diffstat (limited to 'Bootloaders/CDC')
-rw-r--r-- | Bootloaders/CDC/BootloaderCDC.c | 3 | ||||
-rw-r--r-- | Bootloaders/CDC/BootloaderCDC.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c index 482859bda0..83fd0ee924 100644 --- a/Bootloaders/CDC/BootloaderCDC.c +++ b/Bootloaders/CDC/BootloaderCDC.c @@ -69,6 +69,9 @@ int main(void) /* Setup hardware required for the bootloader */
SetupHardware();
+ /* Enable global interrupts so that the USB stack can function */
+ sei();
+
while (RunBootloader)
{
CDC_Task();
diff --git a/Bootloaders/CDC/BootloaderCDC.h b/Bootloaders/CDC/BootloaderCDC.h index 8367002798..22b57438df 100644 --- a/Bootloaders/CDC/BootloaderCDC.h +++ b/Bootloaders/CDC/BootloaderCDC.h @@ -42,6 +42,7 @@ #include <avr/boot.h>
#include <avr/eeprom.h>
#include <avr/power.h>
+ #include <avr/interrupt.h>
#include <stdbool.h>
#include "Descriptors.h"
|