Remove MIDI ClassDriver device demo's accidental inclusion of the unused ADC peripher...

[pub/lufa.git] / LUFA / Drivers / USB / LowLevel / USBInterrupt.c

diff --git a/LUFA/Drivers/USB/LowLevel/USBInterrupt.c b/LUFA/Drivers/USB/LowLevel/USBInterrupt.c
index 7844a87..54983c0 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/USBInterrupt.c
+++ b/LUFA/Drivers/USB/LowLevel/USBInterrupt.c
@@ -128,11 +128,14 @@ ISR(USB_GEN_vect, ISR_BLOCK)
                USB_INT_Disable(USB_INT_WAKEUPI);
                USB_INT_Enable(USB_INT_SUSPI);
                
+               if (USB_ConfigurationNumber)
+                 USB_DeviceState = DEVICE_STATE_Configured;
+               else
+                 USB_DeviceState = (USB_Device_IsAddressSet()) ? DEVICE_STATE_Configured : DEVICE_STATE_Powered;
+               
                #if defined(USB_SERIES_2_AVR) && !defined(NO_LIMITED_CONTROLLER_CONNECT)
-               USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Powered;
                EVENT_USB_Device_Connect();
                #else
-               USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Addressed;
                EVENT_USB_Device_WakeUp();              
                #endif
        }
@@ -159,12 +162,14 @@ ISR(USB_GEN_vect, ISR_BLOCK)
                EVENT_USB_Device_Reset();
        }
        
+       #if !defined(NO_SOF_EVENTS)
        if (USB_INT_HasOccurred(USB_INT_SOFI) && USB_INT_IsEnabled(USB_INT_SOFI))
        {
                USB_INT_Clear(USB_INT_SOFI);
                
                EVENT_USB_Device_StartOfFrame();
        }
+       #endif  
        #endif
        
        #if defined(USB_CAN_BE_HOST)
@@ -214,6 +219,7 @@ ISR(USB_GEN_vect, ISR_BLOCK)
                USB_ResetInterface();
        }
 
+       #if !defined(NO_SOF_EVENTS)
        if (USB_INT_HasOccurred(USB_INT_HSOFI) && USB_INT_IsEnabled(USB_INT_HSOFI))
        {
                USB_INT_Clear(USB_INT_HSOFI);
@@ -221,6 +227,7 @@ ISR(USB_GEN_vect, ISR_BLOCK)
                EVENT_USB_Host_StartOfFrame();
        }
        #endif
+       #endif
 
        #if defined(USB_CAN_BE_BOTH)
        if (USB_INT_HasOccurred(USB_INT_IDTI) && USB_INT_IsEnabled(USB_INT_IDTI))