Commit 59c4871f authored by Dean Camera's avatar Dean Camera
Browse files

USB_Init() no longer calls sei() to enable global interrupts - this must now...

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.
parent 85aaaf84
...@@ -89,6 +89,7 @@ int main(void) ...@@ -89,6 +89,7 @@ int main(void)
SetupHardware(); SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;) for (;;)
{ {
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include <avr/io.h> #include <avr/io.h>
#include <avr/wdt.h> #include <avr/wdt.h>
#include <avr/power.h> #include <avr/power.h>
#include <avr/interrupt.h>
#include <stdbool.h> #include <stdbool.h>
#include <string.h> #include <string.h>
......
...@@ -64,6 +64,7 @@ int main(void) ...@@ -64,6 +64,7 @@ int main(void)
SetupHardware(); SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;) for (;;)
{ {
......
...@@ -40,7 +40,9 @@ ...@@ -40,7 +40,9 @@
#include <avr/io.h> #include <avr/io.h>
#include <avr/wdt.h> #include <avr/wdt.h>
#include <avr/power.h> #include <avr/power.h>
#include <avr/interrupt.h>
#include <stdbool.h> #include <stdbool.h>
#include <string.h>
#include "Descriptors.h" #include "Descriptors.h"
......
...@@ -66,6 +66,7 @@ int main(void) ...@@ -66,6 +66,7 @@ int main(void)
SetupHardware(); SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;) for (;;)
{ {
......
...@@ -40,6 +40,8 @@ ...@@ -40,6 +40,8 @@
#include <avr/io.h> #include <avr/io.h>
#include <avr/wdt.h> #include <avr/wdt.h>
#include <avr/power.h> #include <avr/power.h>
#include <avr/interrupt.h>
#include <string.h>
#include "Descriptors.h" #include "Descriptors.h"
......
...@@ -89,6 +89,7 @@ int main(void) ...@@ -89,6 +89,7 @@ int main(void)
SetupHardware(); SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;) for (;;)
{ {
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#include <avr/wdt.h> #include <avr/wdt.h>
#include <avr/power.h> #include <avr/power.h>
#include <avr/interrupt.h> #include <avr/interrupt.h>
#include <avr/interrupt.h>
#include <stdbool.h> #include <stdbool.h>
#include <string.h> #include <string.h>
......
...@@ -66,6 +66,7 @@ int main(void) ...@@ -66,6 +66,7 @@ int main(void)
SetupHardware(); SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;) for (;;)
{ {
......
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
#include <avr/wdt.h> #include <avr/wdt.h>
#include <avr/interrupt.h> #include <avr/interrupt.h>
#include <avr/power.h> #include <avr/power.h>
#include <avr/interrupt.h>
#include <stdbool.h> #include <stdbool.h>
#include <string.h> #include <string.h>
......
...@@ -38,6 +38,8 @@ ...@@ -38,6 +38,8 @@
/* Includes: */ /* Includes: */
#include <avr/io.h> #include <avr/io.h>
#include <avr/pgmspace.h>
#include <stdio.h>
#include <LUFA/Drivers/USB/Class/RNDIS.h> #include <LUFA/Drivers/USB/Class/RNDIS.h>
#include <LUFA/Drivers/Peripheral/SerialStream.h> #include <LUFA/Drivers/Peripheral/SerialStream.h>
......
...@@ -70,12 +70,11 @@ int main(void) ...@@ -70,12 +70,11 @@ int main(void)
{ {
SetupHardware(); SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
TCP_Init(); TCP_Init();
Webserver_Init(); Webserver_Init();
printf_P(PSTR("\r\n\r\n****** RNDIS Demo running. ******\r\n")); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;) for (;;)
{ {
......
...@@ -39,10 +39,9 @@ ...@@ -39,10 +39,9 @@
/* Includes: */ /* Includes: */
#include <avr/io.h> #include <avr/io.h>
#include <avr/wdt.h> #include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h> #include <avr/power.h>
#include <avr/interrupt.h>
#include <string.h> #include <string.h>
#include <stdio.h>
#include "Descriptors.h" #include "Descriptors.h"
......
...@@ -76,6 +76,7 @@ int main(void) ...@@ -76,6 +76,7 @@ int main(void)
CDC_Device_CreateStream(&VirtualSerial_CDC_Interface, &USBSerialStream); CDC_Device_CreateStream(&VirtualSerial_CDC_Interface, &USBSerialStream);
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;) for (;;)
{ {
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include <avr/io.h> #include <avr/io.h>
#include <avr/wdt.h> #include <avr/wdt.h>
#include <avr/power.h> #include <avr/power.h>
#include <avr/interrupt.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
......
...@@ -90,6 +90,7 @@ int main(void) ...@@ -90,6 +90,7 @@ int main(void)
SetupHardware(); SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;) for (;;)
{ {
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include <avr/io.h> #include <avr/io.h>
#include <avr/wdt.h> #include <avr/wdt.h>
#include <avr/power.h> #include <avr/power.h>
#include <avr/interrupt.h>
#include <string.h> #include <string.h>
#include "Descriptors.h" #include "Descriptors.h"
......
...@@ -58,6 +58,7 @@ int main(void) ...@@ -58,6 +58,7 @@ int main(void)
SetupHardware(); SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;) for (;;)
{ {
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include <avr/io.h> #include <avr/io.h>
#include <avr/wdt.h> #include <avr/wdt.h>
#include <avr/power.h> #include <avr/power.h>
#include <avr/interrupt.h>
#include "Descriptors.h" #include "Descriptors.h"
#include "Lib/SideshowCommands.h" #include "Lib/SideshowCommands.h"
......
...@@ -47,6 +47,7 @@ int main(void) ...@@ -47,6 +47,7 @@ int main(void)
SetupHardware(); SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;) for (;;)
{ {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment