forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

Browse Source
pull/1469/head
Dean Camera 15 years ago
parent 85aaaf84ce
commit 59c4871f80
135 changed files with 181 additions and 61 deletions
Show Stats Download Patch File Download Diff File

3
Bootloaders/CDC/BootloaderCDC.c
Unescape View File

@ -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();

1
Bootloaders/CDC/BootloaderCDC.h
Unescape View File

@ -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"

3
Bootloaders/DFU/BootloaderDFU.c
Unescape View File

@ -101,6 +101,9 @@ int main(void)
{
/* Configure hardware required by the bootloader */
SetupHardware();
/* Enable global interrupts so that the USB stack can function */
sei();
/* Run the USB management task while the bootloader is supposed to be running */
while (RunBootloader || WaitForExit)

1
Bootloaders/DFU/BootloaderDFU.h
Unescape View File

@ -43,6 +43,7 @@
#include <avr/pgmspace.h>
#include <avr/eeprom.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdbool.h>
#include "Descriptors.h"

44
Bootloaders/Incomplete/MIDI/BootloaderMIDI.c
Unescape View File

@ -42,8 +42,6 @@
int main(void)
{
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
for (;;)
{
@ -63,48 +61,22 @@ void SetupHardware(void)
clock_prescale_set(clock_div_1);
/* Hardware Initialization */
LEDs_Init();
USB_Init();
}
/** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs. */
void EVENT_USB_Device_Connect(void)
{
/* Indicate USB enumerating */
LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
}
/** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via
* the status LEDs, disables the sample update and PWM output timers and stops the USB and MIDI management tasks.
*/
void EVENT_USB_Device_Disconnect(void)
{
/* Indicate USB not ready */
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
}
/** Event handler for the USB_ConfigurationChanged event. This is fired when the host set the current configuration
* of the USB device after enumeration - the device endpoints are configured and the MIDI management task started.
*/
void EVENT_USB_Device_ConfigurationChanged(void)
{
/* Indicate USB connected and ready */
LEDs_SetAllLEDs(LEDMASK_USB_READY);
/* Setup MIDI stream endpoints */
if (!(Endpoint_ConfigureEndpoint(MIDI_STREAM_OUT_EPNUM, EP_TYPE_BULK,
ENDPOINT_DIR_OUT, MIDI_STREAM_EPSIZE,
ENDPOINT_BANK_SINGLE)))
{
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
}
Endpoint_ConfigureEndpoint(MIDI_STREAM_OUT_EPNUM, EP_TYPE_BULK,
ENDPOINT_DIR_OUT, MIDI_STREAM_EPSIZE,
ENDPOINT_BANK_SINGLE);
if (!(Endpoint_ConfigureEndpoint(MIDI_STREAM_IN_EPNUM, EP_TYPE_BULK,
ENDPOINT_DIR_IN, MIDI_STREAM_EPSIZE,
ENDPOINT_BANK_SINGLE)))
{
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
}
Endpoint_ConfigureEndpoint(MIDI_STREAM_IN_EPNUM, EP_TYPE_BULK,
ENDPOINT_DIR_IN, MIDI_STREAM_EPSIZE,
ENDPOINT_BANK_SINGLE);
}
/** Task to handle the generation of MIDI note change events in response to presses of the board joystick, and send them
@ -122,9 +94,7 @@ void MIDI_Task(void)
if (Endpoint_IsOUTReceived())
{
USB_MIDI_EventPacket_t InPacket;
Endpoint_Read_Stream_LE(&InPacket, sizeof(InPacket));
LEDs_SetAllLEDs(InPacket.Data2 > 64 ? LEDS_LED1 : LEDS_LED2);
Endpoint_Read_Stream_LE(&InPacket, sizeof(InPacket));
Endpoint_ClearOUT();
uint8_t Channel = InPacket.Data1;

2
Bootloaders/Incomplete/MIDI/BootloaderMIDI.h
Unescape View File

@ -41,12 +41,12 @@
#include <avr/wdt.h>
#include <avr/boot.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdbool.h>
#include "Descriptors.h"
#include <LUFA/Version.h>
#include <LUFA/Drivers/Board/LEDs.h>
#include <LUFA/Drivers/USB/USB.h>
/* Macros: */

3
Bootloaders/TeensyHID/TeensyHID.c
Unescape View File

@ -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();

1
Bootloaders/TeensyHID/TeensyHID.h
Unescape View File

@ -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"

1
Demos/Device/ClassDriver/AudioInput/AudioInput.c
Unescape View File

@ -59,6 +59,7 @@ int main(void)
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Device/ClassDriver/AudioInput/AudioInput.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <LUFA/Version.h>
#include <LUFA/Drivers/Board/LEDs.h>

1
Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
Unescape View File

@ -59,6 +59,7 @@ int main(void)
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Device/ClassDriver/AudioOutput/AudioOutput.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdlib.h>
#include "Descriptors.h"

1
Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.c
Unescape View File

@ -94,6 +94,7 @@ int main(void)
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <string.h>
#include "Descriptors.h"

1
Demos/Device/ClassDriver/GenericHID/GenericHID.c
Unescape View File

@ -74,6 +74,7 @@ int main(void)
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Device/ClassDriver/GenericHID/GenericHID.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <string.h>
#include "Descriptors.h"

1
Demos/Device/ClassDriver/Joystick/Joystick.c
Unescape View File

@ -66,6 +66,7 @@ int main(void)
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Device/ClassDriver/Joystick/Joystick.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <string.h>
#include "Descriptors.h"

1
Demos/Device/ClassDriver/Keyboard/Keyboard.c
Unescape View File

@ -66,6 +66,7 @@ int main(void)
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

2
Demos/Device/ClassDriver/Keyboard/Keyboard.h
Unescape View File

@ -40,8 +40,8 @@
/* Includes: */
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/interrupt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdbool.h>
#include <string.h>

1
Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
Unescape View File

@ -89,6 +89,7 @@ int main(void)
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.h
Unescape View File

@ -36,6 +36,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdbool.h>
#include <string.h>

1
Demos/Device/ClassDriver/MIDI/MIDI.c
Unescape View File

@ -64,6 +64,7 @@ int main(void)
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

2
Demos/Device/ClassDriver/MIDI/MIDI.h
Unescape View File

@ -40,7 +40,9 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdbool.h>
#include <string.h>
#include "Descriptors.h"

1
Demos/Device/ClassDriver/MassStorage/MassStorage.c
Unescape View File

@ -66,6 +66,7 @@ int main(void)
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

2
Demos/Device/ClassDriver/MassStorage/MassStorage.h
Unescape View File

@ -40,6 +40,8 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <string.h>
#include "Descriptors.h"

1
Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.c
Unescape View File

@ -89,6 +89,7 @@ int main(void)
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.h
Unescape View File

@ -42,6 +42,7 @@
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <avr/interrupt.h>
#include <stdbool.h>
#include <string.h>

1
Demos/Device/ClassDriver/Mouse/Mouse.c
Unescape View File

@ -66,6 +66,7 @@ int main(void)
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Device/ClassDriver/Mouse/Mouse.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/wdt.h>
#include <avr/interrupt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdbool.h>
#include <string.h>

2
Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.h
Unescape View File

@ -38,6 +38,8 @@
/* Includes: */
#include <avr/io.h>
#include <avr/pgmspace.h>
#include <stdio.h>
#include <LUFA/Drivers/USB/Class/RNDIS.h>
#include <LUFA/Drivers/Peripheral/SerialStream.h>

5
Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.c
Unescape View File

@ -70,12 +70,11 @@ int main(void)
{
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
TCP_Init();
Webserver_Init();
printf_P(PSTR("\r\n\r\n****** RNDIS Demo running. ******\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

3
Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.h
Unescape View File

@ -39,10 +39,9 @@
/* Includes: */
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <string.h>
#include <stdio.h>
#include "Descriptors.h"

1
Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.c
Unescape View File

@ -76,6 +76,7 @@ int main(void)
CDC_Device_CreateStream(&VirtualSerial_CDC_Interface, &USBSerialStream);
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <string.h>
#include <stdio.h>

1
Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.c
Unescape View File

@ -90,6 +90,7 @@ int main(void)
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <string.h>
#include "Descriptors.h"

1
Demos/Device/Incomplete/Sideshow/Sideshow.c
Unescape View File

@ -58,6 +58,7 @@ int main(void)
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Device/Incomplete/Sideshow/Sideshow.h
Unescape View File

@ -35,6 +35,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include "Descriptors.h"
#include "Lib/SideshowCommands.h"

1
Demos/Device/LowLevel/AudioInput/AudioInput.c
Unescape View File

@ -47,6 +47,7 @@ int main(void)
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Device/LowLevel/AudioInput/AudioInput.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include "Descriptors.h"

1
Demos/Device/LowLevel/AudioOutput/AudioOutput.c
Unescape View File

@ -47,6 +47,7 @@ int main(void)
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

2
Demos/Device/LowLevel/AudioOutput/AudioOutput.h
Unescape View File

@ -40,7 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <stdlib.h>
#include <avr/interrupt.h>
#include "Descriptors.h"

3
Demos/Device/LowLevel/DualVirtualSerial/DualVirtualSerial.c
Unescape View File

@ -69,6 +69,9 @@ CDC_Line_Coding_t LineEncoding2 = { .BaudRateBPS = 0,
int main(void)
{
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Device/LowLevel/DualVirtualSerial/DualVirtualSerial.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <string.h>
#include "Descriptors.h"

1
Demos/Device/LowLevel/GenericHID/GenericHID.c
Unescape View File

@ -48,6 +48,7 @@ int main(void)
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Device/LowLevel/GenericHID/GenericHID.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdbool.h>
#include <string.h>

1
Demos/Device/LowLevel/Joystick/Joystick.c
Unescape View File

@ -44,6 +44,7 @@ int main(void)
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Device/LowLevel/Joystick/Joystick.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <string.h>
#include "Descriptors.h"

1
Demos/Device/LowLevel/Keyboard/Keyboard.c
Unescape View File

@ -62,6 +62,7 @@ int main(void)
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Device/LowLevel/Keyboard/Keyboard.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdbool.h>
#include <string.h>

1
Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c
Unescape View File

@ -52,6 +52,7 @@ int main(void)
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.h
Unescape View File

@ -36,6 +36,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdbool.h>
#include <string.h>

3
Demos/Device/LowLevel/MIDI/MIDI.c
Unescape View File

@ -44,7 +44,8 @@ int main(void)
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{
MIDI_Task();

1
Demos/Device/LowLevel/MIDI/MIDI.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdbool.h>
#include "Descriptors.h"

1
Demos/Device/LowLevel/MassStorage/MassStorage.c
Unescape View File

@ -55,6 +55,7 @@ int main(void)
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Device/LowLevel/MassStorage/MassStorage.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include "Descriptors.h"

1
Demos/Device/LowLevel/Mouse/Mouse.c
Unescape View File

@ -61,6 +61,7 @@ int main(void)
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Device/LowLevel/Mouse/Mouse.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdbool.h>
#include <string.h>

2
Demos/Device/LowLevel/RNDISEthernet/Lib/ProtocolDecoders.h
Unescape View File

@ -38,6 +38,8 @@
/* Includes: */
#include <avr/io.h>
#include <avr/pgmspace.h>
#include <stdio.h>
#include <LUFA/Drivers/Peripheral/SerialStream.h>

3
Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.c
Unescape View File

@ -47,9 +47,8 @@ int main(void)
TCP_Init();
Webserver_Init();
printf_P(PSTR("\r\n\r\n****** RNDIS Demo running. ******\r\n"));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

3
Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.h
Unescape View File

@ -39,10 +39,9 @@
/* Includes: */
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <string.h>
#include <stdio.h>
#include "Descriptors.h"

1
Demos/Device/LowLevel/VirtualSerial/VirtualSerial.c
Unescape View File

@ -57,6 +57,7 @@ int main(void)
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Device/LowLevel/VirtualSerial/VirtualSerial.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <string.h>
#include "Descriptors.h"

1
Demos/DualRole/ClassDriver/MouseHostDevice/MouseHostDevice.c
Unescape View File

@ -46,6 +46,7 @@ int main(void)
puts_P(PSTR(ESC_FG_CYAN "Mouse Host/Device Demo running.\r\n" ESC_FG_WHITE));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/DualRole/ClassDriver/MouseHostDevice/MouseHostDevice.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdio.h>
#include <LUFA/Version.h>

1
Demos/Host/ClassDriver/JoystickHostWithParser/JoystickHostWithParser.c
Unescape View File

@ -70,6 +70,7 @@ int main(void)
puts_P(PSTR(ESC_FG_CYAN "Joystick Host Demo running.\r\n" ESC_FG_WHITE));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Host/ClassDriver/JoystickHostWithParser/JoystickHostWithParser.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdio.h>
#include <LUFA/Version.h>

3
Demos/Host/ClassDriver/KeyboardHost/KeyboardHost.c
Unescape View File

@ -65,7 +65,8 @@ int main(void)
puts_P(PSTR(ESC_FG_CYAN "Keyboard Host Demo running.\r\n" ESC_FG_WHITE));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{
switch (USB_HostState)

1
Demos/Host/ClassDriver/KeyboardHost/KeyboardHost.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdio.h>
#include <LUFA/Version.h>

1
Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c
Unescape View File

@ -70,6 +70,7 @@ int main(void)
puts_P(PSTR(ESC_FG_CYAN "Keyboard Host Demo running.\r\n" ESC_FG_WHITE));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdio.h>
#include <LUFA/Version.h>

1
Demos/Host/ClassDriver/MIDIHost/MIDIHost.c
Unescape View File

@ -63,6 +63,7 @@ int main(void)
puts_P(PSTR(ESC_FG_CYAN "MIDI Host Demo running.\r\n" ESC_FG_WHITE));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Host/ClassDriver/MIDIHost/MIDIHost.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdio.h>
#include <LUFA/Version.h>

1
Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.c
Unescape View File

@ -63,6 +63,7 @@ int main(void)
puts_P(PSTR(ESC_FG_CYAN "Mass Storage Host Demo running.\r\n" ESC_FG_WHITE));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <ctype.h>
#include <stdio.h>

1
Demos/Host/ClassDriver/MouseHost/MouseHost.c
Unescape View File

@ -65,6 +65,7 @@ int main(void)
puts_P(PSTR(ESC_FG_CYAN "Mouse Host Demo running.\r\n" ESC_FG_WHITE));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Host/ClassDriver/MouseHost/MouseHost.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdio.h>
#include <LUFA/Version.h>

1
Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c
Unescape View File

@ -68,6 +68,7 @@ int main(void)
SetupHardware();
puts_P(PSTR(ESC_FG_CYAN "Mouse Host Demo running.\r\n" ESC_FG_WHITE));
sei();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

1
Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdio.h>
#include <LUFA/Version.h>

1
Demos/Host/ClassDriver/PrinterHost/PrinterHost.c
Unescape View File

@ -62,6 +62,7 @@ int main(void)
puts_P(PSTR(ESC_FG_CYAN "Printer Host Demo running.\r\n" ESC_FG_WHITE));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Host/ClassDriver/PrinterHost/PrinterHost.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdio.h>
#include <LUFA/Version.h>

1
Demos/Host/ClassDriver/RNDISEthernetHost/RNDISEthernetHost.c
Unescape View File

@ -70,6 +70,7 @@ int main(void)
puts_P(PSTR(ESC_FG_CYAN "RNDIS Host Demo running.\r\n" ESC_FG_WHITE));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Host/ClassDriver/RNDISEthernetHost/RNDISEthernetHost.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdio.h>
#include <LUFA/Version.h>

1
Demos/Host/ClassDriver/StillImageHost/StillImageHost.c
Unescape View File

@ -65,6 +65,7 @@ int main(void)
puts_P(PSTR(ESC_FG_CYAN "Still Image Host Demo running.\r\n" ESC_FG_WHITE));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Host/ClassDriver/StillImageHost/StillImageHost.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdio.h>
#include <LUFA/Version.h>

1
Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.c
Unescape View File

@ -65,6 +65,7 @@ int main(void)
puts_P(PSTR(ESC_FG_CYAN "CDC Host Demo running.\r\n" ESC_FG_WHITE));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdio.h>
#include <LUFA/Version.h>

1
Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c
Unescape View File

@ -54,6 +54,7 @@ int main(void)
puts_P(PSTR(ESC_FG_CYAN "Bluetooth Host Demo running.\r\n" ESC_FG_WHITE));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Host/Incomplete/BluetoothHost/BluetoothHost.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdio.h>
#include "Lib/ServiceDiscoveryProtocol.h"

1
Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.c
Unescape View File

@ -46,6 +46,7 @@ int main(void)
puts_P(PSTR(ESC_FG_CYAN "Generic HID Host Demo running.\r\n" ESC_FG_WHITE));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Host/LowLevel/JoystickHostWithParser/JoystickHostWithParser.c
Unescape View File

@ -46,6 +46,7 @@ int main(void)
puts_P(PSTR(ESC_FG_CYAN "Joystick HID Parser Host Demo running.\r\n" ESC_FG_WHITE));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Host/LowLevel/JoystickHostWithParser/JoystickHostWithParser.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdio.h>
#include <LUFA/Version.h>

1
Demos/Host/LowLevel/KeyboardHost/KeyboardHost.c
Unescape View File

@ -46,6 +46,7 @@ int main(void)
puts_P(PSTR(ESC_FG_CYAN "Keyboard HID Host Demo running.\r\n" ESC_FG_WHITE));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c
Unescape View File

@ -46,6 +46,7 @@ int main(void)
puts_P(PSTR(ESC_FG_CYAN "Keyboard HID Parser Host Demo running.\r\n" ESC_FG_WHITE));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.h
Unescape View File

@ -36,6 +36,7 @@
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdio.h>
#include <LUFA/Version.h>

1
Demos/Host/LowLevel/MIDIHost/MIDIHost.c
Unescape View File

@ -46,6 +46,7 @@ int main(void)
puts_P(PSTR(ESC_FG_CYAN "MIDI Host Demo running.\r\n" ESC_FG_WHITE));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Host/LowLevel/MIDIHost/MIDIHost.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdio.h>
#include <LUFA/Version.h>

1
Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
Unescape View File

@ -50,6 +50,7 @@ int main(void)
puts_P(PSTR(ESC_FG_CYAN "Mass Storage Host Demo running.\r\n" ESC_FG_WHITE));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Host/LowLevel/MassStorageHost/MassStorageHost.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdio.h>
#include <ctype.h>
#include <string.h>

1
Demos/Host/LowLevel/MouseHost/MouseHost.c
Unescape View File

@ -46,6 +46,7 @@ int main(void)
puts_P(PSTR(ESC_FG_CYAN "Mouse HID Host Demo running.\r\n" ESC_FG_WHITE));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.c
Unescape View File

@ -46,6 +46,7 @@ int main(void)
puts_P(PSTR(ESC_FG_CYAN "Mouse HID Parser Host Demo running.\r\n" ESC_FG_WHITE));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdio.h>
#include <LUFA/Version.h>

1
Demos/Host/LowLevel/PrinterHost/PrinterHost.c
Unescape View File

@ -46,6 +46,7 @@ int main(void)
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
puts_P(PSTR(ESC_FG_CYAN "Printer Host Demo running.\r\n" ESC_FG_WHITE));
sei();
for (;;)
{

1
Demos/Host/LowLevel/PrinterHost/PrinterHost.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdio.h>
#include <string.h>

1
Demos/Host/LowLevel/RNDISEthernetHost/RNDISEthernetHost.c
Unescape View File

@ -46,6 +46,7 @@ int main(void)
puts_P(PSTR(ESC_FG_CYAN "RNDIS Host Demo running.\r\n" ESC_FG_WHITE));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Host/LowLevel/RNDISEthernetHost/RNDISEthernetHost.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdio.h>
#include <LUFA/Version.h>

1
Demos/Host/LowLevel/StillImageHost/StillImageHost.c
Unescape View File

@ -46,6 +46,7 @@ int main(void)
puts_P(PSTR(ESC_FG_CYAN "Still Image Host Demo running.\r\n" ESC_FG_WHITE));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Host/LowLevel/StillImageHost/StillImageHost.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdio.h>
#include "ConfigDescriptor.h"

1
Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.c
Unescape View File

@ -46,6 +46,7 @@ int main(void)
puts_P(PSTR(ESC_FG_CYAN "CDC Host Demo running.\r\n" ESC_FG_WHITE));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdio.h>
#include <LUFA/Version.h>

2
LUFA/Drivers/USB/LowLevel/LowLevel.c
Unescape View File

@ -103,8 +103,6 @@ void USB_Init(
#endif
USB_IsInitialized = true;
sei();
}
void USB_ShutDown(void)

8
LUFA/Drivers/USB/LowLevel/LowLevel.h
Unescape View File

@ -236,8 +236,12 @@
* allow for device connection to a host when in device mode, or for device enumeration while in
* host mode.
*
* As the USB library relies on USB interrupts for some of its functionality, this routine will
* enable global interrupts.
* As the USB library relies on interrupts for the device and host mode enumeration processes,
* the user must enable global interrupts before or shortly after this function is called. In
* device mode, interrupts must be enabled within 500ms of this function being called to ensure
* that the host does not time out whilst enumerating the device. In host mode, interrupts may be
* enabled at the application's leisure however enumeration will not begin of an attached device
* until after this has occurred.
*
* Calling this function when the USB interface is already initialized will cause a complete USB
* interface reset and re-enumeration.

1
LUFA/ManPages/ChangeLog.txt
Unescape View File

@ -28,6 +28,7 @@
* - Added LIBUSB_FILTERDRV_COMPAT compile time option to the AVRISP programmer project to make the code compatible with Windows
* builds of avrdude at the expense of AVRStudio compatibility
* - Removed two-step endpoint/pipe bank clear and switch sequence for smaller, faster endpoint/pipe code
* - The USB_Init() function no longer calls sei() - the user is now responsible for enabling interrupts when they are ready
*
* <b>Fixed:</b>
* - Fixed software PDI/TPI programming mode in the AVRISP project not correctly toggling just the clock pin

12
LUFA/ManPages/MigrationInformation.txt
Unescape View File

@ -16,6 +16,18 @@
* - The \ref TWI_StartTransmission() function now takes in a timeout period, expressed in milliseconds, within which the addressed
* device must respond or the function will abort.
*
* <b>Device Mode</b>
* - The \ref USB_Init() function no longer calls sei() to enable global interrupts, as the user application may need
* to perform other initialization before it is ready to handle global interrupts. The user application is now responsible
* for enabling global interrupts before or shortly after calling \ref USB_Init() to ensure that the enumeration process
* functions correctly.
*
* <b>Host Mode</b>
* - The \ref USB_Init() function no longer calls sei() to enable global interrupts, as the user application may need
* to perform other initialization before it is ready to handle global interrupts. The user application is now responsible
* for enabling global interrupts before or shortly after calling \ref USB_Init() to ensure that the enumeration process
* functions correctly.
*
* \section Sec_Migration100219 Migrating from 091223 to 100219
*
* <b>Non-USB Library Components</b>

1
Projects/AVRISP-MKII/AVRISP.c
Unescape View File

@ -44,6 +44,7 @@ int main(void)
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

2
Projects/Benito/Benito.c
Unescape View File

@ -83,6 +83,8 @@ int main(void)
SetupHardware();
Buffer_Initialize(&Tx_Buffer);
sei();
for (;;)
{

1
Projects/Incomplete/MIDIToneGenerator/MIDIToneGenerator.c
Unescape View File

@ -88,6 +88,7 @@ int main(void)
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Projects/Incomplete/MIDIToneGenerator/MIDIToneGenerator.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/pgmspace.h>
#include <avr/interrupt.h>
#include <stdbool.h>
#include "Descriptors.h"

1
Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c
Unescape View File

@ -108,6 +108,7 @@ int main(void)
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdio.h>
#include "DiskDevice.h"

2
Projects/LEDNotifier/LEDNotifier.c
Unescape View File

@ -107,6 +107,8 @@ int main(void)
/* Create a regular blocking character stream for the interface so that it can be used with the stdio.h functions */
CDC_Device_CreateBlockingStream(&VirtualSerial_CDC_Interface, &USBSerialStream);
sei();
for (;;)
{

1
Projects/LEDNotifier/LEDNotifier.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <string.h>
#include <stdio.h>

2
Projects/Magstripe/Magstripe.c
Unescape View File

@ -76,6 +76,8 @@ int main(void)
for (uint8_t Buffer = 0; Buffer < TOTAL_TRACKS; Buffer++)
BitBuffer_Init(&TrackDataBuffers[Buffer]);
sei();
for (;;)
{

1
Projects/Magstripe/Magstripe.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include "Descriptors.h"
#include "Lib/MagstripeHW.h"

5
Projects/MissileLauncher/MissileLauncher.c
Unescape View File

@ -95,10 +95,11 @@ int main(void)
{
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
CmdState = CMD_STOP;
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{
Read_Joystick_Status();

2
Projects/RelayBoard/RelayBoard.c
Unescape View File

@ -44,6 +44,8 @@
int main(void)
{
SetupHardware();
sei();
for (;;)
USB_USBTask();

1
Projects/RelayBoard/RelayBoard.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include "Descriptors.h"

9
Projects/TemperatureDataLogger/TempDataLogger.c
Unescape View File

@ -137,16 +137,17 @@ ISR(TIMER1_COMPA_vect, ISR_BLOCK)
*/
int main(void)
{
/* Fetch logging interval from EEPROM */
LoggingInterval500MS_SRAM = eeprom_read_byte(&LoggingInterval500MS_EEPROM);
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
/* Fetch logging interval from EEPROM */
LoggingInterval500MS_SRAM = eeprom_read_byte(&LoggingInterval500MS_EEPROM);
/* Mount and open the log file on the dataflash FAT partition */
OpenLogFile();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
/* Discard the first sample from the temperature sensor, as it is generally incorrect */
volatile uint8_t Dummy = Temperature_GetTemperature();
(void)Dummy;

1
Projects/TemperatureDataLogger/TempDataLogger.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <stdio.h>
#include "Descriptors.h"

1
Projects/USBtoSerial/USBtoSerial.c
Unescape View File

@ -77,6 +77,7 @@ int main(void)
Buffer_Initialize(&USARTtoUSB_Buffer);
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Projects/Webserver/Webserver.c
Unescape View File

@ -44,6 +44,7 @@ int main(void)
SetupHardware();
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Projects/Webserver/Webserver.h
Unescape View File

@ -41,6 +41,7 @@
#include <avr/wdt.h>
#include <avr/pgmspace.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include <LUFA/Version.h>
#include <LUFA/Drivers/Board/LEDs.h>

1
Projects/XPLAINBridge/XPLAINBridge.c
Unescape View File

@ -81,6 +81,7 @@ int main(void)
Buffer_Initialize(&UARTtoUSB_Buffer);
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
sei();
for (;;)
{

1
Projects/XPLAINBridge/XPLAINBridge.h
Unescape View File

@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <avr/interrupt.h>
#include "AVRISPDescriptors.h"
#include "USARTDescriptors.h"

Write Preview
Loading…
Cancel
Save